入库调整

添加条码扫描框
隐藏确认入库按钮

app/src/main/java/com/uas/keg_storage/fragment/JLTPickMaterialOutScanFragment.java

@@ -402,12 +402,17 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                         if (needReadyInfoArray != null) {
                             JSONObject listObject = needReadyInfoArray.getJSONObject(0);
                             setMaterial(listObject);
+                            if (mMenuRadioGroup.getCheckedRadioButtonId() == R.id.pick_material_out_scan_sign_rb) {
+                                getLocpickList();
+                            } else {
+                                mMenuRadioGroup.check(R.id.pick_material_out_scan_sign_rb);
+                            }
                         }
-
                     } else {
                         CommonUtil.toastNoRepeat(mActivity, "待备任务数据为空");
+                        mTableStorageInBeans.clear();
+                        setTableData();
                     }
-
                     setEditData();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -548,9 +553,11 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 mQtyHintTextView.setText("条码数:" + CommonUtil.doubleFormat(mQty)
                         + ",待出库数:" + CommonUtil.doubleFormat(restqty));
                 mQtyHintLl.setVisibility(View.VISIBLE);
+
+                mMenuRadioGroup.check(R.id.pick_material_out_scan_info_rb);
             } else {
                 mQtyHintLl.setVisibility(View.INVISIBLE);
-//                confirmOut(false);
+                confirmOut(false);
             }
         } else {
             mQtyHintLl.setVisibility(View.INVISIBLE);
@@ -866,6 +873,12 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                         if (restqty <= 0) {
                             CommonUtil.toastNoRepeat(mActivity, "当前型号已采集完成，自动切换至下一型号");
                             getPickModel();
+                        } else {
+                            if (mMenuRadioGroup.getCheckedRadioButtonId() == R.id.pick_material_out_scan_sign_rb) {
+                                getLocpickList();
+                            } else {
+                                mMenuRadioGroup.check(R.id.pick_material_out_scan_sign_rb);
+                            }
                         }
                     }
                 } catch (Exception e) {

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

@@ -40,7 +40,6 @@ import com.uas.keg_storage.bean.WhcodeBean;
 import com.uas.keg_storage.global.GloableParams;
 import com.uas.keg_storage.listener.MyEditorActionListener;
 import com.uas.keg_storage.tools.SharedPreUtil;
-import com.uas.keg_storage.util.CameraUtil;
 import com.uas.keg_storage.util.CommonUtil;
 import com.uas.keg_storage.util.Constants;
 import com.uas.keg_storage.util.DateFormatUtil;
@@ -53,7 +52,6 @@ import com.uas.keg_storage.util.VollyRequest;
 import com.uas.keg_storage.view.ClearableEditText;
 import com.uas.keg_storage.view.RecyclerItemDecoration;
 import com.uas.keg_storage.view.business.CommonSelectPop;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 import java.util.ArrayList;
@@ -73,9 +71,9 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private PopupWindow mMenuPopupWindow;
     private View mMenuView;
     private TextView mBoxTextView, mPanEditText;
-    private ImageView mCalendarImageView, mEnclosureFitlerIv, mModelScanIv;
+    private ImageView mCalendarImageView, mEnclosureFitlerIv, mModelScanIv, mBarcodeScanIv;
     private ClearableEditText mDateEditText, mModelEditText, mQuantityEditText,
-            mLotEditText, mPoEditText, mEnclosureEditText, mMpqEditText, mBrandEditText;
+            mLotEditText, mPoEditText, mEnclosureEditText, mMpqEditText, mBrandEditText, mBarcodeEditText;
     private CheckBox mPoCheckBox;
     private String mBoxNum, mPiInoutno, mPiid, mPiClass, mRealBoxNum, mDatecodebyparse;
     private JLTBarcodeParseBean mBarcodeParseBean;
@@ -110,8 +108,8 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mModelScanIv = root.findViewById(R.id.jlt_storage_in_barcode_model_scan_iv);
         mDateEditText = root.findViewById(R.id.jlt_storage_in_barcode_date_et);
         mBoxTextView = root.findViewById(R.id.jlt_storage_in_barcode_box_tv);
-//        mScanImageView = root.findViewById(R.id.jlt_storage_in_barcode_scan_iv);
-//        mBarcodeEditText = root.findViewById(R.id.jlt_storage_in_barcode_barcode_et);
+        mBarcodeScanIv = root.findViewById(R.id.jlt_storage_in_barcode_scan_iv);
+        mBarcodeEditText = root.findViewById(R.id.jlt_storage_in_barcode_barcode_et);
         mModelEditText = root.findViewById(R.id.jlt_storage_in_barcode_model_et);
         mQuantityEditText = root.findViewById(R.id.jlt_storage_in_barcode_quantity_et);
         mMpqEditText = root.findViewById(R.id.jlt_storage_in_barcode_mpq_et);
@@ -122,13 +120,13 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mSaveButton = root.findViewById(R.id.jlt_storage_in_barcode_save_btn);
         mNextButton = root.findViewById(R.id.jlt_storage_in_barcode_next_btn);
         mPoCheckBox = root.findViewById(R.id.jlt_storage_in_barcode_po_cb);
-        mModelEditText.requestFocus();
-//        mBarcodeEditText.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);
 
         mBarcodeParseBean = new JLTBarcodeParseBean();
-        mBarcodeParseBean.setCHECKPO("Y");
+        mBarcodeParseBean.setCHECKPO("N");
 
         View enclosureView = View.inflate(mActivity, R.layout.dialog_jlt_search_whcode, null);
         mEnclosureRecyclerView = enclosureView.findViewById(R.id.item_jlt_search_whcode_rv);
@@ -148,7 +146,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     protected void initEvents() {
         mMoreButton.setOnClickListener(this);
         mCalendarImageView.setOnClickListener(this);
-//        mScanImageView.setOnClickListener(this);
+        mBarcodeScanIv.setOnClickListener(this);
         mModelScanIv.setOnClickListener(this);
         mSaveButton.setOnClickListener(this);
         mNextButton.setOnClickListener(this);
@@ -165,17 +163,17 @@ 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) {
-//                barcodeParse();
-//            }
-//        });
+        CommonUtil.setEditorActionListener(mBarcodeEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                barcodeParse(text);
+            }
+        });
 
         CommonUtil.setEditorActionListener(mModelEditText, new MyEditorActionListener() {
             @Override
             public void MyEditorAction(String text, int actionId, KeyEvent event) {
-                barcodeParse();
+                modelParse();
             }
         });
 
