基于雅燊wms项目, 依据文档修改APP, 入库采集与出库采集增加单据过账功能, 取消自动跳转回入库列表界面

app/src/main/java/com/uas/chishun_wms/adapter/PopWinWHCheckMakeMaterialListAdapter.java

@@ -46,12 +46,14 @@ public class PopWinWHCheckMakeMaterialListAdapter extends BaseAdapter {
         TextView tvColumn2 = (TextView) view.findViewById(R.id.tv_table_2);
         TextView tvColumn3 = (TextView) view.findViewById(R.id.tv_table_3);
         TextView tvColumn4 = (TextView) view.findViewById(R.id.tv_table_4);
+        TextView tvColumn5 = (TextView) view.findViewById(R.id.tv_table_5);
         tvColumn4.setVisibility(View.VISIBLE);
         WHMakeMaterialProduct tmpProduct = (WHMakeMaterialProduct) getItem(position);
         tvColumn1.setText("" + tmpProduct.getBAR_WHCODE());
         tvColumn2.setText("" + tmpProduct.getBAR_LOCATION());
         tvColumn3.setText("" + tmpProduct.getREMAIN());
         tvColumn4.setText("" + tmpProduct.getMADEDATE());
+        tvColumn5.setText("" + tmpProduct.getLOTNO());
         int[] colors = {Color.WHITE, Color.rgb(219, 238, 244)};
         view.setBackgroundColor(colors[position % 2]);
         return view;

app/src/main/java/com/uas/chishun_wms/adapter/WHCheckMakeMaterialListAdapter.java

@@ -46,12 +46,14 @@ public class WHCheckMakeMaterialListAdapter extends BaseAdapter {
         TextView tvColumn2 = (TextView) view.findViewById(R.id.tv_table_2);
         TextView tvColumn3 = (TextView) view.findViewById(R.id.tv_table_3);
         TextView tvColumn4 = (TextView) view.findViewById(R.id.tv_table_4);
+        TextView tvColumn5 = (TextView) view.findViewById(R.id.tv_table_5);
         tvColumn4.setVisibility(View.VISIBLE);
         WHMakeMaterialProduct tmpProduct = (WHMakeMaterialProduct) getItem(position);
         tvColumn1.setText("" + tmpProduct.getBAR_WHCODE());
         tvColumn2.setText("" + tmpProduct.getBAR_LOCATION());
         tvColumn3.setText("" + tmpProduct.getREMAIN());
         tvColumn4.setText("" + tmpProduct.getMADEDATE());
+        tvColumn5.setText("" + tmpProduct.getLOTNO());
         int[] colors = {Color.WHITE, Color.rgb(219, 238, 244)};
         view.setBackgroundColor(colors[position % 2]);
         return view;

app/src/main/java/com/uas/chishun_wms/bean/WHMakeMaterialProduct.java

@@ -4,13 +4,22 @@ package com.uas.chishun_wms.bean;
  * @note:仓库管理：物料库存核查中物料Bean
  */
 public class WHMakeMaterialProduct {
-    private String REMAIN;
+    private String REMAIN;      //剩余时间
     private String BAR_PRODCODE;
     private String PR_DETAIL;
     private String PR_SPEC;
     private String BAR_LOCATION;
     private String BAR_WHCODE;
-    private String MADEDATE;
+    private String MADEDATE;    //制造日期
+    private String LOTNO;    // LOTNO ---供应商批次号
+
+    public String getLOTNO() {
+        return LOTNO;
+    }
+
+    public void setLOTNO(String LOTNO) {
+        this.LOTNO = LOTNO;
+    }
 
     public String getMADEDATE() {
         return MADEDATE;

app/src/main/java/com/uas/chishun_wms/fragment/IOCOutMakeMaterial.java

@@ -358,6 +358,11 @@ public class IOCOutMakeMaterial extends BaseFragment implements OnColumnItemClic
 
         outboundOrderList = new ArrayList<>();
         setFilterTableData(outboundOrderList);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
         getTableData("");
     }
 

app/src/main/java/com/uas/chishun_wms/fragment/IOCOutMakeMaterialOper.java

@@ -136,12 +136,10 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     private TextWatcher watcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
         }
 
         @Override
         public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
         }
 
         @Override
@@ -151,7 +149,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             } else {
                 btnConfirm.setEnabled(true);
             }
-
         }
     };
     private StringRequest stringRequest;
