入库扫描界面去掉采集信息、待采提示，去掉待采提示列表，增加采集数据汇总界面，接口对接

入库扫描界面仓位、LotNo、日期、字符增加勾选框逻辑

app/src/main/java/com/uas/uas_mes_standard/bean/StockTaskMultipleBean.java

@@ -33,8 +33,26 @@ public class StockTaskMultipleBean {
     private int BA_HASBARCODE;
     private double BAR_REMAIN;
     private String DC;
+    private double INQTY;
+    private double PBQTY;
     private List<NOSBean> NOS;
 
+    public double getINQTY() {
+        return INQTY;
+    }
+
+    public void setINQTY(double INQTY) {
+        this.INQTY = INQTY;
+    }
+
+    public double getPBQTY() {
+        return PBQTY;
+    }
+
+    public void setPBQTY(double PBQTY) {
+        this.PBQTY = PBQTY;
+    }
+
     public String getPR_ORISPECCODE() {
         return PR_ORISPECCODE;
     }

app/src/main/java/com/uas/uas_mes_standard/fragment/JLTStorageInBarcodeFragment.java

@@ -44,13 +44,11 @@ import com.uas.uas_mes_standard.adapter.JLTSearchWhcodeAdapter;
 import com.uas.uas_mes_standard.adapter.NewJLTStorageInTodoAdapter;
 import com.uas.uas_mes_standard.adapter.SecondaryListAdapter;
 import com.uas.uas_mes_standard.application.PdaApplication;
-import com.uas.uas_mes_standard.bean.HaveBeenTakenBean;
 import com.uas.uas_mes_standard.bean.JLTBarcodeParseBean;
 import com.uas.uas_mes_standard.bean.JLTBrandEntity;
 import com.uas.uas_mes_standard.bean.JLTMpqEntity;
 import com.uas.uas_mes_standard.bean.JLTPkgEntity;
 import com.uas.uas_mes_standard.bean.JLTStorageModelBean;
-import com.uas.uas_mes_standard.bean.LongClickDeleteBean;
 import com.uas.uas_mes_standard.bean.WhcodeBean;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.listener.MyEditorActionListener;
@@ -71,9 +69,6 @@ import com.uas.uas_mes_standard.view.RecyclerItemDecoration;
 import com.uas.uas_mes_standard.view.business.CommonSelectPop;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONException;
 
 import java.util.ArrayList;
@@ -130,6 +125,10 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private StringRequest mStringRequest;
     private TextView mResultTextView;
     private String jlt_storage_in_barcode_etstrim;
+    private CheckBox check_box_positions;
+    private CheckBox check_box_lono;
+    private CheckBox check_box_date;
+    private CheckBox check_box_dc;
 
     public void setOnFinishListener(OnFinishListener onFinishListener) {
         mOnFinishListener = onFinishListener;
@@ -185,6 +184,17 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         jlt_edit_dataecode = root.findViewById(R.id.jlt_edit_dataecode);
         jlt_edit_dc = root.findViewById(R.id.jlt_edit_DC);
         jlt_edit_qty = root.findViewById(R.id.jlt_edit_QTY);
+        /**
+         * 勾选框
+         */
+        //仓位
+        check_box_positions = root.findViewById(R.id.check_box_positions);
+        //LoNo
+        check_box_lono = root.findViewById(R.id.check_box_lono);
+        //日期
+        check_box_date = root.findViewById(R.id.check_box_date);
+        //字符
+        check_box_dc = root.findViewById(R.id.check_box_dc);
 
         mBarcodeParseBean = new JLTBarcodeParseBean();
         mBarcodeParseBean.setCHECKPO("N");
@@ -214,7 +224,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
     @Override
     protected void initEvents() {
-        EventBus.getDefault().register(this);
 
         mMoreButton.setOnClickListener(this);
         mCalendarImageView.setOnClickListener(this);
@@ -235,6 +244,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mBrandEditText.addTextChangedListener(new MyTextWatcher(mBrandEditText));
         mEnclosureEditText.addTextChangedListener(new MyTextWatcher(mEnclosureEditText));
 
+        //扫描条码号回车
         CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
@@ -243,6 +253,59 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             }
         });
 
+        //QTY回车
+        CommonUtil.setEditorActionListener(jlt_edit_qty, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                newlineqtyEnter();
+
+            }
+        });
+
+
+        //输入条码号回车
+        CommonUtil.setEditorActionListener(jlt_storage_in_barcode_et, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                newlinebarcodeEnter();
+
+            }
+        });
+
+        //仓位回车
+        CommonUtil.setEditorActionListener(mLotEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                newlinemLotEnter();
+
+            }
+        });
+        //LONO回车
+        CommonUtil.setEditorActionListener(jlt_edit_lotno, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                newlinemLotonEnter();
+
+            }
+        });
+        //日期回车
+        CommonUtil.setEditorActionListener(jlt_edit_dataecode, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                newlinemdateEnter();
+
+            }
+        });
+        //字符回车
+        CommonUtil.setEditorActionListener(jlt_edit_dc, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                clearableedittextjudge();
+            }
+        });
+
+
+
 //        CommonUtil.setEditorActionListener(mModelEditText, new MyEditorActionListener() {
 //            @Override
 //            public void MyEditorAction(String text, int actionId, KeyEvent event) {
