出库采集和出库撤销添加箱号

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

@@ -516,9 +516,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 etBarCode.setHint(R.string.please_collect_barcode);
                 mtypeNameTv.setText("条码");
             } else if (mCollectType.equals("byBatchcode")) {
-                CommonUtil.setSpinnerItemSelectedByValue(mTypeSpinner, "批号");
-                etBarCode.setHint("请采集批号");
-                mtypeNameTv.setText("批号");
+                CommonUtil.setSpinnerItemSelectedByValue(mTypeSpinner, "箱号");
+                etBarCode.setHint("请采集箱号");
+                mtypeNameTv.setText("箱号");
             }
         }
         btnActionbarRight = (Button) getActivity().findViewById(R.id.btn_actionbar_more);
@@ -555,7 +555,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 String typeName = mtypeNameTv.getText().toString().trim();
                 if ("条码".equals(typeName)) {
                     changeToTypeBatch();
-                } else if ("批号".equals(typeName)) {
+                } else if ("箱号".equals(typeName)) {
                     changeToTypeBarcode();
                 }
             }
@@ -584,8 +584,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
      * 采集方式切换成箱号
      */
     private void changeToTypeBatch() {
-        etBarCode.setHint("请采集批号");
-        mtypeNameTv.setText("批号");
+        etBarCode.setHint("请采集箱号");
+        mtypeNameTv.setText("箱号");
         SharedPreUtil.saveString(getActivity().getApplicationContext(), Constants.FLAG.MATERIAL_OUT_COLLECT_TYPE, "byBatchcode");
         mCollectType = "byBatchcode";
 
@@ -759,7 +759,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + "?barcode=" + URLEncoder.encode(currentBarcode, "utf-8")
                                 + (isMultiple ? "&ids=" : "&ids=")
                                 + pi_id + "&whcode=" + pd_whcode
-                                + "&type=batchcode&msdcheck=" + msdcheck
+                                + "&type=boxcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck;
                     }
                 } else if (mProdOutType.equals("byBatch")) {
@@ -775,7 +775,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 + "?barcode=" + URLEncoder.encode(currentBarcode, "utf-8")
                                 + (isMultiple ? "&ids=" : "&ids=")
                                 + pi_id + "&whcode=" + pd_whcode
-                                + "&type=batchcode&msdcheck=" + msdcheck
+                                + "&type=boxcode&msdcheck=" + msdcheck
                                 + "&datecheck=" + datecheck;
                     }
 

app/src/main/java/com/uas/pda_smart_com/fragment/MaterialOutRevocationStockFragment.java

@@ -115,19 +115,19 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
     @Override
     protected void initEvents() {
 //        if (!isMultiple) {
-        if (mWhichPage.equals("materialin")) {
-            mTypeTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    String typeName = mTypeTextView.getText().toString().trim();
-                    if ("条码".equals(typeName)) {
-                        changeToTypeBox();
-                    } else if ("箱号".equals(typeName)) {
-                        changeToTypeBarcode();
-                    }
+//        if (mWhichPage.equals("materialin")) {
+        mTypeTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String typeName = mTypeTextView.getText().toString().trim();
+                if ("条码".equals(typeName)) {
+                    changeToTypeBox();
+                } else if ("箱号".equals(typeName)) {
+                    changeToTypeBarcode();
                 }
-            });
-        }
+            }
+        });
+//        }
 
         mBarcodeEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override

build.gradle

@@ -45,8 +45,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 5,
-            versionName      : "v1.5"
+            versionCode      : 6,
+            versionName      : "v1.6"
     ]
 
     depsVersion = [