@@ -551,7 +548,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             @Override
             public void onClick(View v) {
                 currentBarcode = etBarCode.getText().toString().trim();
-                currentBarcode = currentBarcode.replace("#", "%23");
+               // currentBarcode = currentBarcode.replace("#", "%23");
                 if (TextUtils.isEmpty(currentBarcode)) {
                     CommonUtil.toastNoRepeat(getActivity(), "请输入二维码");
                 } else {
@@ -586,6 +583,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         try {
                             progressDialog.dismiss();
                             String s = o.toString();
+                            LogUtil.e("aaa","二维码保存数据:" + s);
                             Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
                             if (isSuccess) {
                                 JSONObject jsonObject = new JSONObject(s);
@@ -858,7 +856,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 progressDialog.dismiss();
                 mResults = new ArrayList<>();
                 mCollectTypeRadioGroup.setEnabled(true);
-                LogUtil.e("!!!ok", jsonObject.toString());
+                LogUtil.e("aaa", "二维码事件:" + jsonObject.toString());
                 try {
                     JSONObject dataObject = jsonObject.optJSONObject("data");
                     if (dataObject == null) {
@@ -870,7 +868,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                         mCollectResultTextView.setText(null);
                         mCollectResultTextView.setText(dataObject.getString("tip"));
-
                         barcodeSaveEnter();
                         return;
                     }
@@ -1223,8 +1220,6 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 Button passBillBtn = (Button) materialOutMoreView.findViewById(R.id.pop_material_out_menu_6);
                 Button stockDataSummary = (Button) materialOutMoreView.findViewById(R.id.pop_material_out_menu_7);
 
-                passBillBtn.setVisibility(View.GONE);
-
                 stockTaskBtn.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -2236,7 +2231,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
      */
     private void confirmEvent() {
         currentBarcode = etBarCode.getText().toString().trim();
-        currentBarcode = currentBarcode.replace("#", "%23");
+        //currentBarcode = currentBarcode.replace("#", "%23");
         if (TextUtils.isEmpty(currentBarcode)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入号码");
         }

app/src/main/java/com/uas/chishun_wms/fragment/IndexWareHouseContentFragment.java

@@ -144,13 +144,11 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-
                 case GloableParams.GRIDNAME_FINISHED_PRODUCT_STORAGE://成品入库
                     fragment = new NewJltStorageInFilterListFragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-
                 case GloableParams.GRIDNAME_FINISHED_PRODUCT_OUTBOUND://成品出库
                     fragment = new OutboundLis_Two_fragment();
                     getFragmentManager().beginTransaction().addToBackStack(null)
@@ -166,8 +164,6 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
-
-
             }
             if (mFragment != null) {
                 FragmentUtils.switchFragment(IndexWareHouseContentFragment.this, mFragment);

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

@@ -64,6 +64,7 @@ import com.uas.chishun_wms.util.FastjsonUtil;
 import com.uas.chishun_wms.util.FragmentUtils;
 import com.uas.chishun_wms.util.HttpCallback;
 import com.uas.chishun_wms.util.HttpParams;
+import com.uas.chishun_wms.util.LogUtil;
 import com.uas.chishun_wms.util.StringUtil;
 import com.uas.chishun_wms.util.VolleyRequest;
 import com.uas.chishun_wms.util.VollyRequest;
@@ -96,7 +97,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private ClearableEditText mDateEditText, mModelEditText, mQuantityEditText,
             mLotEditText, mPoEditText, mEnclosureEditText, mMpqEditText, mBrandEditText, mBarcodeEditText;
     private CheckBox mPoCheckBox;
-    private String mBoxNum, mPiInoutno, mPiid, mPiClass, mRealBoxNum, mDatecodebyparse,pd_whcode;
+    private String mBoxNum, mPiInoutno, mPiid, mPiClass, mRealBoxNum, mDatecodebyparse, pd_whcode;
     private JLTBarcodeParseBean mBarcodeParseBean;
     private RecyclerView mEnclosureRecyclerView;
     private Dialog mEnclosureDialog;
@@ -170,7 +171,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mNextButton = root.findViewById(R.id.jlt_storage_in_barcode_next_btn);
         mPoCheckBox = root.findViewById(R.id.jlt_storage_in_barcode_po_cb);
         mResultTextView = root.findViewById(R.id.material_in_collect_result_tv);
-//        mModelEditText.requestFocus();
+        //        mModelEditText.requestFocus();
         mBarcodeEditText.requestFocus();
         mEnclosureEditText = root.findViewById(R.id.jlt_storage_in_barcode_enclosure_et);
         mEnclosureFitlerIv = root.findViewById(R.id.jlt_storage_in_barcode_enclosure_filter_iv);
@@ -264,7 +265,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
-//                barcodeParse(text);
+                //                barcodeParse(text);
                 confirmRequest(false);
             }
         });
@@ -319,12 +320,12 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             }
         });
 
-//        CommonUtil.setEditorActionListener(mModelEditText, new MyEditorActionListener() {
-//            @Override
-//            public void MyEditorAction(String text, int actionId, KeyEvent event) {
-//                modelParse();
-//            }
-//        });
+        //        CommonUtil.setEditorActionListener(mModelEditText, new MyEditorActionListener() {
+        //            @Override
+        //            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+        //                modelParse();
+        //            }
+        //        });
 
         CommonUtil.setEditorActionListener(mMpqEditText, new MyEditorActionListener() {
             @Override
@@ -413,27 +414,27 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onSubItemClick(JLTStorageModelBean jltStorageModelBean) {
                 List<SecondaryListAdapter.SecondaryListBean<String, JLTStorageModelBean>> datas = mStorageInTodoAdapter.getDatas();
-                if (datas.size()!=0){
+                if (datas.size() != 0) {
                     mModelEditText.setText(jltStorageModelBean.getPr_brand());
                     mModelEditText.requestFocus();
                     mModelEditText.setSelection(mModelEditText.getText().length());
-//                    mLotEditText.requestFocus();
+                    //                    mLotEditText.requestFocus();
                 }
 
             }
         });
-//        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);
+        //                }
+        //            }
+        //        });
 
         sp_origin.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -449,29 +450,30 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         });
 
     }
-    public void CheckBoxData(){
+
+    public void CheckBoxData() {
         String ischecheds = SharedPreUtil.getString(mActivity, Constants.JLTSTORAGEINISCHCKED, null);
-        if (StringUtil.isEmpty(ischecheds)){
+        if (StringUtil.isEmpty(ischecheds)) {
             jlt_check_ok.setChecked(true);
             SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "true");
-        }else {
-//            if ("true".equals(ischecheds)){
-//                jlt_check_ok.setChecked(true);
-//                jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
-//            }else {
-//                jlt_check_ok.setChecked(false);
-//                jlt_storage_in_barcode_line.setVisibility(View.GONE);
-//            }
+        } else {
+            //            if ("true".equals(ischecheds)){
+            //                jlt_check_ok.setChecked(true);
+            //                jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
+            //            }else {
+            //                jlt_check_ok.setChecked(false);
+            //                jlt_storage_in_barcode_line.setVisibility(View.GONE);
+            //            }
         }
 
         jlt_check_ok.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked==true){
-//                    jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
+                if (isChecked == true) {
+                    //                    jlt_storage_in_barcode_line.setVisibility(View.VISIBLE);
                     SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "true");
-                }else {
-//                    jlt_storage_in_barcode_line.setVisibility(View.GONE);
+                } else {
+                    //                    jlt_storage_in_barcode_line.setVisibility(View.GONE);
                     SharedPreUtil.saveString(mActivity, Constants.JLTSTORAGEINISCHCKED, "false");
                 }
             }