@@ -346,18 +409,18 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
             }
         });
-        mMenuRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup group, int checkedId) {
-                if (checkedId == R.id.jlt_pick_material_out_scan_info_rb) {
-                    mRecyclerView.setVisibility(View.GONE);
-                    jlt_line_edit.setVisibility(View.VISIBLE);
-                } else if (checkedId == R.id.jlt_pick_material_out_scan_sign_rb) {
-                    mRecyclerView.setVisibility(View.VISIBLE);
-                    jlt_line_edit.setVisibility(View.GONE);
-                }
-            }
-        });
+//        mMenuRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+//            @Override
+//            public void onCheckedChanged(RadioGroup group, int checkedId) {
+//                if (checkedId == R.id.jlt_pick_material_out_scan_info_rb) {
+//                    mRecyclerView.setVisibility(View.GONE);
+//                    jlt_line_edit.setVisibility(View.VISIBLE);
+//                } else if (checkedId == R.id.jlt_pick_material_out_scan_sign_rb) {
+//                    mRecyclerView.setVisibility(View.VISIBLE);
+//                    jlt_line_edit.setVisibility(View.GONE);
+//                }
+//            }
+//        });
 
     }
     public void CheckBoxData(){
@@ -405,15 +468,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
 
         mTypeTextView.setText(mPiClass);
 
-        if (!TextUtils.isEmpty(mPiid)) {
-            getNeedList();
-        }
-
-    }
-    //刷新界面
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(LongClickDeleteBean webViewEventBusBean) {
-        getNeedList();
     }
 
 
@@ -728,10 +782,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             case R.id.jlt_storage_in_barcode_save_btn:
 //                saveBarcode(false, true);
 
-                Savebtn_barcode();
-                if (!TextUtils.isEmpty(mPiid)) {
-                    getNeedList();
-                }
+                clearableedittextjudge();
                 break;
             case R.id.jlt_storage_in_barcode_next_btn:
                 saveBarcode(true, true);
@@ -748,27 +799,136 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 break;
         }
     }
-    public void Savebtn_barcode(){
-        progressDialog.show();
-        String mBarcodeEditTexts = mBarcodeEditText.getText().toString().trim();
+    //输入框回车换行
+    public void newlineqtyEnter(){
         String jlt_storage_in_barcode_ets = jlt_storage_in_barcode_et.getText().toString().trim();
         String mLotEditTexts = mLotEditText.getText().toString().trim();//仓位
-        String jlt_edit_lotnos = jlt_edit_lotno.getText().toString().trim();
-        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();
-        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();
-        String jlt_edit_qtys = jlt_edit_qty.getText().toString().trim();
-        if (mLotEditTexts.isEmpty()){
+        String jlt_edit_lotnos = jlt_edit_lotno.getText().toString().trim();//LoNo
+        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        if (jlt_storage_in_barcode_ets.isEmpty()){
+            jlt_storage_in_barcode_et.requestFocus();
+            return;
+        }
+        if (check_box_positions.isChecked()==true&&mLotEditTexts.isEmpty()){
+            mLotEditText.requestFocus();
+            return;
+        }
+        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+            jlt_edit_lotno.requestFocus();
+            return;
+        }
+        if (check_box_date.isChecked()==true&&jlt_edit_dataecodes.isEmpty()){
+            jlt_edit_dataecode.requestFocus();
+            return;
+        }
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            jlt_edit_dc.requestFocus();
+            return;
+        }
+        clearableedittextjudge();
+    }
+    public void newlinebarcodeEnter(){
+        String mLotEditTexts = mLotEditText.getText().toString().trim();//仓位
+        String jlt_edit_lotnos = jlt_edit_lotno.getText().toString().trim();//LoNo
+        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        if (check_box_positions.isChecked()==true&&mLotEditTexts.isEmpty()){
+            mLotEditText.requestFocus();
+            return;
+        }
+        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+            jlt_edit_lotno.requestFocus();
+            return;
+        }
+        if (check_box_date.isChecked()==true&&jlt_edit_dataecodes.isEmpty()){
+            jlt_edit_dataecode.requestFocus();
+            return;
+        }
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            jlt_edit_dc.requestFocus();
+            return;
+        }
+        clearableedittextjudge();
+    }
+    public void newlinemLotEnter(){
+        String jlt_edit_lotnos = jlt_edit_lotno.getText().toString().trim();//LoNo
+        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+            jlt_edit_lotno.requestFocus();
+            return;
+        }
+        if (check_box_date.isChecked()==true&&jlt_edit_dataecodes.isEmpty()){
+            jlt_edit_dataecode.requestFocus();
+            return;
+        }
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            jlt_edit_dc.requestFocus();
+            return;
+        }
+        clearableedittextjudge();
+    }
+    public void newlinemLotonEnter(){
+        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        if (check_box_date.isChecked()==true&&jlt_edit_dataecodes.isEmpty()){
+            jlt_edit_dataecode.requestFocus();
+            return;
+        }
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            jlt_edit_dc.requestFocus();
+            return;
+        }
+        clearableedittextjudge();
+    }
+    public void newlinemdateEnter(){
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            jlt_edit_dc.requestFocus();
+            return;
+        }
+        clearableedittextjudge();
+    }
+    public void clearableedittextjudge(){
+        String mBarcodeEditTexts = mBarcodeEditText.getText().toString().trim();//采集条码号
+        String jlt_storage_in_barcode_ets = jlt_storage_in_barcode_et.getText().toString().trim();//条码号
+        String mLotEditTexts = mLotEditText.getText().toString().trim();//仓位
+        String jlt_edit_lotnos = jlt_edit_lotno.getText().toString().trim();//LoNo
+        String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
+        String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
+        String jlt_edit_qtys = jlt_edit_qty.getText().toString().trim();//QTY
+        if (check_box_positions.isChecked()==true&&mLotEditTexts.isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "仓位不可为空");
             return;
         }