@@ -277,7 +275,34 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mBarcodeParseBean.setOUTBOX(mBoxNum);
     }
 
-    private void barcodeParse() {
+    private void barcodeParse(String barcode) {
+        if (TextUtils.isEmpty(barcode)) {
+            return;
+        }
+        resetState();
+        progressDialog.show();
+        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_RECEIVING_BARCODEPARSE2)
+                .method(Request.Method.POST)
+                .addParam("data", barcode)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                mModelEditText.requestFocus();
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                mBarcodeEditText.setText("");
+                mBarcodeEditText.requestFocus();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+            }
+        });
+    }
+
+    private void modelParse() {
         mEnclosureList.clear();
         mEnclosureEditText.setText("");
         String model = mModelEditText.getText().toString().trim();
@@ -535,9 +560,9 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 dialog.setTargetFragment(JLTStorageInBarcodeFragment.this, REQUEST_DATE);
                 dialog.show(fragmentManager, DIALOG_DATE);
                 break;
-//            case R.id.jlt_storage_in_barcode_scan_iv:
-//                CommonUtil.scanBarcode(mActivity, JLTStorageInBarcodeFragment.this, SCAN_BARCODE_CODE);
-//                break;
+            case R.id.jlt_storage_in_barcode_scan_iv:
+                CommonUtil.scanBarcode(mActivity, JLTStorageInBarcodeFragment.this, SCAN_BARCODE_CODE);
+                break;
             case R.id.jlt_storage_in_barcode_model_scan_iv:
                 CommonUtil.scanBarcode(mActivity, JLTStorageInBarcodeFragment.this, SCAN_MODEL_CODE);
                 break;
@@ -623,6 +648,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                         .setNegativeButton("取消", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
+                                mBarcodeEditText.setText("");
                                 resetState();
                             }
                         }).create().show();