@@ -504,25 +506,25 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         String mModelEditTexttrim = this.mModelEditText.getText().toString().trim();
         String mLotEditTexttrim = mLotEditText.getText().toString().trim();
         String mBarcodeEditTexttrim = mBarcodeEditText.getText().toString().trim();
-        if (TextUtils.isEmpty(mBarcodeEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
+        if (TextUtils.isEmpty(mBarcodeEditTexttrim)) {
+            CommonUtil.toastNoRepeat(getContext(), "请输入条码号");
             return;
         }
-//        if (TextUtils.isEmpty(mModelEditTexttrim)){
-//            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
-//            return;
-//        }
-//        if (TextUtils.isEmpty(mLotEditTexttrim)){
-//            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
-//            return;
-//        }
-
+        //        if (TextUtils.isEmpty(mModelEditTexttrim)){
+        //            CommonUtil.toastNoRepeat(getContext(),"请输入品牌");
+        //            return;
+        //        }
+        //        if (TextUtils.isEmpty(mLotEditTexttrim)){
+        //            CommonUtil.toastNoRepeat(getContext(),"请输入仓位");
+        //            return;
+        //        }
 
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_RECEIVING_BARCODEPARSE2)
                 .method(Request.Method.POST)
                 .addParam("data", barcode)
+                .addParam("pi_ids", mPiid)
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -806,7 +808,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 CommonUtil.scanBarcode(mActivity, JLTStorageInBarcodeFragment.this, SCAN_MODEL_CODE);
                 break;
             case R.id.jlt_storage_in_barcode_save_btn:
-//                saveBarcode(false, true);
+                //                saveBarcode(false, true);
                 clearableedittextjudge();
                 break;
             case R.id.jlt_storage_in_barcode_next_btn:
@@ -815,7 +817,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             case R.id.jlt_storage_in_barcode_enclosure_et:
             case R.id.jlt_storage_in_barcode_enclosure_filter_iv:
                 if (mPkgEntities.size() <= 1) {
-//                    CommonUtil.toastNoRepeat(mActivity, "封装形式为空");
+                    //                    CommonUtil.toastNoRepeat(mActivity, "封装形式为空");
                 } else {
                     mEnclosureSelectPop.showPopupWindow();
                 }
@@ -824,98 +826,104 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 break;
         }
     }
+
     //输入框回车换行