-        if (mBarcodeEditTexts.isEmpty()){
-            CommonUtil.toastNoRepeat(mActivity, "条码号不可为空");
+        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "LoNo不可为空");
+            return;
+        }
+        if (check_box_date.isChecked()==true&&jlt_edit_dataecodes.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "日期不可为空");
             return;
         }
+        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "字符不可为空");
+            return;
+        }
+
+        Savebtn_barcode(mBarcodeEditTexts,jlt_storage_in_barcode_ets,mLotEditTexts,jlt_edit_lotnos,jlt_edit_dataecodes,jlt_edit_dcs,jlt_edit_qtys);
+    }
+    public void Savebtn_barcode(String mBarcodeEditTexts,String jlt_storage_in_barcode_ets,String mLotEditTexts,String jlt_edit_lotnos,
+                                String jlt_edit_dataecodes,String jlt_edit_dcs,String jlt_edit_qtys){
         if (jlt_edit_qtys.isEmpty()){
             CommonUtil.toastNoRepeat(mActivity, "数量不可为空");
             return;
         }
+
+        if (mBarcodeEditTexts.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "条码号不可为空");
+            return;
+        }
+
         JSONObject obj = new JSONObject();
         obj.put("LOCATION", mLotEditTexts);
         obj.put("PRODCODE", prodcode);
@@ -790,7 +950,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         obj.put("CONTENT", mBarcodeEditTexts);
         obj.put("QTY", jlt_edit_qtys);
         String stores = obj.toString();
-
+        progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_PDAIO_PUT_SAVEBARCODE2CONFIRM)
                 .method(Request.Method.POST)
@@ -856,10 +1016,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 jlt_edit_qty.setText("");
 //                resetState();
                 mBarcodeEditText.requestFocus();
-                if (!TextUtils.isEmpty(mPiid)) {
-                    getNeedList();
-                    Log.e("刷新","舒心入库俩啊");
-                }
 
 
             }
@@ -871,8 +1027,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 CommonUtil.toastNoRepeat(mActivity, failStr);
             }
         });
-
-
     }
     private void saveBarcode(boolean exist, boolean checkDate) {
         if (TextUtils.isEmpty(mBarcodeParseBean.getPN()) ||
@@ -957,21 +1111,11 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
             return;
         }
-//        if (TextUtils.isEmpty(mModelEditTexttrim)){
-//            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
-//            return;
-//        }
-//        if (TextUtils.isEmpty(mLotEditTexttrim)){
-//            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
-//            return;
-//        }
         progressDialog.show();
-//        String jsonString = JSON.toJSONString(mBarcodeParseBean);
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_RECEIVING_SAVEBARCODE2)
                 .method(Request.Method.POST)
                 .tag(TAG + "savebarcode")
-//                .addParam("store", jsonString)//location  brand
                 .addParam("pi_ids", mPiid)
                 .addParam("brand", mModelEditTexttrim)
                 .addParam("location", mLotEditTexttrim)
@@ -980,7 +1124,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-//                try {
                     String result = o.toString();
                     Log.e("result",result);
                     JSONObject resultObject = JSON.parseObject(result);
@@ -991,72 +1134,23 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                         String dc = FastjsonUtil.getText(dataObject, "DC");
                         String qty = FastjsonUtil.getText(dataObject, "QTY");
                         prodcode = FastjsonUtil.getText(dataObject, "PRODCODE");
+                        String lc = FastjsonUtil.getText(dataObject, "LC");
+                        mLotEditText.setText(lc);
 
                         jlt_edit_lotno.setText(lotno);
                         jlt_edit_dataecode.setText(datecode);
                         jlt_edit_dc.setText(dc);
                         jlt_edit_qty.setText(qty);
-
                     }