@@ -638,11 +664,12 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         progressDialog.show();
         String jsonString = JSON.toJSONString(mBarcodeParseBean);
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
-                .url(GloableParams.ADDRESS_JLT_RECEIVING_SAVEBARCODE)
+                .url(GloableParams.ADDRESS_RECEIVING_SAVEBARCODE2)
                 .method(Request.Method.POST)
                 .tag(TAG + "savebarcode")
                 .addParam("store", jsonString)
                 .addParam("pi_ids", mPiid)
+                .addParam("barcode", mBarcodeEditText.getText().toString().trim())
                 .build(), new HttpCallback() {
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
@@ -675,14 +702,17 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                         boolean isFinish = FastjsonUtil.getBoolean(dataObject, "ISFINISH");
                         if (isFinish) {
                             CommonUtil.toastNoRepeat(mActivity, "该入库单最后一行已完成采集！");
-                            getActivity().getSupportFragmentManager().popBackStackImmediate();
-                            if (mOnFinishListener != null) {
-                                mOnFinishListener.onFinish();
-                            }
+                            mBarcodeEditText.setText("");
+                            resetState();
+//                            getActivity().getSupportFragmentManager().popBackStackImmediate();
+//                            if (mOnFinishListener != null) {
+//                                mOnFinishListener.onFinish();
+//                            }
                         } else {
                             if (exist) {
                                 getActivity().getSupportFragmentManager().popBackStack();
                             } else {
+                                mBarcodeEditText.setText("");
                                 resetState();
                             }
                         }
@@ -712,7 +742,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         mBrandEditText.setText("");
         mEnclosureEditText.setText("");
 
-        mModelEditText.requestFocus();
+        mBarcodeEditText.requestFocus();
     }
 
 
@@ -732,19 +762,20 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 mDateEditText.setText("");
             }
         }
-        /*if (requestCode == SCAN_BARCODE_CODE && data != null) {
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 mBarcodeEditText.setText(result);
                 mBarcodeEditText.setSelection(result.length());
+                barcodeParse(result);
             }
-        }*/
+        }
         if (requestCode == SCAN_MODEL_CODE && data != null) {
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 mModelEditText.setText(result);
                 mModelEditText.setSelection(result.length());
-                barcodeParse();
+                modelParse();
             }
         }
     }
@@ -762,6 +793,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
         Button postBtn = (Button) mMenuView.findViewById(R.id.pop_jlt_storage_in_box_menu_4);
         postBtn.setVisibility(View.VISIBLE);
         revokeCollectBtn.setText("确认入库");
+        revokeCollectBtn.setVisibility(View.GONE);
 
         todoListBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -819,6 +851,7 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                                     public void onSuccess(int flag, Object o) throws Exception {
                                         progressDialog.dismiss();
                                         CommonUtil.toastNoRepeat(mActivity, "过账成功");
+                                        getActivity().getSupportFragmentManager().popBackStackImmediate();
                                     }
 
                                     @Override

app/src/main/java/com/uas/keg_storage/fragment/JLTStorageInDoneListFragment.java

@@ -194,6 +194,7 @@ public class JLTStorageInDoneListFragment extends BaseFragment implements JLTSto
         Button confirmBtn = (Button) mMenuView.findViewById(R.id.pop_storage_iqc_in_menu_2);
         cancelBtn.setText("取消采集");
         confirmBtn.setText("确认入库");
+        confirmBtn.setVisibility(View.GONE);
 
         cancelBtn.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -210,6 +210,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
             mEndDate = bundle.getString("endDate", "");
         }
 
+        progressDialog.show();
         getInDataList();
     }
 
@@ -261,7 +262,6 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
     }
 
     private void getInDataList() {
-        progressDialog.show();
         mStorageInBeans.clear();
         mFilterStorageInBeans.clear();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
@@ -437,6 +437,9 @@ public class JltStorageInFilterListFragment extends BaseFragment implements OnCo
         super.onHiddenChanged(hidden);
         if (!hidden) {
             setTitle("入库列表");
+            if (!CommonUtil.isRepeatClick()) {
+                getInDataList();
+            }
         }
     }
 

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