-    public void newlineqtyEnter(){
+    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();//LoNo
         String jlt_edit_dataecodes = jlt_edit_dataecode.getText().toString().trim();//日期
         String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
-        if (jlt_check_ok.isChecked()==true&&jlt_storage_in_barcode_ets.isEmpty()){
+        if (jlt_check_ok.isChecked() == true && jlt_storage_in_barcode_ets.isEmpty()) {
             jlt_storage_in_barcode_et.requestFocus();
             return;
         }
-        if (check_box_positions.isChecked()==true&&mLotEditTexts.isEmpty()){
+        if (check_box_positions.isChecked() == true && mLotEditTexts.isEmpty()) {
             mLotEditText.requestFocus();
             return;
         }
-        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+        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()){
+        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()){
+        if (check_box_dc.isChecked() == true && jlt_edit_dcs.isEmpty()) {
             jlt_edit_dc.requestFocus();
             return;
         }
-//        clearableedittextjudge();
+        //        clearableedittextjudge();
     }
-    public void newlinebarcodeEnter(){
+
+    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()){
+        if (check_box_positions.isChecked() == true && mLotEditTexts.isEmpty()) {
             mLotEditText.requestFocus();
             return;
         }
-        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+        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()){
+        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()){
+        if (check_box_dc.isChecked() == true && jlt_edit_dcs.isEmpty()) {
             jlt_edit_dc.requestFocus();
             return;
         }
         clearableedittextjudge();
     }
-    public void newlinemLotEnter(){
+
+    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()){
+        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()){
+        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()){
+        if (check_box_dc.isChecked() == true && jlt_edit_dcs.isEmpty()) {
             jlt_edit_dc.requestFocus();
             return;
         }
         clearableedittextjudge();
     }
-    public void newlinemLotonEnter(){
+
+    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()){
+        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()){
+        if (check_box_dc.isChecked() == true && jlt_edit_dcs.isEmpty()) {
             jlt_edit_dc.requestFocus();
             return;
         }
         clearableedittextjudge();
     }
-    public void newlinemdateEnter(){
+
+    public void newlinemdateEnter() {
         String jlt_edit_dcs = jlt_edit_dc.getText().toString().trim();//字符
-        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+        if (check_box_dc.isChecked() == true && jlt_edit_dcs.isEmpty()) {
             jlt_edit_dc.requestFocus();
             return;
         }
         clearableedittextjudge();
     }
-    public void 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();//仓位
@@ -923,55 +931,47 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         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()){
+        if (check_box_positions.isChecked() == true && mLotEditTexts.isEmpty()) {
             CommonUtil.toastNoRepeat(mActivity, "仓位不可为空");
             return;
         }
-        if (check_box_lono.isChecked()==true&&jlt_edit_lotnos.isEmpty()){
+        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()){
+        if (check_box_date.isChecked() == true && jlt_edit_dataecodes.isEmpty()) {
             CommonUtil.toastNoRepeat(mActivity, "日期不可为空");
             return;
         }
-        if (check_box_dc.isChecked()==true&&jlt_edit_dcs.isEmpty()){
+        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);
+        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()){
+
+    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);
         obj.put("PI_IDS", mPiid);
-        if (jlt_check_ok.isChecked()==true){
-//            if (jlt_storage_in_barcode_ets.isEmpty()){
-//                CommonUtil.toastNoRepeat(mActivity, "条码号不可为空");
-//                return;
-//            }
-        }else if(jlt_check_ok.isChecked()==false){
-                jlt_storage_in_barcode_et.setText(mBarcodeEditTexts);
-                jlt_storage_in_barcode_ets = jlt_storage_in_barcode_et.getText().toString().trim();
+        if (jlt_check_ok.isChecked() == true) {
+
+        } else if (jlt_check_ok.isChecked() == false) {
+            jlt_storage_in_barcode_et.setText(mBarcodeEditTexts);
+            jlt_storage_in_barcode_ets = jlt_storage_in_barcode_et.getText().toString().trim();
         }
 
         obj.put("BARCODE", jlt_storage_in_barcode_ets);
         obj.put("LOTNO", jlt_edit_lotnos);
         obj.put("DC", jlt_edit_dcs);
-        obj.put("RE_MADEDATE",jlt_edit_dataecodes);
+        obj.put("RE_MADEDATE", jlt_edit_dataecodes);
         obj.put("CONTENT", mBarcodeEditTexts);
         obj.put("QTY", jlt_edit_qtys);
         obj.put("CCO", cco);
@@ -988,12 +988,19 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 progressDialog.dismiss();
                 try {
                     String result = o.toString();
+                    LogUtil.e("aaa", "入库保存数据:" + result);
                     JSONObject resultObject = JSON.parseObject(result);
                     JSONObject dataObject = resultObject.getJSONObject("data");
+                    if (dataObject.getBoolean("ISFINISH") != null && dataObject.getBoolean("ISFINISH")) {
+                        CommonUtil.toastNoRepeat(mActivity, mBoxTextView.getText().toString().trim() + "入库单已采集完毕");
+//                        JltStorageInFilterListFragment jltStorageInTodoListFragment = new JltStorageInFilterListFragment();
+//                        FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, jltStorageInTodoListFragment);
+                        return;
+                    }else {
                         CommonUtil.toastNoRepeat(mActivity, "归属入库单："
                                 + FastjsonUtil.getText(dataObject, "INOUTNO")
                                 + "成功");
-
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -1004,7 +1011,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 jlt_edit_dataecode.setText("");
                 jlt_edit_dc.setText("");
                 jlt_edit_qty.setText("");
-//                resetState();
+                //                resetState();
                 mBarcodeEditText.requestFocus();
             }
 
@@ -1015,6 +1022,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             }
         });
     }
+
     private void saveBarcode(boolean exist, boolean checkDate) {
         if (TextUtils.isEmpty(mBarcodeParseBean.getPN()) ||
                 TextUtils.isEmpty(mBarcodeParseBean.getBRAND()) ||
@@ -1034,29 +1042,29 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             CommonUtil.toastNoRepeat(mActivity, "请选择封装形式");
             return;
         }
-//        String qtyStr = mQuantityEditText.getText().toString().trim();
-//        if (TextUtils.isEmpty(qtyStr)) {
-//            CommonUtil.toastNoRepeat(mActivity, "数量为空，请先采集数量信息");
-//            return;
-//        }
-//        String mpqStr = mMpqEditText.getText().toString().trim();
-//        if (TextUtils.isEmpty(mpqStr)) {
-//            CommonUtil.toastNoRepeat(mActivity, "最小包为空，请采集最小包");
-//            return;
-//        }
-//        if (isMpqDiv) {
-//            try {
-//                double qty = Double.parseDouble(qtyStr);
-//                double mpq = Double.parseDouble(mpqStr);
-//                double pan = qty / mpq;
-//                if (!CommonUtil.isIntegerForDouble(pan)) {
-//                    CommonUtil.toastNoRepeat(mActivity, "采集数不满足最小包，请重新采集！");
-//                    return;
-//                }
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        }
+        //        String qtyStr = mQuantityEditText.getText().toString().trim();
+        //        if (TextUtils.isEmpty(qtyStr)) {
+        //            CommonUtil.toastNoRepeat(mActivity, "数量为空，请先采集数量信息");
+        //            return;
+        //        }
+        //        String mpqStr = mMpqEditText.getText().toString().trim();
+        //        if (TextUtils.isEmpty(mpqStr)) {
+        //            CommonUtil.toastNoRepeat(mActivity, "最小包为空，请采集最小包");
+        //            return;
+        //        }
+        //        if (isMpqDiv) {
+        //            try {
+        //                double qty = Double.parseDouble(qtyStr);
+        //                double mpq = Double.parseDouble(mpqStr);
+        //                double pan = qty / mpq;
+        //                if (!CommonUtil.isIntegerForDouble(pan)) {
+        //                    CommonUtil.toastNoRepeat(mActivity, "采集数不满足最小包，请重新采集！");
+        //                    return;
+        //                }
+        //            } catch (Exception e) {
+        //                e.printStackTrace();
+        //            }
+        //        }
 
         if (checkDate && !TextUtils.isEmpty(mDatecodebyparse)) {
             long limitDays = SharedPreUtil.getInt(mActivity, Constants.FLAG.JLT_VALID_DAYS_CACHE, 0);
@@ -1089,13 +1097,14 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             confirmRequest(exist);
         }
     }