-//                        boolean isCheck = FastjsonUtil.getBoolean(dataObject, "isCheck");
-//                        if (!isCheck) {
-//                            new AlertDialog.Builder(mActivity)
-//                                    .setTitle("提示")
-//                                    .setMessage("PO：" + mBarcodeParseBean.getORDERCODE() + "不在当前入库单据范围内，是否继续保存？")
-//                                    .setNegativeButton("取消", null)
-//                                    .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-//                                        @Override
-//                                        public void onClick(DialogInterface dialog, int which) {
-//                                            mPoCheckBox.setChecked(false);
-//                                            saveBarcode(exist, false);
-//                                        }
-//                                    }).create().show();
-//                            return;
-//                        }
-//
-//                        CommonUtil.toastNoRepeat(mActivity, "归属入库单："
-//                                + FastjsonUtil.getText(dataObject, "INOUTNO")
-//                                + "成功");
-//
-//                        boolean isFinish = FastjsonUtil.getBoolean(dataObject, "ISFINISH");
-//                        if (isFinish) {
-//                            CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
-//                            mBarcodeEditText.setText("");
-//                            mBarcodeEditText.requestFocus();
-////                            resetState();
-////                            getActivity().getSupportFragmentManager().popBackStackImmediate();
-////                            if (mOnFinishListener != null) {
-////                                mOnFinishListener.onFinish();
-////                            }
-//                        } else {
-//                            if (exist) {
-//                                getActivity().getSupportFragmentManager().popBackStack();
-//                            } else {
-//                                mBarcodeEditText.setText("");
-//                                mBarcodeEditText.requestFocus();
-////                                resetState();
-//                            }
-//                        }
-//                    }
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-////                resetState();
-//                mBarcodeEditText.requestFocus();
-//                if (!TextUtils.isEmpty(mPiid)) {
-//                    getNeedList();
-//                    Log.e("刷新","舒心入库俩啊");
-//                }
+
+                        jlt_edit_qty.requestFocus();
+                        jlt_edit_qty.setSelection(jlt_edit_qty.getText().toString().trim().length());
             }
 
             @Override
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
-
                 CommonUtil.toastNoRepeat(mActivity, failStr);
-                if (!TextUtils.isEmpty(mPiid)) {
-                    getNeedList();
-                }
             }
         });
     }
@@ -1087,6 +1181,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 Date date = (Date) data.getSerializableExtra("extra_date");
                 String formatDate = DateFormat.format("yyyy-MM-dd", date).toString();
                 jlt_edit_dataecode.setText(formatDate);
+                jlt_edit_dataecode.setSelection(jlt_edit_dataecode.getText().toString().trim().length());
                 mDatecodebyparse = formatDate;
             } catch (Exception e) {
                 jlt_edit_dataecode.setText("");
@@ -1130,11 +1225,19 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         Button pop_material_in_menu_1 = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_1);
         Button pop_material_in_menu_5 = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_5);
         Button pop_material_in_menu_2 = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_2);
+        Button pop_toadoptprompt = (Button) mMenuView.findViewById(R.id.pop_toadoptprompt);
 
         postBtn.setVisibility(View.GONE);
         todoListBtn.setVisibility(View.GONE);
         revokeCollectBtn.setText("确认入库");
         revokeCollectBtn.setVisibility(View.GONE);
+        pop_toadoptprompt.setOnClickListener(new View.OnClickListener() {//待采提示
+            @Override
+            public void onClick(View v) {
+                closeMenuPopupWindow();
+                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, ToadoptpromptFragment.newInstance(mPiid,mPiInoutno));
+            }
+        });
 
         todoListBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1480,86 +1583,79 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             }
         }
     }
