增加界面入口

app/src/main/java/com/uas/hystorage/activity/FunctionActivity.java

@@ -26,8 +26,10 @@ import com.uas.hystorage.fragment.IndexSettingFragment;
 import com.uas.hystorage.fragment.IndexWareHouseContentFragment;
 import com.uas.hystorage.fragment.JumpSiteFragment;
 import com.uas.hystorage.fragment.NotGoodCaiJiFragment;
+import com.uas.hystorage.fragment.PutintoAdd_Fragment;
 import com.uas.hystorage.fragment.QualityManageFragment;
 import com.uas.hystorage.fragment.ReportDetailFragment;
+import com.uas.hystorage.fragment.RolloutFragment;
 import com.uas.hystorage.fragment.StepReceiveFragment;
 import com.uas.hystorage.fragment.StepTransferFragment;
 import com.uas.hystorage.fragment.StorageInFragment;
@@ -109,7 +111,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_TIME_REPORT:
                     mFragment = new GdTimeReportFragment();
                     break;
-                //报工明细
+                //产出明细
                 case GloableParams.GRIDNAME_TIME_REPORT_DETAIL:
                     mFragment = new ReportDetailFragment();
                     break;
@@ -142,6 +144,12 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_HE_PI:
                     mFragment = new HePiFragment();
                     break;
+                case GloableParams.GRIDNAME__PUTINTO://投入
+                    mFragment = new PutintoAdd_Fragment();
+                    break;
+                case GloableParams.GRIDNAME_ROLLOUT://转出
+                    mFragment = new RolloutFragment();
+                    break;
                 case GloableParams.HOME_QUALITY_MANAGE://品质管理
                     mFragment = new QualityManageFragment();
                     break;

app/src/main/java/com/uas/hystorage/activity/HomeActivity.java