+
     //扫描 条码号
     private void confirmRequest(boolean exist) {
         String mModelEditTexttrim = this.mModelEditText.getText().toString().trim();
         String mLotEditTexttrim = mLotEditText.getText().toString().trim();
         String mBarcodeEditTexttrim = mBarcodeEditText.getText().toString().trim();
-        if (TextUtils.isEmpty(mBarcodeEditTexttrim)){
-            CommonUtil.toastNoRepeat(getContext(),"请输入条码号");
+        if (TextUtils.isEmpty(mBarcodeEditTexttrim)) {
+            CommonUtil.toastNoRepeat(getContext(), "请输入条码号/二维码");
             return;
         }
         progressDialog.show();
@@ -1111,30 +1120,30 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-                    String result = o.toString();
-                    Log.e("result",result);
-                    JSONObject resultObject = JSON.parseObject(result);
-                    JSONObject dataObject = resultObject.getJSONObject("data");
-                    if (dataObject != null) {
-                        String lotno = FastjsonUtil.getText(dataObject, "LOTNO");
-                        String datecode = FastjsonUtil.getText(dataObject, "DATECODE");
-                        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);
-                    }
-                    if (jlt_check_ok.isChecked()==true&&jlt_storage_in_barcode_et.getText().toString().trim().isEmpty()){
-                        jlt_storage_in_barcode_et.requestFocus();
-                        jlt_storage_in_barcode_et.setSelection(jlt_edit_qty.getText().toString().trim().length());
-                    }else {
-                        //newlinebarcodeEnter();
-                    }
+                String result = o.toString();
+                Log.e("result", result);
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("data");
+                if (dataObject != null) {
+                    String lotno = FastjsonUtil.getText(dataObject, "LOTNO");
+                    String datecode = FastjsonUtil.getText(dataObject, "DATECODE");
+                    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);
+                }
+                if (jlt_check_ok.isChecked() == true && jlt_storage_in_barcode_et.getText().toString().trim().isEmpty()) {
+                    jlt_storage_in_barcode_et.requestFocus();
+                    jlt_storage_in_barcode_et.setSelection(jlt_storage_in_barcode_et.getText().toString().trim().length());
+                } else {
+                    //newlinebarcodeEnter();
+                }
                 clearableedittextjudge();
             }
 
@@ -1144,13 +1153,14 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 CommonUtil.toastNoRepeat(mActivity, failStr);
                 mBarcodeEditText.setText(null);
                 mBarcodeEditText.requestFocus();
-//                check_box_positions.setChecked(true);
-//                check_box_lono.setChecked(true);
-//                check_box_date.setChecked(true);
-//                check_box_dc.setChecked(true);
+                //                check_box_positions.setChecked(true);
+                //                check_box_lono.setChecked(true);
+                //                check_box_date.setChecked(true);
+                //                check_box_dc.setChecked(true);
             }
         });
     }
+
     //清空所有输入框
     private void resetState() {
         mModelEditText.setText("");
@@ -1200,7 +1210,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 modelParse();
             }
         }
-        if (mFocusId==R.id.jlt_storage_in_barcode_et){
+        if (mFocusId == R.id.jlt_storage_in_barcode_et) {
             String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
             jlt_storage_in_barcode_et.setText(result);
             jlt_storage_in_barcode_et.setSelection(result.length());
@@ -1226,7 +1236,6 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         Button pop_material_in_menu_back = (Button) mMenuView.findViewById(R.id.pop_material_in_menu_back);
 
         pop_material_in_menu_1.setVisibility(View.GONE);
-        postBtn.setVisibility(View.GONE);
         todoListBtn.setVisibility(View.GONE);
         revokeCollectBtn.setText("确认入库");
         revokeCollectBtn.setVisibility(View.GONE);
@@ -1234,7 +1243,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
-                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, ToadoptpromptFragment.newInstance(mPiid,mPiInoutno));
+                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, ToadoptpromptFragment.newInstance(mPiid, mPiInoutno));
             }
         });
 
@@ -1276,7 +1285,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             public void onClick(View v) {
                 closeMenuPopupWindow();
                 ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
-//                ((FunctionActivity) getActivity()).setScanIvVisible(false);
+                //                ((FunctionActivity) getActivity()).setScanIvVisible(false);
                 Bundle bundle = new Bundle();
                 bundle.putString("pi_id", mPiid);
                 bundle.putString("pi_inoutno", mPiInoutno);
@@ -1336,7 +1345,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             @Override
             public void onClick(View v) {
                 closeMenuPopupWindow();
-                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, StorageInBarDetailsCollectListFragment.newInstance(mPiid, pd_whcode,mPiClass));
+                FragmentUtils.switchFragment(JLTStorageInBarcodeFragment.this, StorageInBarDetailsCollectListFragment.newInstance(mPiid, pd_whcode, mPiClass));
             }
         });
         //撤销入库
@@ -1347,7 +1356,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 mBarcodeEditText.setOnFocusChangeListener(null);
                 jlt_storage_in_barcode_et.setOnFocusChangeListener(null);
                 ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
-//                ((FunctionActivity) getActivity()).setScanIvVisible(false);
+                //                ((FunctionActivity) getActivity()).setScanIvVisible(false);
                 Bundle bundle = new Bundle();
                 bundle.putString("pi_id", mPiid);
                 bundle.putString("pi_inoutno", mPiInoutno);
@@ -1373,6 +1382,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
         mMenuPopupWindow.showAsDropDown(mMoreButton);
     }