-    private void getNeedList() {
-        progressDialog.show();
-
-        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_JLT_RECEIVING_GETNEEDLIST)
-                .method(Request.Method.GET)
-                .tag(TAG + "getneedlist")
-                .addParam("pi_ids", mPiid)
-                .build(), new HttpCallback() {
-            @Override
-            public void onSuccess(int flag, Object o) throws Exception {
-                try {
-                    progressDialog.dismiss();
-                    String result = o.toString();
-
-                    JSONObject resultObject = JSON.parseObject(result);
-                    JSONArray dataArray = resultObject.getJSONArray("data");
-                    if (dataArray == null || dataArray.size() == 0) {
-                        CommonUtil.toastNoRepeat(mActivity, "数据为空");
-                        return;
-                    }
-
-                    List<SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean>> mSecondaryListBeen = new ArrayList<>();
-                    for (int i = 0; i < dataArray.size(); i++) {
-                        JSONObject dataObject = dataArray.getJSONObject(i);
-                        if (dataObject != null) {
-                            String inoutno = FastjsonUtil.getText(dataObject, "PB_INOUTNO");
-
-                            JSONArray modelArray = dataObject.getJSONArray("list");
-                            List<JLTStorageModelBean> jltStorageModelBeans = new ArrayList<>();
-                            if (modelArray != null && modelArray.size() > 0) {
-                                for (int j = 0; j < modelArray.size(); j++) {
-                                    JSONObject modelObject = modelArray.getJSONObject(j);
-                                    if (modelObject != null) {
-                                        JLTStorageModelBean jltStorageModelBean = new JLTStorageModelBean();
-                                        jltStorageModelBean.setModel(FastjsonUtil.getText(modelObject, "ORISPECCODE"));
-                                        jltStorageModelBean.setProdcode(FastjsonUtil.getText(modelObject,"PD_PRODCODE"));
-                                        jltStorageModelBean.setQuantity(FastjsonUtil.getText(modelObject, "RESTQTY"));
-                                        jltStorageModelBean.setDoneQty(FastjsonUtil.getText(modelObject, "PBQTY"));
-                                        jltStorageModelBean.setPr_brand(FastjsonUtil.getText(modelObject, "PR_BRAND"));
-                                        jltStorageModelBean.setPrcode(FastjsonUtil.getText(modelObject, "PRCODE"));
-                                        jltStorageModelBeans.add(jltStorageModelBean);
-                                    }
-                                }
-                            }
-                            SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean> secondaryListBean
-                                    = new SecondaryListAdapter.SecondaryListBean<>(inoutno, jltStorageModelBeans);
-
-                            mSecondaryListBeen.add(secondaryListBean);
-                        }
-                    }
-                    mStorageInTodoAdapter.setDatas(mSecondaryListBeen);
-                    mRecyclerView.setAdapter(mStorageInTodoAdapter);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void onFail(int flag, String failStr) throws Exception {
-                progressDialog.dismiss();
-
-                CommonUtil.toastNoRepeat(mActivity, failStr);
-            }
-        });
-    }
+//    private void getNeedList() {
+//        progressDialog.show();
+//
+//        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+//                .url(GloableParams.ADDRESS_JLT_RECEIVING_GETNEEDLIST)
+//                .method(Request.Method.GET)
+//                .tag(TAG + "getneedlist")
+//                .addParam("pi_ids", mPiid)
+//                .build(), new HttpCallback() {
+//            @Override
+//            public void onSuccess(int flag, Object o) throws Exception {
+//                try {
+//                    progressDialog.dismiss();
+//                    String result = o.toString();
+//
+//                    JSONObject resultObject = JSON.parseObject(result);
+//                    JSONArray dataArray = resultObject.getJSONArray("data");
+//                    if (dataArray == null || dataArray.size() == 0) {
+//                        CommonUtil.toastNoRepeat(mActivity, "数据为空");
+//                        return;
+//                    }
+//
+//                    List<SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean>> mSecondaryListBeen = new ArrayList<>();
+//                    for (int i = 0; i < dataArray.size(); i++) {
+//                        JSONObject dataObject = dataArray.getJSONObject(i);
+//                        if (dataObject != null) {
+//                            String inoutno = FastjsonUtil.getText(dataObject, "PB_INOUTNO");
+//
+//                            JSONArray modelArray = dataObject.getJSONArray("list");
+//                            List<JLTStorageModelBean> jltStorageModelBeans = new ArrayList<>();
+//                            if (modelArray != null && modelArray.size() > 0) {
+//                                for (int j = 0; j < modelArray.size(); j++) {
+//                                    JSONObject modelObject = modelArray.getJSONObject(j);
+//                                    if (modelObject != null) {
+//                                        JLTStorageModelBean jltStorageModelBean = new JLTStorageModelBean();
+//                                        jltStorageModelBean.setModel(FastjsonUtil.getText(modelObject, "ORISPECCODE"));
+//                                        jltStorageModelBean.setProdcode(FastjsonUtil.getText(modelObject,"PD_PRODCODE"));
+//                                        jltStorageModelBean.setQuantity(FastjsonUtil.getText(modelObject, "RESTQTY"));
+//                                        jltStorageModelBean.setDoneQty(FastjsonUtil.getText(modelObject, "PBQTY"));
+//                                        jltStorageModelBean.setPr_brand(FastjsonUtil.getText(modelObject, "PR_BRAND"));
+//                                        jltStorageModelBean.setPrcode(FastjsonUtil.getText(modelObject, "PRCODE"));
+//                                        jltStorageModelBeans.add(jltStorageModelBean);
+//                                    }
+//                                }
+//                            }
+//                            SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean> secondaryListBean
+//                                    = new SecondaryListAdapter.SecondaryListBean<>(inoutno, jltStorageModelBeans);
+//
+//                            mSecondaryListBeen.add(secondaryListBean);
+//                        }
+//                    }
+//                    mStorageInTodoAdapter.setDatas(mSecondaryListBeen);
+//                    mRecyclerView.setAdapter(mStorageInTodoAdapter);
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//
+//            @Override
+//            public void onFail(int flag, String failStr) throws Exception {
+//                progressDialog.dismiss();
+//
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+//            }
+//        });
+//    }
     public interface OnFinishListener {
         void onFinish();
     }