@@ -230,6 +230,8 @@ public class GloableParams {
     public static String ADDRESS_PDAIOOUT_GETBARMSG;
     public static String ADDRESS_PDAIOOUT_GETNEEDBARLIST;
     public static String ADDRESS_PDAIOOUT_COLLECTBARCODE2;
+    public static String ADDRESS_RECEIVING_BARCODEPARSE2;
+    public static String ADDRESS_RECEIVING_SAVEBARCODE2;
 
 
     //连接服务器请求地址
@@ -252,6 +254,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST = "/api/pda/receiving/getNeedList.action";
     //入库已采集列表
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETCOLLECTLISTBYBOX = "/api/pda/receiving/getCollectListByBox.action";
+    //入库条码校验
+    private static final String ADDRESSTAIL_RECEIVING_BARCODEPARSE2 = "/api/pda/receiving/barcodeParse2.action";
+    //入库采集
+    private static final String ADDRESSTAIL_RECEIVING_SAVEBARCODE2 = "/api/pda/receiving/saveBarcode2.action";
     //根据箱号获取箱内信息
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETOUTBOXDATA = "/api/pda/receiving/getOutBoxData.action";
     //入库撤销箱采集
@@ -1029,5 +1035,7 @@ public class GloableParams {
         GloableParams.ADDRESS_PDAIOOUT_GETBARMSG = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_GETBARMSG;
         GloableParams.ADDRESS_PDAIOOUT_GETNEEDBARLIST = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_GETNEEDBARLIST;
         GloableParams.ADDRESS_PDAIOOUT_COLLECTBARCODE2 = uriHead + GloableParams.ADDRESSTAIL_PDAIOOUT_COLLECTBARCODE2;
+        GloableParams.ADDRESS_RECEIVING_BARCODEPARSE2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_BARCODEPARSE2;
+        GloableParams.ADDRESS_RECEIVING_SAVEBARCODE2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_SAVEBARCODE2;
     }
 }

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

@@ -290,7 +290,6 @@
                 android:layout_weight="1"
                 android:background="@drawable/selector_radio_bg"
                 android:button="@null"
-                android:checked="true"
                 android:gravity="center"
                 android:text="料盘信息"
                 android:textColor="@color/selector_radio_text_color" />
@@ -302,6 +301,7 @@
                 android:layout_weight="1"
                 android:background="@drawable/selector_radio_bg"
                 android:button="@null"
+                android:checked="true"
                 android:gravity="center"
                 android:text="库位提示"
                 android:textColor="@color/selector_radio_text_color" />
@@ -314,7 +314,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@color/white"
-        android:visibility="visible">
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -594,7 +594,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:visibility="gone" />
+        android:visibility="visible" />
 
     <Button
         android:id="@+id/jlt_pick_material_out_scan_save_btn"

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

@@ -27,7 +27,7 @@
     </LinearLayout>
 
 
-    <!--<LinearLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
@@ -52,7 +52,7 @@
             android:layout_marginRight="10dp"
             android:clickable="false"
             android:src="@drawable/ic_edittext_scan" />
-    </LinearLayout>-->
+    </LinearLayout>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -174,11 +174,11 @@
                         style="@style/EditTextStyle"
                         android:layout_width="236dp"
                         android:layout_weight="1"
-                        android:enabled="false"
+                        android:enabled="true"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:hint="请选择日期"
-                        android:longClickable="false"
+                        android:longClickable="true"
                         android:textColor="@color/black" />
 
                     <ImageView
@@ -254,7 +254,7 @@
                     style="@style/tl_tv_style"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="6dp"
-                    android:checked="true"
+                    android:checked="false"
                     android:gravity="center"
                     android:paddingRight="10dp"
                     android:text="PO"

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

@@ -38,7 +38,7 @@
             android:id="@+id/pda_wms_in_filter_mine_cb"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="true"
+            android:checked="false"
             android:text="我的" />
     </LinearLayout>
 

build.gradle

@@ -44,8 +44,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 3,
-            versionName      : "v2.1"
+            versionCode      : 4,
+            versionName      : "v2.2"
     ]
 
     depsVersion = [