+
     private void confirmIn() {
         progressDialog.show();
         String url = GloableParams.ADDRESS_INMATERIAL_CONFIRM_IN + "?pi_id=" + mPiid + "&whcode=" + pd_whcode;
@@ -1384,10 +1394,10 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                     @Override
                     public void onResponse(String s) {
                         progressDialog.dismiss();
-//                        mResultTextView.setVisibility(View.VISIBLE);
+                        //                        mResultTextView.setVisibility(View.VISIBLE);
                         try {
                             org.json.JSONObject resultObject = new org.json.JSONObject(s);
-//                            mResultTextView.setText(resultObject.optString("data"));
+                            //                            mResultTextView.setText(resultObject.optString("data"));
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
@@ -1411,6 +1421,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mStringRequest.setTag(TAG + "confirmin");
         PdaApplication.mRequestQueue.add(mStringRequest);
     }
+
     /**
      * 确认入库
      *
@@ -1598,72 +1609,73 @@ 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();
     }

app/src/main/java/com/uas/chishun_wms/fragment/JltStorageInFilterListFragment.java

@@ -65,7 +65,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
     private RefreshLayout mRefreshLayout;
     private List<JLTStorageInBean> mFilterStorageInBeans;
     private boolean mIgnoreChange = false;
-    private String mSupplier = "", mWhcode = "", mStartDate = "", mEndDate = "";
+
     private SmartTable mSmartTable;
     private Column<Boolean> mCheckColumn;
     private Column<Long> mPosColumn;
@@ -249,15 +249,13 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
 
     @Override
     protected void initDatas() {
-        Bundle bundle = getArguments();
-        if (bundle != null) {
-            mSupplier = bundle.getString("supplier", "");
-            mWhcode = bundle.getString("whcode", "");
-            mStartDate = bundle.getString("startDate", "");
-            mEndDate = bundle.getString("endDate", "");
-        }
 
-//        progressDialog.show();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
         getInDataList();
     }
 

app/src/main/java/com/uas/chishun_wms/fragment/StockDataSummaryFragment.java

@@ -83,10 +83,6 @@ public class StockDataSummaryFragment extends BaseFragment implements OnColumnIt
                 return CommonUtil.doubleFormat(aDouble);
             }
         });
-
-
-
-
     }
 
     @Override

app/src/main/java/com/uas/chishun_wms/tools/DataSourceManager.java

@@ -21,6 +21,7 @@ import com.uas.chishun_wms.fragment.IOCInMakeMaterialFragment;
 import com.uas.chishun_wms.fragment.LoginFragment;
 import com.uas.chishun_wms.fragment.SCFeederGetFragment;
 import com.uas.chishun_wms.fragment.SCMakePrepareListFragment;
+import com.uas.chishun_wms.util.LogUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -72,7 +73,7 @@ public class DataSourceManager {
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        Log.e(TAG, "makeList:" + makeMaterialItemList.toString());
+        LogUtil.e(TAG, "makeList:" + makeMaterialItemList.toString());
         notifyData.NotifyDataChanged(-1);
     }
 

app/src/main/java/com/uas/chishun_wms/view/TakePhotoPopWin.java

@@ -24,8 +24,7 @@ import com.uas.chishun_wms.tools.VolleyUtil;
 
 import java.util.List;
 
-public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.NotifyData,
-        VolleyUtil.VolleyFinishListener{
+public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.NotifyData,VolleyUtil.VolleyFinishListener{
 
     private View view;
     private final ImageView btn_cancel;
@@ -47,11 +46,8 @@ public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.No
         this.setOutsideTouchable(true);
         // mMenuView添加OnTouchListener监听判断获取触屏位置如果在选择框外面则销毁弹出框
         this.view.setOnTouchListener(new View.OnTouchListener() {
-
             public boolean onTouch(View v, MotionEvent event) {
-
                 int height = view.findViewById(R.id.pop_layout).getTop();
-
                 int y = (int) event.getY();
                 if (event.getAction() == MotionEvent.ACTION_UP) {
                     if (y < height) {
@@ -62,7 +58,6 @@ public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.No
             }
         });
 
-
         /* 设置弹出窗口特征 */
         // 设置视图
         this.setContentView(this.view);
@@ -82,7 +77,6 @@ public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.No
         this.setAnimationStyle(R.style.take_photo_anim);
         // 取消按钮
         btn_cancel.setOnClickListener(new View.OnClickListener() {
-
             public void onClick(View v) {
                 // 销毁弹出框
                 dismiss();
@@ -106,13 +100,11 @@ public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.No
                 requestType, pd_prodcode_pop, "");
     }
 
-
     @Override
     public void NotifyDataChanged(int noticeType) {
         //修改信息显示区域的信息
         String strDetail = detailItemList.get(0).getPR_DETAIL();
         String strSpec = detailItemList.get(0).getPR_SPEC();
-
         //信息区域显示
         tvPrDetail.setText("" + strDetail);
         tvPrSpec.setText("" + strSpec);
@@ -124,5 +116,6 @@ public class TakePhotoPopWin extends PopupWindow implements DataSourceManager.No
     public void onVolleyFinish(int isSuccess, Object result) {
 
     }
+
 }
 

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

@@ -28,7 +28,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:textColor="#333333"
-            tools:text="2138424923" />
+            tools:text="" />
 
         <TextView
             android:id="@+id/jlt_storage_in_todo_list_tv"

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

@@ -1,51 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--仓库管理：物料库存核查-->
+<?xml version="1.0" encoding="utf-8"?><!--仓库管理：物料库存核查-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
     <!--搜索-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/space_top_8"
         android:layout_marginLeft="@dimen/space_left_8"
+        android:layout_marginTop="@dimen/space_top_8"
         android:layout_marginRight="@dimen/space_right_8">
+
         <com.uas.chishun_wms.view.ClearableEditText
             android:id="@+id/et_prodcode_whmm"
-            android:hint="物料编号"
             style="@style/PopWinEditTextStyle"
-            android:layout_weight="2"/>
+            android:layout_weight="2"
+            android:hint="物料编号" />
+
         <com.uas.chishun_wms.view.ClearableEditText
             android:id="@+id/et_whcode_whmm"
+            style="@style/PopWinEditTextStyle"
             android:layout_marginLeft="@dimen/space_left_8"
             android:layout_marginRight="@dimen/space_right_8"
-            style="@style/PopWinEditTextStyle"
-            android:hint="仓位"
-            android:layout_weight="3"/>
+            android:layout_weight="3"
+            android:hint="仓位" />
+
         <TextView
             android:id="@+id/btn_search_whmm"
             style="@style/PopWinButtonStyle"
             android:layout_weight="4"
-            android:background="@drawable/search_16"/>
+            android:background="@drawable/search_16" />
     </LinearLayout>
     <!--中部-->
     <TableLayout
-        android:layout_marginTop="@dimen/space_top_8"
-        style="@style/CardWhiteStyle_wrapheight">
+        style="@style/CardWhiteStyle_wrapheight"
+        android:layout_marginTop="@dimen/space_top_8">
 
         <TableRow>
+
             <TextView
                 style="@style/CardContentTextStyle"
-                android:text="@string/text_fragment_whcheck_pr_detail"/>
+                android:text="@string/text_fragment_whcheck_pr_detail" />
+
             <TextView
                 android:id="@+id/tv_pr_detail"
                 style="@style/CardContentTextStyle"
-                android:textColor="@color/text_search"/>
+                android:textColor="@color/text_search" />
         </TableRow>
+
         <TableRow>
+
             <TextView
                 style="@style/CardContentTextStyle"
                 android:text="@string/text_fragment_whcheck_pr_spec" />
+
             <TextView
                 android:id="@+id/tv_pr_spec"
                 style="@style/CardContentTextStyle"
@@ -56,18 +64,20 @@
     <LinearLayout
         style="@style/CardWhiteSytle_fillheight"
         android:background="@color/white">
-        <include layout="@layout/item_list_table"/>
+
+        <include layout="@layout/item_list_table" />
         <!--信息列表-->
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true"
-            android:background="@color/transparent">
+            android:background="@color/transparent"
+            android:fillViewport="true">
+
             <ListView
                 android:id="@+id/lv_detail_whmm"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/transparent"/>
+                android:background="@color/transparent" />
         </ScrollView>
     </LinearLayout>
 </LinearLayout>

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

@@ -14,7 +14,9 @@
         android:id="@+id/tv_table_1"
         style="@style/CardContentTextStyle"
         android:layout_weight="1"
-        android:text="仓库" />
+        android:text="仓库"
+        android:textSize="14sp"
+        />
 
     <View
         android:layout_width="0.5px"
@@ -22,10 +24,13 @@
         android:background="#B8B8B8" />
     <!--第二列-->
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_table_2"
         style="@style/CardContentTextStyle"
         android:layout_weight="1"
-        android:text="储位" />
+        android:text="储位"
+        android:textSize="14sp"
+        />
 
     <View
         android:layout_width="0.5px"
@@ -36,7 +41,9 @@
         android:id="@+id/tv_table_3"
         style="@style/CardContentTextStyle"
         android:layout_weight="1"
-        android:text="数量" />
+        android:text="数量"
+        android:textSize="14sp"
+        />
 
     <View
         android:layout_width="0.5px"
@@ -46,7 +53,27 @@
         android:id="@+id/tv_table_4"
         style="@style/CardContentTextStyle"
         android:layout_weight="1"
-        android:text="DC" />
+        android:text="DC"
+        android:textSize="14sp"
+        />
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+
+    <!--第五列-->
+    <TextView
+        android:id="@+id/tv_table_5"
+        style="@style/CardContentTextStyle"
+        android:layout_weight="1"
+        android:text="LOTNO"
+        android:textSize="14sp"/>
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
 
 
 </LinearLayout>

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

@@ -31,6 +31,7 @@
         android:background="#B8B8B8" />
     <!--第二列-->
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_table_2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,6 +46,7 @@
         android:text="储位" />
 
     <View
+        android:visibility="gone"
         android:layout_width="0.5px"
         android:layout_height="fill_parent"
         android:background="#B8B8B8" />
@@ -67,6 +69,7 @@
         android:layout_width="0.5px"
         android:layout_height="fill_parent"
         android:background="#B8B8B8" />
+    <!--第四列-->
     <TextView
         android:id="@+id/tv_table_4"
         android:layout_width="match_parent"
@@ -81,5 +84,23 @@
         android:textSize="@dimen/space_top_line_15"
         android:text="DC" />
 
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+
+    <!--第五列-->
+    <TextView
+        android:id="@+id/tv_table_5"
+        style="@style/CardContentTextStyle"
+        android:layout_weight="1"
+        android:text="LOTNO"
+        android:textSize="14sp"/>
+
+    <View
+        android:layout_width="0.5px"
+        android:layout_height="fill_parent"
+        android:background="#B8B8B8" />
+
 
 </LinearLayout>

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

@@ -1,94 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:gravity="center_horizontal"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal">
+
     <LinearLayout
-        android:layout_marginTop="100dp"
         android:id="@+id/pop_layout"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/sugarbaground"
         android:layout_alignParentBottom="true"
+        android:layout_marginTop="100dp"
+        android:background="@drawable/sugarbaground"
         android:orientation="vertical">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <ImageView
-                android:layout_marginLeft="@dimen/space_top_line_15"
-                android:layout_marginTop="@dimen/space_top_line_15"
                 android:id="@+id/btn_cancel"
                 android:layout_width="21dp"
                 android:layout_height="21dp"
-                android:src="@mipmap/delete_popup">
-            </ImageView>
+                android:layout_marginLeft="@dimen/space_top_line_15"
+                android:layout_marginTop="@dimen/space_top_line_15"
+                android:src="@mipmap/delete_popup"></ImageView>
+
             <TextView
-                android:textColor="#ff333333"
                 android:id="@+id/text_title"
-                android:layout_marginTop="@dimen/space_top_line_15"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center"
-                android:textSize="@dimen/textsize_16"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-            </TextView>
+                android:layout_marginTop="@dimen/space_top_line_15"
+                android:textColor="#ff333333"
+                android:textSize="@dimen/textsize_16"></TextView>
         </RelativeLayout>
+
         <TableLayout
-            android:layout_marginTop="@dimen/space_top_8"
-            style="@style/CardWhiteStyle_wrapheight">
+            style="@style/CardWhiteStyle_wrapheight"
+            android:layout_marginTop="@dimen/space_top_8">
+
             <TableRow>
+
                 <TextView
                     style="@style/CardContentTextStylepopu"
-                    android:textSize="@dimen/textsize_12"
-                    android:text="@string/text_fragment_whcheck_pd_prodcode"/>
+                    android:text="@string/text_fragment_whcheck_pd_prodcode"
+                    android:textSize="@dimen/textsize_12" />
+
                 <TextView
                     android:id="@+id/tv_pd_prodcode"
                     style="@style/CardContentTextStylepopu"
-                    android:textSize="@dimen/textsize_12"
-                    android:textColor="@color/text_search"/>
+                    android:textColor="@color/text_search"
+                    android:textSize="@dimen/textsize_12" />
             </TableRow>
+
             <TableRow>
+
                 <TextView
                     style="@style/CardContentTextStylepopu"
-                    android:textSize="@dimen/textsize_12"
-                    android:text="@string/text_fragment_whcheck_pr_detail"/>
+                    android:text="@string/text_fragment_whcheck_pr_detail"
+                    android:textSize="@dimen/textsize_12" />
+
                 <TextView
                     android:id="@+id/tv_pr_detail"
-                    android:textSize="@dimen/textsize_12"
                     style="@style/CardContentTextStylepopu"
-                    android:textColor="@color/text_search"/>
+                    android:textColor="@color/text_search"
+                    android:textSize="@dimen/textsize_12" />
             </TableRow>
+
             <TableRow>
+
                 <TextView
                     style="@style/CardContentTextStylepopu"
-                    android:textSize="@dimen/textsize_12"
-                    android:text="@string/text_fragment_whcheck_pr_spec" />
+                    android:text="@string/text_fragment_whcheck_pr_spec"
+                    android:textSize="@dimen/textsize_12" />
+
                 <TextView
                     android:id="@+id/tv_pr_spec"
                     style="@style/CardContentTextStylepopu"
-                    android:textSize="@dimen/textsize_12"
-                    android:textColor="@color/text_search" />
+                    android:textColor="@color/text_search"
+                    android:textSize="@dimen/textsize_12" />
             </TableRow>
         </TableLayout>
+
         <LinearLayout
             style="@style/CardWhiteSytle_fillheight"
             android:background="@color/white">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/button_normal"
                 android:orientation="horizontal">
+
                 <View
-                android:layout_width="0.5px"
-                android:layout_height="fill_parent"
-                android:background="#B8B8B8" />
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
                 <!--第一列-->
                 <TextView
                     android:id="@+id/tv_table_1"
                     style="@style/CardContentTextStyle"
                     android:layout_weight="1"
                     android:text="仓库"
-                    android:textSize="@dimen/space_top_line_15"/>
+                    android:textSize="14sp" />
 
                 <View
                     android:layout_width="0.5px"
@@ -100,47 +115,67 @@
                     style="@style/CardContentTextStyle"
                     android:layout_weight="1"
                     android:text="储位"
-                    android:textSize="@dimen/space_top_line_15"/>
+                    android:textSize="14sp"
+                    android:visibility="gone" />
 
                 <View
                     android:layout_width="0.5px"
                     android:layout_height="fill_parent"
-                    android:background="#B8B8B8" />
+                    android:background="#B8B8B8"
+                    android:visibility="gone" />
                 <!--第三列-->
                 <TextView
                     android:id="@+id/tv_table_3"
                     style="@style/CardContentTextStyle"
                     android:layout_weight="1"
                     android:text="数量"
-                    android:textSize="@dimen/space_top_line_15"/>
+                    android:textSize="14sp" />
 
                 <View
                     android:layout_width="0.5px"
                     android:layout_height="fill_parent"
                     android:background="#B8B8B8" />
+
+                <!--第四列-->
                 <TextView
                     android:id="@+id/tv_table_4"
                     style="@style/CardContentTextStyle"
                     android:layout_weight="1"
                     android:text="DC"
-                    android:textSize="@dimen/space_top_line_15"/>
+                    android:textSize="14sp" />
 
-            </LinearLayout>
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
 
+                <!--第五列-->
+                <TextView
+                    android:id="@+id/tv_table_5"
+                    style="@style/CardContentTextStyle"
+                    android:layout_weight="1"
+                    android:text="LOTNO"
+                    android:textSize="14sp" />
 
+                <View
+                    android:layout_width="0.5px"
+                    android:layout_height="fill_parent"
+                    android:background="#B8B8B8" />
 
+            </LinearLayout>
 
             <!--信息列表-->
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:fillViewport="true"
-                android:background="@color/transparent">
+                android:background="@color/transparent"
+                android:fillViewport="true">
+
                 <ListView
                     android:id="@+id/lv_detail_whmm"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/transparent"/>
+                    android:background="@color/transparent" />
             </ScrollView>
         </LinearLayout>
 
@@ -148,6 +183,4 @@
     </LinearLayout>
 
 
-
-
 </RelativeLayout>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 8,
-            versionName      : "v1.0.8"
+            versionCode      : 4,
+            versionName      : "v1.0.3"
     ]
 
     depsVersion = [