-    @Subscribe
-    public void onPermissions(HaveBeenTakenBean bean){
-        if (!TextUtils.isEmpty(mPiid)) {
-            getNeedList();
-        }
-    }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        //注销
-        EventBus.getDefault().unregister(this);
+
     }
 }

app/src/main/java/com/uas/uas_mes_standard/fragment/StorageInBarDetailsCollectListFragment.java

@@ -6,7 +6,6 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -22,7 +21,6 @@ import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.uas_mes_standard.R;
 import com.uas.uas_mes_standard.adapter.StorageInCollectAdapter;
-import com.uas.uas_mes_standard.bean.LongClickDeleteBean;
 import com.uas.uas_mes_standard.bean.StockAlreadyItemBean;
 import com.uas.uas_mes_standard.global.GloableParams;
 import com.uas.uas_mes_standard.listener.MyEditorActionListener;
@@ -36,8 +34,6 @@ import com.uas.uas_mes_standard.util.VolleyRequest;
 import com.uas.uas_mes_standard.view.ClearableEditText;
 import com.uas.uas_mes_standard.view.RecyclerItemDecoration;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -151,7 +147,6 @@ public class StorageInBarDetailsCollectListFragment extends BaseFragment {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     StockAlreadyItemBean itemBean = mCollectList.get(position);
-                                    Log.e("igetBI_ID()",itemBean.getBI_ID());
                                     getLongDelete(itemBean.getBI_ID());
                                 }
                             }).show();