@@ -54,7 +54,7 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
         setContentView(R.layout.activity_home);
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("UAS车间工作站管理");
+        actionbarTextVeiw.setText("工序采集");
         menuGridView.setNumColumns(2);
         gridItemList = DataSourceManager.getDataSourceManager().getHomeGridItemList();
         SimpleAdapter adapter = new SimpleAdapter(this, gridItemList, R.layout.item_grid,

app/src/main/java/com/uas/hystorage/activity/IndexActivity.java

@@ -103,7 +103,7 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         mEmNameTv = findViewById(R.id.em_name_tv);
         tv_metrimal_name=findViewById(R.id.tv_metrimal_name);
         actionbarTextVeiw = (TextView) findViewById(R.id.actionbar);
-        actionbarTextVeiw.setText("UAS车间工作站管理");
+        actionbarTextVeiw.setText("工序采集");
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         mPositionR = (TextView) findViewById(R.id.index_position_resource);
         mScName = (TextView) findViewById(R.id.scname_tv);
@@ -510,13 +510,16 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             } else {
                 //工单号为空，启动工单
                 String workOrder = mCurDoc.getText().toString().trim();
-                //工步移交和工步接收
+                //工步序交和工序接收
                 if(GloableParams.GRIDNAME_STEP_TRANSFER.equals(itemName)
                  ||GloableParams.GRIDNAME_STEP_RECEIVE.equals(itemName)
                  ||GloableParams.GRIDNAME_BULIANG_CAIJI.equals(itemName)
                  ||GloableParams.GRIDNAME_CHAI_PI.equals(itemName)
                  ||GloableParams.GRIDNAME_TIAO_ZHAN.equals(itemName)
-                 ||GloableParams.GRIDNAME_HE_PI.equals(itemName)){
+                 ||GloableParams.GRIDNAME_HE_PI.equals(itemName)
+                 ||GloableParams.GRIDNAME__PUTINTO.equals(itemName)
+                 ||GloableParams.GRIDNAME_ROLLOUT.equals(itemName)
+                ){
                     goFragment(position);
                 }else if(GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)){//解除绑定
                     if(TextUtils.isEmpty(workOrder)){

app/src/main/java/com/uas/hystorage/bean/StoragerechargeAddCommitBean.java

@@ -0,0 +1,134 @@
+package com.uas.hystorage.bean;
+
+/**
+ * Created by cjh on 2022-10-10
+ */
+public class StoragerechargeAddCommitBean {
+    private String VAD_DETNO;
+    private String VAD_PUCODE;
+    private String VAD_PUDETNO;
+    private String VAD_PRODCODE;
+    private String VAD_QTY;
+    private String PR_DETAIL;
+    private String VA_CODE;
+    private String VA_VENDCODE;
+    private String VA_VENDNAME;
+    private String VA_STATUSCODE;
+    private String VA_ID;
+    private String VA_SENDCODE;
+
+    public StoragerechargeAddCommitBean(){
+
+    }
+
+    public StoragerechargeAddCommitBean(String VAD_DETNO, String VAD_PUCODE, String VAD_PUDETNO, String VAD_PRODCODE, String VAD_QTY, String PR_DETAIL, String VA_CODE, String VA_VENDCODE, String VA_VENDNAME, String VA_STATUSCODE, String VA_ID, String VA_SENDCODE) {
+        this.VAD_DETNO = VAD_DETNO;
+        this.VAD_PUCODE = VAD_PUCODE;
+        this.VAD_PUDETNO = VAD_PUDETNO;
+        this.VAD_PRODCODE = VAD_PRODCODE;
+        this.VAD_QTY = VAD_QTY;
+        this.PR_DETAIL = PR_DETAIL;
+        this.VA_CODE = VA_CODE;
+        this.VA_VENDCODE = VA_VENDCODE;
+        this.VA_VENDNAME = VA_VENDNAME;
+        this.VA_STATUSCODE = VA_STATUSCODE;
+        this.VA_ID = VA_ID;
+        this.VA_SENDCODE=VA_SENDCODE;
+    }
+
+    public String getVA_SENDCODE() {
+        return VA_SENDCODE;
+    }
+
+    public void setVA_SENDCODE(String VA_SENDCODE) {
+        this.VA_SENDCODE = VA_SENDCODE;
+    }
+
+    public String getVAD_DETNO() {
+        return VAD_DETNO;
+    }
+
+    public void setVAD_DETNO(String VAD_DETNO) {
+        this.VAD_DETNO = VAD_DETNO;
+    }
+
+    public String getVAD_PUCODE() {
+        return VAD_PUCODE;
+    }
+
+    public void setVAD_PUCODE(String VAD_PUCODE) {
+        this.VAD_PUCODE = VAD_PUCODE;
+    }
+
+    public String getVAD_PUDETNO() {
+        return VAD_PUDETNO;
+    }
+
+    public void setVAD_PUDETNO(String VAD_PUDETNO) {
+        this.VAD_PUDETNO = VAD_PUDETNO;
+    }
+
+    public String getVAD_PRODCODE() {
+        return VAD_PRODCODE;
+    }
+
+    public void setVAD_PRODCODE(String VAD_PRODCODE) {
+        this.VAD_PRODCODE = VAD_PRODCODE;
+    }
+
+    public String getVAD_QTY() {
+        return VAD_QTY;
+    }
+
+    public void setVAD_QTY(String VAD_QTY) {
+        this.VAD_QTY = VAD_QTY;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+    public String getVA_CODE() {
+        return VA_CODE;
+    }
+
+    public void setVA_CODE(String VA_CODE) {
+        this.VA_CODE = VA_CODE;
+    }
+
+    public String getVA_VENDCODE() {
+        return VA_VENDCODE;
+    }
+
+    public void setVA_VENDCODE(String VA_VENDCODE) {
+        this.VA_VENDCODE = VA_VENDCODE;
+    }
+
+    public String getVA_VENDNAME() {
+        return VA_VENDNAME;
+    }
+
+    public void setVA_VENDNAME(String VA_VENDNAME) {
+        this.VA_VENDNAME = VA_VENDNAME;
+    }
+
+    public String getVA_STATUSCODE() {
+        return VA_STATUSCODE;
+    }
+
+    public void setVA_STATUSCODE(String VA_STATUSCODE) {
+        this.VA_STATUSCODE = VA_STATUSCODE;
+    }
+
+    public String getVA_ID() {
+        return VA_ID;
+    }
+
+    public void setVA_ID(String VA_ID) {
+        this.VA_ID = VA_ID;
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/DecisionByLotFragment.java

@@ -0,0 +1,121 @@
+package com.uas.hystorage.fragment;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.util.CameraUtil;
+import com.uas.hystorage.util.CommonUtil;
+import com.uas.hystorage.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+/**
+ * Created by RaoMeng on 2023/12/26
+ * Desc: 抽检判定
+ */
+public class DecisionByLotFragment extends BaseFragment implements View.OnClickListener {
+
+
+    private ClearableEditText storage_recharge_collect_ets;
+    private ImageView storage_recharge_scan_ivs;
+    private int mFocusId;
+    private static final int SCAN_BARCODE_CODE = 111;
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_decisionbylot;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("抽检判定");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
+        storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
+
+
+    }
+
+
+    @Override
+    protected void initEvents() {
+        storage_recharge_scan_ivs.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("抽检判定");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_ivs:
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+
+        }
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_ets) {
+                    storage_recharge_collect_ets.setText(result);
+                    storage_recharge_collect_ets.setSelection(result.length());
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/PutintoAdd_Fragment.java

@@ -0,0 +1,267 @@
+package com.uas.hystorage.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
+import com.bin.david.form.data.table.TableData;
+import com.bin.david.form.listener.OnColumnItemClickListener;
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.bean.StoragerechargeAddCommitBean;
+import com.uas.hystorage.util.CameraUtil;
+import com.uas.hystorage.util.CommonUtil;
+import com.uas.hystorage.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by jsxiaoshui on 2023-12-26
+ * 投入
+ */
+public class PutintoAdd_Fragment extends BaseFragment implements OnColumnItemClickListener<String>, View.OnClickListener {
+
+    private ClearableEditText storage_recharge_collect_ets;
+    private ImageView storage_recharge_scan_ivs;
+    private SmartTable mSmartTable;
+    private Button jlt_storage_in_barcode_save_btn;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private int mFocusId;
+    private Column<String> va_detnoColumn,va_pucodeCoulmn,va_pudetnoColumn,va_prodcodeColumn,va_qtyColumn,va_detailColumn;
+    private TableData<StoragerechargeAddCommitBean> mTableData;
+    private List<StoragerechargeAddCommitBean> mFilterStorageInBeans;
+    private String va_ids;
+    private CheckBox add_checkbos;
+    private Button jlt_storage_in_generate_detailed_btn;
+    private Button jlt_storage_in_audit_btn;
+    private InputMethodManager imm;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_putintoadd;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_storage_rechargeadd));
+        storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
+        storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
+        mSmartTable = mActivity.findViewById(R.id.jlt_storage_in_filter_list_sts);
+        jlt_storage_in_barcode_save_btn = mActivity.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+        add_checkbos = mActivity.findViewById(R.id.add_checkbos);
+        jlt_storage_in_generate_detailed_btn = mActivity.findViewById(R.id.jlt_storage_in_generate_detailed_btn);
+        jlt_storage_in_audit_btn = mActivity.findViewById(R.id.jlt_storage_in_audit_btn);
+        imm = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+
+    }
+
+    @Override
+    protected void initEvents() {
+        storage_recharge_scan_ivs.setOnClickListener(this);
+        jlt_storage_in_barcode_save_btn.setOnClickListener(this);
+        jlt_storage_in_generate_detailed_btn.setOnClickListener(this);
+        jlt_storage_in_audit_btn.setOnClickListener(this);
+        storage_recharge_collect_ets.requestFocus();
+        storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = storage_recharge_collect_ets.getText().toString().trim();
+                    getDatalistCodes(data);
+                    return true;
+                }
+                return false;
+            }
+        });
+        mFilterStorageInBeans = new ArrayList<>();
+        va_detnoColumn = new Column<String>("序号", "VAD_DETNO");
+        va_detnoColumn.setFixed(true);
+        va_pucodeCoulmn = new Column<String>("采购单号", "VAD_PUCODE");
+        va_pudetnoColumn = new Column<String>("采购序号", "VAD_PUDETNO");
+        va_prodcodeColumn = new Column<String>("料号", "VAD_PRODCODE");
+        va_qtyColumn = new Column<String>("数量", "VAD_QTY");
+        va_detailColumn = new Column<String>("名称", "PR_DETAIL");
+
+        va_detnoColumn.setOnColumnItemClickListener(this);
+        va_pucodeCoulmn.setOnColumnItemClickListener(this);
+        va_pudetnoColumn.setOnColumnItemClickListener(this);
+        va_prodcodeColumn.setOnColumnItemClickListener(this);
+        va_qtyColumn.setOnColumnItemClickListener(this);
+        va_detailColumn.setOnColumnItemClickListener(this);
+
+
+
+    }
+
+    @Override
+    protected void initDatas() {
+        WindowManager wm = mActivity.getWindowManager();
+        int screenWith = wm.getDefaultDisplay().getWidth();
+        mSmartTable.getConfig().setMinTableWidth(screenWith)
+                .setShowXSequence(false)
+                .setShowYSequence(false)
+                .setShowTableTitle(false)
+                .setFixedTitle(true)
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
+
+    }
+
+    /**
+     * 请求条码
+     * @param data
+     */
+    private void getDatalistCodes(String data) {
+            StoragerechargeAddCommitBean jltStorageInBean = new StoragerechargeAddCommitBean();
+            jltStorageInBean.setVAD_DETNO(data);
+            jltStorageInBean.setVAD_PUCODE("1");
+            jltStorageInBean.setVAD_PUDETNO("2");
+            jltStorageInBean.setVAD_PRODCODE("3");
+            jltStorageInBean.setVAD_QTY("4");
+            jltStorageInBean.setPR_DETAIL("5");
+            jltStorageInBean.setVA_STATUSCODE("6");
+            jltStorageInBean.setVA_CODE("7");
+            jltStorageInBean.setVA_VENDCODE("8");
+            jltStorageInBean.setVA_VENDNAME("9");
+            jltStorageInBean.setVA_SENDCODE("10");
+            jltStorageInBean.setVA_ID("11");
+        mFilterStorageInBeans.add(jltStorageInBean);
+        setFilterTableData(mFilterStorageInBeans);
+
+    }
+    private void setFilterTableData(List<StoragerechargeAddCommitBean> filterTableData) {
+        mTableData = new TableData<StoragerechargeAddCommitBean>("列表", filterTableData,
+                va_detnoColumn,va_pucodeCoulmn,va_pudetnoColumn,va_prodcodeColumn,va_qtyColumn,va_detailColumn);
+        mSmartTable.setTableData(mTableData);
+//        mSmartTable.requestLayout();
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+
+    }
+
+
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_ivs:
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+            case R.id.jlt_storage_in_generate_detailed_btn://生成明细
+
+                break;
+            case R.id.jlt_storage_in_barcode_save_btn://提交
+
+                break;
+            case R.id.jlt_storage_in_audit_btn://审核
+                break;
+
+            }
+        }
+
+        @Override
+        public void onClick (Column < String > column, String value, String s,int position){
+
+        }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_ets) {
+                    storage_recharge_collect_ets.setText(result);
+                    storage_recharge_collect_ets.setSelection(result.length());
+
+                    getDatalistCodes(result);
+                }
+            }
+        }
+    }
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        CommonUtil.closeKeybord(storage_recharge_collect_ets, mActivity);
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.title_storage_rechargeadd));
+    }
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_storage_rechargeadd));
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/QualityManageFragment.java

