修改完工入库判断

app/src/main/java/com/uas/jc_workstation/fragment/CaiPiFragment.java

@@ -699,8 +699,9 @@ public class CaiPiFragment extends BaseFragment {
         if (printArray != null && printArray.size() > 0) {
             boolean isFail = false;
             for (int i = 0; i < printArray.size(); i++) {
+                com.alibaba.fastjson.JSONObject jsonObject = printArray.getJSONObject(i);
                 try {
-                    int printResult = PrintUtils.printBar(mActivity, printArray.toString(), mPrintDpi, null);
+                    int printResult = PrintUtils.printBar(mActivity, jsonObject.toJSONString(), mPrintDpi, null);
                     if (printResult <= 0) {
                         isFail = true;
                     }

app/src/main/java/com/uas/jc_workstation/fragment/GoodOrBadAddDetailFragment.java

@@ -445,9 +445,11 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
             CommonUtil.toastNoRepeat(mActivity, "单据ID不可为空");
             return;
         }
-        if (nextmacode.isEmpty()) {
-            CommonUtil.toastNoRepeat(mActivity, "发料工单不可为空");
-            return;
+        if (!mSTypes.equals("完工入库")) {
+            if (nextmacode.isEmpty()) {
+                CommonUtil.toastNoRepeat(mActivity, "发料工单不可为空");
+                return;
+            }
         }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,

build.gradle

@@ -68,8 +68,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 29,
-            versionName      : "v1.1.9"
+            versionCode      : 30,
+            versionName      : "v1.2.0"
     ]
 
     depsVersion = [