@@ -335,7 +330,6 @@ public class StorageInBarDetailsCollectListFragment extends BaseFragment {
             public void onSuccess(int flag, Object o) throws Exception {
                     progressDialog.dismiss();
                     getCollectList(mPageIndex, mPageSize);
-                    EventBus.getDefault().post(new LongClickDeleteBean("刷新页面"));
             }
 
             @Override

app/src/main/java/com/uas/uas_mes_standard/fragment/ToadoptpromptFragment.java

@@ -0,0 +1,177 @@
+package com.uas.uas_mes_standard.fragment;
+
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.IFormat;
+import com.bin.david.form.data.table.TableData;
+import com.uas.uas_mes_standard.R;
+import com.uas.uas_mes_standard.bean.StockTaskMultipleBean;
+import com.uas.uas_mes_standard.global.GloableParams;
+import com.uas.uas_mes_standard.util.CommonUtil;
+import com.uas.uas_mes_standard.util.FastjsonUtil;
+import com.uas.uas_mes_standard.util.HttpCallback;
+import com.uas.uas_mes_standard.util.HttpParams;
+import com.uas.uas_mes_standard.util.VolleyRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by cjh on 2021/4/22
+ * Desc: 待采提示
+ */
+public class ToadoptpromptFragment extends BaseFragment {
+    private SmartTable mSmartTable;
+    private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
+    private Column<Double> mPdaqtyColumn, mDetailColumn;
+    private TableData<StockTaskMultipleBean> mTableData;
+    private TextView mNumTextView;
+    private CheckBox mCheckBox;
+    private String mPiid;
+    private List<StockTaskMultipleBean> mStockTaskMultipleBeans;
+    private String mPiInoutno;
+
+    public static ToadoptpromptFragment newInstance(String piid,String mPiInoutno) {
+
+        Bundle args = new Bundle();
+        args.putString("pi_id", piid);
+        args.putString("pi_inoutno", mPiInoutno);
+        ToadoptpromptFragment fragment = new ToadoptpromptFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_stock_data_summary;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("采集数据汇总");
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            mPiid = bundle.getString("pi_id");
+            mPiInoutno = bundle.getString("pi_inoutno");
+        }
+
+        mNumTextView = root.findViewById(R.id.stock_data_summary_num_tv);
+        mCheckBox = root.findViewById(R.id.stock_data_summary_cb);
+        mSmartTable = root.findViewById(R.id.stock_data_summary_st);
+
+        CommonUtil.getDefaultTable(mActivity, mSmartTable);
+        mTypeColumn = new Column<String>("  型号  ", "PR_ORISPECCODE");
+        mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
+        mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
+        mPdaqtyColumn = new Column<Double>("入库数量", "INQTY", new IFormat<Double>() {
+            @Override
+            public String format(Double aDouble) {
+                return CommonUtil.doubleFormat(aDouble);
+            }
+        });
+        mDetailColumn = new Column<Double>("已采集数量", "PBQTY", new IFormat<Double>() {
+            @Override
+            public String format(Double aDouble) {
+                return CommonUtil.doubleFormat(aDouble);
+            }
+        });
+    }
+
+    @Override
+    protected void initEvents() {
+        mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                getDataList();
+            }
+        });
+    }
+
+    @Override
+    protected void initDatas() {
+        mNumTextView.setText("单号：" + mPiInoutno);
+        mStockTaskMultipleBeans = new ArrayList<>();
+        setTableData(mStockTaskMultipleBeans);
+
+        getDataList();
+    }
+
+    private void setTableData(List<StockTaskMultipleBean> filterTableData) {
+        mTableData = new TableData<StockTaskMultipleBean>("出库单列表", filterTableData,
+                mOutqtyColumn, mProdcodeColumn, mTypeColumn,mPdaqtyColumn, mDetailColumn);
+        mSmartTable.setTableData(mTableData);
+        mSmartTable.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mSmartTable.postInvalidate();
+            }
+        }, 100);
+    }
+
+    private void getDataList() {
+        progressDialog.show();
+        mStockTaskMultipleBeans.clear();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT)
+                .method(Request.Method.POST)
+                .addParam("pi_ids", mPiid)
+                .addParam("showall", mCheckBox.isChecked() ? "-1" : "0")//如果CheckBox为真,执行-1否则执行0
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONArray dataArray = resultObject.getJSONArray("data");
+                    if (dataArray != null && dataArray.size() > 0) {
+                        for (int i = 0; i < dataArray.size(); i++) {
+                            JSONObject dataObject = dataArray.getJSONObject(i);
+                            if (dataObject != null) {
+                                StockTaskMultipleBean stockTaskMultipleBean = new StockTaskMultipleBean();
+                                stockTaskMultipleBean.setPD_PRODCODE(FastjsonUtil.getText(dataObject, "PD_PRODCODE"));
+                                stockTaskMultipleBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
+                                stockTaskMultipleBean.setINQTY(FastjsonUtil.getDouble(dataObject, "INQTY"));
+                                stockTaskMultipleBean.setPBQTY(FastjsonUtil.getDouble(dataObject, "PBQTY"));
+                                //新增型号
+                                stockTaskMultipleBean.setPR_ORISPECCODE(FastjsonUtil.getText(dataObject,"PR_ORISPECCODE"));
+
+                                mStockTaskMultipleBeans.add(stockTaskMultipleBean);
+                            }
+                        }
+                    }
+                    setTableData(mStockTaskMultipleBeans);
+                } catch (Exception e) {
+                    setTableData(mStockTaskMultipleBeans);
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                setTableData(mStockTaskMultipleBeans);
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

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

@@ -252,6 +252,7 @@ public class GloableParams {
     public static String ADDRESS_PDAIO_OUT_DELETEBARCODE;
     public static String ADDRESS_PDAIO_PUT_SAVEBARCODE2CONFIRM;
     public static String ADDRESS_PDAIO_GET_lOGINDELETE;
+    public static String ADDRESS_PUTMATERIAL_TOADOPTPROMPT;
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -643,7 +644,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM="/api/pda/receiving/saveBarcode2Confirm.action";
     //入库扫描已采集列表长按删除
     private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE="/api/pda/receiving/deleteAllBarDetails.action";
-
+    //入库待采提示
+    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT="/api/pda/receiving/getNeedList2.action";
 
     /**
      * 完工品出库
@@ -1131,7 +1133,7 @@ public class GloableParams {
         GloableParams.ADDRESS_PDAIO_OUT_DELETEBARCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_OUT_DELETEBARCODE;
         GloableParams.ADDRESS_PDAIO_PUT_SAVEBARCODE2CONFIRM = uriHead + GloableParams.ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM;
         GloableParams.ADDRESS_PDAIO_GET_lOGINDELETE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_lOGINDELETE;
-
+        GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT;
 
 
 

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

@@ -13,18 +13,30 @@
         android:layout_height="wrap_content">
 
         <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="单号："
             android:textColor="#333333" />
 
         <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
             android:id="@+id/jlt_storage_in_barcode_box_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textColor="#333333"
             tools:text="2138424923" />
+        <TextView
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:id="@+id/jlt_storage_in_todo_list_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#333333"
+            tools:text="采购验收单" />
         <CheckBox
             android:gravity="center"
             android:layout_gravity="center"
@@ -108,39 +120,7 @@
                     android:paddingRight="10dp"
                     android:src="@drawable/ic_edittext_scan" />
             </LinearLayout>
-            <LinearLayout
-                android:id="@+id/jlt_storage_in_barcode_line"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp">
 
-                <TextView
-                    style="@style/tl_tv_style"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:minWidth="60dp"
-                    android:text="条码号"
-                    android:textColor="@color/body_text_1"
-                    android:textSize="16sp" />
-
-                <com.uas.uas_mes_standard.view.ClearableEditText
-                    android:id="@+id/jlt_storage_in_barcode_et"
-                    style="@style/EditTextStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请采集条码号" />
-
-                <ImageView
-                    android:visibility="gone"
-                    android:id="@+id/jlt_storage_in_barcode_iv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="@color/white"
-                    android:clickable="false"
-                    android:paddingRight="10dp"
-                    android:src="@drawable/ic_edittext_scan" />
-            </LinearLayout>
 
 
 
@@ -312,27 +292,7 @@
                     android:hint="请采集PO号" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp">
-
-                <TextView
-                    style="@style/tl_tv_style"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:minWidth="60dp"
-                    android:text="仓位"
-                    android:textColor="@color/body_text_1"
-                    android:textSize="16sp" />
 
-                <com.uas.uas_mes_standard.view.ClearableEditText
-                    android:id="@+id/jlt_storage_in_barcode_lot_et"
-                    style="@style/EditTextStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请采集仓位" />
-            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -364,16 +324,8 @@
                     android:src="@drawable/icon_search" />
             </LinearLayout>
 
-
-            <TextView
-                android:layout_marginTop="@dimen/dp_10"
-                android:id="@+id/jlt_storage_in_todo_list_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="10dp"
-                android:textColor="#333333"
-                tools:text="采购验收单" />
             <RadioGroup
+                android:visibility="gone"
                 android:id="@+id/jlt_pick_material_out_scan_menu_rg"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -405,11 +357,11 @@
                     android:textColor="@color/selector_radio_text_color" />
             </RadioGroup>
             <android.support.v7.widget.RecyclerView
+                android:visibility="gone"
                 android:id="@+id/jlt_storage_in_todo_list_rv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <LinearLayout
-                android:visibility="gone"
                 android:id="@+id/jlt_line_edit"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
@@ -423,47 +375,81 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:minWidth="60dp"
-                        android:text="LotNo"
+                        android:text="数量"
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
-                        android:id="@+id/jlt_edit_lotno"
+                        android:id="@+id/jlt_edit_QTY"
                         style="@style/EditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:hint="请输入LotNo" />
+                        android:lines="1"
+                        android:hint="请输入数量" />
 
                 </LinearLayout>
                 <LinearLayout
-                    android:orientation="horizontal"
+                    android:id="@+id/jlt_storage_in_barcode_line"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp">
+
                     <TextView
                         style="@style/tl_tv_style"
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:minWidth="60dp"
-                        android:text="日期"
+                        android:text="条码号"
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
-                        android:id="@+id/jlt_edit_dataecode"
+                        android:id="@+id/jlt_storage_in_barcode_et"
                         style="@style/EditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:hint="请输入日期" />
+                        android:lines="1"
+                        android:hint="请采集条码号" />
+
                     <ImageView
-                        android:id="@+id/jlt_storage_in_barcode_date_iv"
+                        android:visibility="gone"
+                        android:id="@+id/jlt_storage_in_barcode_iv"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_gravity="center"
-                        android:layout_marginRight="10dp"
-                        android:background="@drawable/bg_edittext"
+                        android:background="@color/white"
                         android:clickable="false"
-                        android:src="@drawable/ic_calendar" />
+                        android:paddingRight="10dp"
+                        android:src="@drawable/ic_edittext_scan" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp">
 
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="仓位"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        android:id="@+id/jlt_storage_in_barcode_lot_et"
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:hint="请采集仓位" />
+                    <CheckBox
+                        android:id="@+id/check_box_positions"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
                 </LinearLayout>
                 <LinearLayout
                     android:orientation="horizontal"
@@ -474,16 +460,59 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:minWidth="60dp"
-                        android:text="字符"
+                        android:text="LotNo"
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
-                        android:id="@+id/jlt_edit_DC"
+                        android:id="@+id/jlt_edit_lotno"
                         style="@style/EditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:hint="请输入字符" />
+                        android:lines="1"
+                        android:hint="请输入LotNo" />
+                    <CheckBox
+                        android:id="@+id/check_box_lono"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/tl_tv_style"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:minWidth="60dp"
+                        android:text="DC(日期)"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_standard.view.ClearableEditText
+                        android:id="@+id/jlt_edit_dataecode"
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:lines="1"
+                        android:hint="请输入日期" />
+                    <ImageView
+                        android:id="@+id/jlt_storage_in_barcode_date_iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="10dp"
+                        android:background="@drawable/bg_edittext"
+                        android:clickable="false"
+                        android:src="@drawable/ic_calendar" />
+                    <CheckBox
+                        android:id="@+id/check_box_date"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
 
                 </LinearLayout>
                 <LinearLayout
@@ -495,18 +524,26 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:minWidth="60dp"
-                        android:text="数量"
+                        android:text="DC(字符)"
                         android:textColor="@color/body_text_1"
                         android:textSize="16sp" />
 
                     <com.uas.uas_mes_standard.view.ClearableEditText
-                        android:id="@+id/jlt_edit_QTY"
+                        android:id="@+id/jlt_edit_DC"
                         style="@style/EditTextStyle"
                         android:layout_width="0dp"
                         android:layout_weight="1"
-                        android:hint="请输入数量" />
+                        android:lines="1"
+                        android:hint="请输入字符" />
+                    <CheckBox
+                        android:id="@+id/check_box_dc"
+                        android:layout_gravity="center"
+                        android:gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
 
                 </LinearLayout>
+
             </LinearLayout>
 
 

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

@@ -77,4 +77,13 @@
         android:background="@color/transparent"
         android:text="撤销入库"
         android:textSize="@dimen/app_text_size_body_2" />
+    <Button
+        android:id="@+id/pop_toadoptprompt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/transparent"
+        android:text="采集数据汇总"
+        android:textSize="@dimen/app_text_size_body_2" />
 </LinearLayout>