@@ -1,6 +1,5 @@
 package com.uas.hystorage.fragment;
 
-import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -11,10 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.uas.hystorage.R;
 import com.uas.hystorage.adapter.CommonMenuAdapter;
 import com.uas.hystorage.bean.CommonMenuBean;
-import com.uas.hystorage.bean.ExceptionHandleBean;
-import com.uas.hystorage.bean.ProductionQualityBean;
 import com.uas.hystorage.bean.QualityComplaintsBean;
-import com.uas.hystorage.util.Constants;
 import com.uas.hystorage.util.FragmentUtils;
 
 import java.util.ArrayList;
@@ -44,19 +40,22 @@ public class QualityManageFragment extends BaseFragment {
         mMenuRecyclerView = root.findViewById(R.id.quality_manage_rv);
         mMenuRecyclerView.setLayoutManager(new GridLayoutManager(mActivity, 3));
         mMenuBeanList = new ArrayList<>();
-        mMenuBeanList.add(new CommonMenuBean("首末件管理", R.drawable.ic_first_last_manage, FirstLastManageListFragment.class));
-        Bundle bundle = new Bundle();
-        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, PRODUCTION_QUALITY);
-        mMenuBeanList.add(new CommonMenuBean("生产品质异常单", R.drawable.ic_production_quality,
-                QualityComplaintsListFragment.class, bundle));
-        bundle = new Bundle();
-        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, EXCEPTION_HANDLE);
-        mMenuBeanList.add(new CommonMenuBean("过程异常反馈处理单", R.drawable.ic_exception_handle,
-                QualityComplaintsListFragment.class, bundle));
-        bundle = new Bundle();
-        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, QUALITY_COMPLAINT);
-        mMenuBeanList.add(new CommonMenuBean("内部质量投诉单", R.drawable.ic_quality_complaint,
-                QualityComplaintsListFragment.class, bundle));
+        mMenuBeanList.add(new CommonMenuBean("抽检判定", R.drawable.ic_first_last_manage, DecisionByLotFragment.class));
+        mMenuBeanList.add(new CommonMenuBean("返工判定", R.drawable.ic_production_quality, ReworkDecisionFragment.class));
+//        mMenuBeanList.add(new CommonMenuBean("首检判定", R.drawable.ic_first_last_manage, FirstLastManageListFragment.class));
+//        mMenuBeanList.add(new CommonMenuBean("首末件管理", R.drawable.ic_first_last_manage, FirstLastManageListFragment.class));
+//        Bundle bundle = new Bundle();
+//        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, PRODUCTION_QUALITY);
+//        mMenuBeanList.add(new CommonMenuBean("生产品质异常单", R.drawable.ic_production_quality,
+//                QualityComplaintsListFragment.class, bundle));
+//        bundle = new Bundle();
+//        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, EXCEPTION_HANDLE);
+//        mMenuBeanList.add(new CommonMenuBean("过程异常反馈处理单", R.drawable.ic_exception_handle,
+//                QualityComplaintsListFragment.class, bundle));
+//        bundle = new Bundle();
+//        bundle.putInt(Constants.CONSTANT.WHICH_PAGE, QUALITY_COMPLAINT);
+//        mMenuBeanList.add(new CommonMenuBean("内部质量投诉单", R.drawable.ic_quality_complaint,
+//                QualityComplaintsListFragment.class, bundle));
         mCommonMenuAdapter = new CommonMenuAdapter(mMenuBeanList);
         mMenuRecyclerView.setAdapter(mCommonMenuAdapter);
     }
@@ -68,10 +67,10 @@ public class QualityManageFragment extends BaseFragment {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 try {
                     Fragment fragment = null;
-                    if (position == 1) {
-                        fragment = new QualityComplaintsListFragment<ProductionQualityBean>();
-                    } else if (position == 2) {
-                        fragment = new QualityComplaintsListFragment<ExceptionHandleBean>();
+                    if (position == 0) {
+                        fragment = new DecisionByLotFragment();
+                    } else if (position == 1) {
+                        fragment = new ReworkDecisionFragment();
                     } else if (position == 3) {
                         fragment = new QualityComplaintsListFragment<QualityComplaintsBean>();
                     } else {

app/src/main/java/com/uas/hystorage/fragment/ReportDetailFragment.java

@@ -42,7 +42,7 @@ public class ReportDetailFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        ((FunctionActivity) getActivity()).setTitle("报工明细");
+        ((FunctionActivity) getActivity()).setTitle("产出明细");
         tv_pichi=root.findViewById(R.id.tv_pichi);
         tv_report_num=root.findViewById(R.id.tv_report_num);
         tv_destory_num=root.findViewById(R.id.tv_destory_num);

app/src/main/java/com/uas/hystorage/fragment/ReworkDecisionFragment.java

@@ -0,0 +1,74 @@
+package com.uas.hystorage.fragment;
+
+import android.view.KeyEvent;
+
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.bean.QualityManageBean;
+
+/**
+ * Created by RaoMeng on 2023/12/26
+ * Desc: 返工判定
+ */
+public class ReworkDecisionFragment extends BaseFragment implements FirstLastManageAddFragment.OnFormChangeListener {
+
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_reworkdecision;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("返工判定");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+
+
+
+
+    }
+
+
+    @Override
+    protected void initEvents() {
+
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+    @Override
+    public void onFormChange(boolean isDelete, QualityManageBean qualityManageBean, int position) {
+
+    }
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("返工判定");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/RolloutFragment.java

@@ -0,0 +1,126 @@
+package com.uas.hystorage.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.uas.hystorage.R;
+import com.uas.hystorage.activity.FunctionActivity;
+import com.uas.hystorage.util.CameraUtil;
+import com.uas.hystorage.util.CommonUtil;
+import com.uas.hystorage.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+/**
+ * Created by RaoMeng on 2023/12/26
+ * Desc: 转出
+ */
+public class RolloutFragment extends BaseFragment implements View.OnClickListener {
+
+
+    private ClearableEditText storage_recharge_collect_ets;
+    private ImageView storage_recharge_scan_ivs;
+    private int mFocusId;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private Button jlt_storage_in_barcode_save_btn;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_rollout;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("转出");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        storage_recharge_collect_ets = mActivity.findViewById(R.id.storage_recharge_collect_ets);
+        storage_recharge_scan_ivs = mActivity.findViewById(R.id.storage_recharge_scan_ivs);
+        jlt_storage_in_barcode_save_btn = mActivity.findViewById(R.id.jlt_storage_in_barcode_save_btn);
+
+    }
+
+
+    @Override
+    protected void initEvents() {
+        storage_recharge_scan_ivs.setOnClickListener(this);
+        jlt_storage_in_barcode_save_btn.setOnClickListener(this);
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("转出");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.storage_recharge_scan_ivs:
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+            case R.id.jlt_storage_in_barcode_save_btn:
+
+                break;
+        }
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.storage_recharge_collect_ets) {
+                    storage_recharge_collect_ets.setText(result);
+                    storage_recharge_collect_ets.setSelection(result.length());
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/uas/hystorage/fragment/StepReceiveFragment.java

@@ -26,7 +26,7 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 /**
  * Created by RaoMeng on 2020/4/26
- * Desc: 工步接收
+ * Desc: 工序接收
  */
 public class StepReceiveFragment extends BaseFragment {
     private static final int SCAN_BARCODE_CODE = 111;
@@ -41,7 +41,7 @@ public class StepReceiveFragment extends BaseFragment {
 
     @Override
     protected void initViews() {
-        setTitle("工步接收");
+        setTitle("工序接收");
 
         mBarcodeEditText = root.findViewById(R.id.step_receive_barcode_et);
         mScanImageView = root.findViewById(R.id.step_receive_scan_iv);

app/src/main/java/com/uas/hystorage/fragment/StepTransferFragment.java

@@ -27,7 +27,7 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 /**
  * Created by RaoMeng on 2020/4/26
- * Desc: 工步移交
+ * Desc: 工序移交
  */
 public class StepTransferFragment extends BaseFragment {
     private static final int SCAN_BARCODE_CODE = 111;

app/src/main/java/com/uas/hystorage/global/GloableParams.java

@@ -811,11 +811,11 @@ public class GloableParams {
     //获取当前账号可使用的岗位资源
     private static final String ADDRESSTAIL_PAD_GETSOURCEBYEMP = "/api/pdashop/getSource.action";
     /**
-     * 工步移交
+     * 工序移交
      */
     private static final String ADDRESSTAIL_WIPSTEPTURN_SEND = "/api/pdashop/wipStepTurn/send.action";
     /**
-     * 工步接收
+     * 工序接收
      */
     private static final String ADDRESSTAIL_WIPSTEPTURN_ACCEPT = "/api/pdashop/wipStepTurn/accept.action";
     //下载附件
@@ -910,22 +910,30 @@ public class GloableParams {
     public static final String HOME_QUALITY_MANAGE = "品质管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static final String QUERYSTATIONINFORMATION = "过站信息";
+    public static final String POSTPUNCH = "岗位打卡";
+    public static final String MACHINESTARTSANDSTOPS = "机台启停";
     public static String[] homeMenuNames = {
 //            WAREHOUSINGMANAGEMENT,
 //            OUTBOUNDMANAGEMENT,
 //            WAREHOUSEMANAGEMENT,
+            POSTPUNCH,
+            MACHINESTARTSANDSTOPS,
             HOME_DISPATCH_MANAGE,
-//            HOME_QUALITY_MANAGE,
-            GRIDNAME_SETTING,
-            QUERYSTATIONINFORMATION};
+            HOME_QUALITY_MANAGE,
+            GRIDNAME_SETTING
+//            QUERYSTATIONINFORMATION
+    };
     public static int[] homeMenuIcons = {
 //            R.drawable.ic_storage_in,
+            R.drawable.iv_postpunch,
+            R.drawable.iv_touch,
 //            R.drawable.ic_storage_out,
 //            R.drawable.mainmenu_storehousemanager,
             R.drawable.ic_dispatch_manage,
-//            R.drawable.ic_quality_manage,
-            R.drawable.mainmenu_usersetting,
-            R.drawable.astation};
+            R.drawable.ic_quality_manage,
+            R.drawable.mainmenu_usersetting
+//            R.drawable.astation
+    };
 
     //index界面
 
@@ -934,34 +942,45 @@ public class GloableParams {
     public static final String GRIDNAME_WORK_SWITCH = "工单切换";
     public static final String GRIDNAME_IN_MATERIAL = "接料";
     public static final String GRIDNAME_TIME_REPORT = "报工";
-    public static final String GRIDNAME_TIME_REPORT_DETAIL = "报工明细";
+    public static final String GRIDNAME_TIME_REPORT_DETAIL = "产出明细";
     public static final String GRIDNAME_TIME_METRIAL_DETAIL = "物料明细";
-    public static final String GRIDNAME_STEP_TRANSFER = "工步移交";
-    public static final String GRIDNAME_STEP_RECEIVE = "工步接收";
+    public static final String GRIDNAME_STEP_TRANSFER = "工序移交";
+    public static final String GRIDNAME_STEP_RECEIVE = "工序接收";
     public static final String GRIDNAME_COME_IN_SITE = "进站";
     public static final String GRIDNAME_BULIANG_CAIJI = "不良采集";
     public static final String GRIDNAME_CHAI_PI = "拆批";
     public static final String GRIDNAME_TIAO_ZHAN= "跳站";
     public static final String GRIDNAME_HE_PI= "合批";
+    public static final String GRIDNAME__PUTINTO= "投入";
+    public static final String GRIDNAME_ROLLOUT= "转出";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
-    public static String[] indexMainGridNames = {GRIDNAME_WORK_START,
+    public static String[] indexMainGridNames = {
+            GRIDNAME_WORK_START,
            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH,
-           GRIDNAME_COME_IN_SITE,GRIDNAME_IN_MATERIAL, GRIDNAME_TIME_REPORT,
+//           GRIDNAME_COME_IN_SITE,
+           GRIDNAME_IN_MATERIAL,
+           GRIDNAME__PUTINTO,
+           GRIDNAME_ROLLOUT,
+//           GRIDNAME_TIME_REPORT,
            GRIDNAME_TIME_REPORT_DETAIL,GRIDNAME_TIME_METRIAL_DETAIL,
            GRIDNAME_STEP_TRANSFER,GRIDNAME_STEP_RECEIVE,
-           GRIDNAME_BULIANG_CAIJI,GRIDNAME_CHAI_PI,
+//           GRIDNAME_BULIANG_CAIJI,
+           GRIDNAME_CHAI_PI,
            GRIDNAME_TIAO_ZHAN,GRIDNAME_HE_PI
    };
 
     public static int[] indexMainGridImgs = {
             R.drawable.start, R.drawable.pause, R.drawable.swich,
-            R.drawable.ic_storage_finish_in,
-            R.drawable.feeded,R.drawable.report,
+//            R.drawable.ic_storage_finish_in,
+            R.drawable.feeded,
+            R.drawable.report,
+            R.drawable.iv_rollout,
             R.drawable.ic_staff_up,R.drawable.ic_staff_down,
             R.drawable.ic_storage_out,R.drawable.ic_storage_in,
-            R.drawable.ic_exception_handle,R.drawable.storage_bach_operation,
+//            R.drawable.ic_exception_handle,
+            R.drawable.storage_bach_operation,
             R.drawable.index_smt_up,R.drawable.ic_merge_batch
     };
 

app/src/main/java/com/uas/hystorage/tools/RegexUtil.java

@@ -10,7 +10,7 @@ public class RegexUtil {
     //正则表达式
 //    public static String IP_FORMAT = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
     public static String IP_FORMAT = "^((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)(\\.((25[0-5])|(2[0-4]\\d)|(1\\d\\d)|([1-9]\\d)|\\d)){3}$|^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$";
-    public static String PORT_FORMAT = "^[1-9]$|(^[1-9][0-9]$)|(^[1-9][0-9][0-9]$)|(^[1-9][0-9][0-9][0-9]$)|(^[1-6][0-5][0-5][0-3][0-9]$)";
+    public static String PORT_FORMAT = "^[0-9]$|(^[0-9][0-9]$)|(^[0-9][0-9][0-9]$)|(^[0-9][0-9][0-9][0-9]$)|(^[0-6][0-9][0-9][0-9][0-9]$)";
     // public static String PORT_FORMAT = "(\\d)+";
 
     public static boolean checkString(String str, String regx) {

app/src/main/java/com/uas/hystorage/util/Constants.java

@@ -21,7 +21,7 @@ public interface Constants {
         String AUTHORITY_SHOP = "Shop";
         String AUTHORITY_PRODINOUT = "ProdInOut";
         String APK_FILE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/uas_mes/apk";
-        String APK_FILE_NAME = "uas_mes.apk";
+        String APK_FILE_NAME = "hyuas_mes.apk";
         // 修改首页应用 code;
         int REQUEST_CHANGE_APP = 100;
 

app/src/main/res/layout/fragment_decisionbylot.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="抽检判定">
+    </TextView>
+    <LinearLayout
+        android:padding="@dimen/sp_16"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+            <!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+            <!--                android:id="@+id/storage_recharge_collect_ets"-->
+            <!--                style="@style/EditTextStyle"-->
+            <!--                android:layout_weight="1"-->
+            <!--                android:background="@null"-->
+            <!--                android:focusable="true"-->
+            <!--                android:lines="1"-->
+            <!--                android:focusableInTouchMode="true"-->
+            <!--                android:hint="请采集单号"-->
+            <!--                android:imeOptions="actionSend"-->
+            <!--                android:textColor="@color/black" />-->
+            <com.uas.hystorage.view.ClearableEditText
+                android:id="@+id/storage_recharge_collect_ets"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集条码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/storage_recharge_scan_ivs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/fragment_putintoadd.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <CheckBox
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:id="@+id/add_checkbos"
+        android:text="是否混模"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </CheckBox>
+    <LinearLayout
+        android:padding="@dimen/sp_16"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_line_edittext">
+
+<!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+<!--                android:id="@+id/storage_recharge_collect_ets"-->
+<!--                style="@style/EditTextStyle"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@null"-->
+<!--                android:focusable="true"-->
+<!--                android:lines="1"-->
+<!--                android:focusableInTouchMode="true"-->
+<!--                android:hint="请采集单号"-->
+<!--                android:imeOptions="actionSend"-->
+<!--                android:textColor="@color/black" />-->
+            <com.uas.hystorage.view.ClearableEditText
+                android:id="@+id/storage_recharge_collect_ets"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集条码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/storage_recharge_scan_ivs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+    <ScrollView
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:padding="@dimen/textsize_16">
+
+        <com.bin.david.form.core.SmartTable
+            android:layout_marginTop="@dimen/textsize_20"
+            android:id="@+id/jlt_storage_in_filter_list_sts"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_marginBottom="@dimen/dp_10"/>
+
+    </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:background="@color/white"
+        android:paddingLeft="@dimen/sp_16"
+        android:paddingRight="@dimen/sp_16"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <Button
+            android:id="@+id/jlt_storage_in_generate_detailed_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="生成明细"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_barcode_save_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="确认"
+            android:enabled="false"
+            />
+        <Button
+            android:id="@+id/jlt_storage_in_audit_btn"
+            style="@style/ButtonStyle"
+            android:layout_width="0dp"
+            android:layout_margin="12dp"
+            android:layout_weight="1"
+            android:text="审核"
+            android:enabled="false"
+            />
+
+    </LinearLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_reworkdecision.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="返工判定">
+    </TextView>
+
+
+</LinearLayout>

app/src/main/res/layout/fragment_rollout.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="转出">
+        </TextView>
+        <LinearLayout
+            android:padding="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_line_edittext">
+
+                <!--            <com.uas.uas_mes_zb_p.view.ClearableEditText-->
+                <!--                android:id="@+id/storage_recharge_collect_ets"-->
+                <!--                style="@style/EditTextStyle"-->
+                <!--                android:layout_weight="1"-->
+                <!--                android:background="@null"-->
+                <!--                android:focusable="true"-->
+                <!--                android:lines="1"-->
+                <!--                android:focusableInTouchMode="true"-->
+                <!--                android:hint="请采集单号"-->
+                <!--                android:imeOptions="actionSend"-->
+                <!--                android:textColor="@color/black" />-->
+                <com.uas.hystorage.view.ClearableEditText
+                    android:id="@+id/storage_recharge_collect_ets"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="请采集条码"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/storage_recharge_scan_ivs"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginRight="10dp"
+                    android:clickable="false"
+                    android:src="@drawable/ic_edittext_scan" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+        <LinearLayout
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black"
+                android:text="数量：">
+            </TextView>
+            <com.uas.hystorage.view.ClearableEditText
+                android:id="@+id/ct_qty"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请输入数量"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+    <Button
+        android:id="@+id/jlt_storage_in_barcode_save_btn"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:layout_alignParentBottom="true"
+        android:text="确认" />
+
+</RelativeLayout>

app/src/main/res/layout/pop_exit_application.xml

@@ -9,7 +9,7 @@
         android:layout_width="260dp"
         android:layout_height="100dp"
         android:gravity="center"
-        android:text="确定退出UAS车间工作站？" />
+        android:text="确定退出UAS工序采集？" />
 
     <View style="@style/view_gray_line" />
 

app/src/main/res/layout/splash_root_copyright.xml

@@ -11,7 +11,7 @@
         android:textColor="@color/white"
         android:id="@+id/tv_root_chin_connectserver_fragment"
         style="@style/RootText"
-        android:text="UAS车间工作站" />
+        android:text="工序采集" />
 
     <TextView
         android:textStyle="bold"

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">UAS-MES</string>
-    <string name="app_name_mes">UAS-MES</string>
+    <string name="app_name_mes">华研UAS-MES</string>
     <string name="app_name_test">华研</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
@@ -422,6 +422,7 @@
     <string name="title_storage_inspection">送检</string>
     <string name="title_storage_iqc">IQC入库</string>
     <string name="title_storage_recharge">收料</string>
+    <string name="title_storage_rechargeadd">投入</string>
 
     <string-array name="material_collect_menu">
         <item>已采集列表</item>