增加PDA出库过账条码校验接口

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

@@ -72,6 +72,7 @@ import com.uas.hy_electronic.tools.VolleyUtil;
 import com.uas.hy_electronic.util.CameraUtil;
 import com.uas.hy_electronic.util.CommonUtil;
 import com.uas.hy_electronic.util.Constants;
+import com.uas.hy_electronic.util.FastjsonUtil;
 import com.uas.hy_electronic.util.FileUtils;
 import com.uas.hy_electronic.util.FragmentUtils;
 import com.uas.hy_electronic.util.HttpCallback;
@@ -1394,24 +1395,75 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                     @Override
                     public void onClick(View view) {
                         closeListPopupWindow();
-                        new AlertDialog.Builder(mActivity)
-                                .setMessage("确认将单据过账？")
-                                .setNegativeButton(R.string.cancel, null)
-                                .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialogInterface, int i) {
-                                        dialogInterface.dismiss();
-                                        progressDialog.show();
-                                        VolleyRequest.getInstance().stringRequest(mStringRequest,
-                                                new HttpParams.Builder()
-                                                        .url(GloableParams.ADDRESS_INMATERIAL_CONFIRMPOST)
-                                                        .method(Request.Method.POST)
-                                                        .addParam("piid", pi_id)
-                                                        .tag(TAG + "confirmpost")
-                                                        .flag(FLAG_CONFIRM_POST).build(),
-                                                30 * 1000, IOCOutMakeMaterialOper.this);
+                        //调用先进先出接口
+                        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_BARCODE_FIRST_IN_FIRST_OUT_VERIFICATION)
+                                .method(Request.Method.GET)
+                                .addParam("piid", pi_id)
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                try {
+                                    String result = o.toString();
+                                    if (FastjsonUtil.validate(result)) {
+                                        com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(result);
+                                        if (special_check.isChecked()) {
+                                            new AlertDialog.Builder(mActivity)
+                                                    .setMessage("是否确认过账？" + FastjsonUtil.getText(resultObject, "data"))
+                                                    .setNegativeButton(R.string.no, null)
+                                                    .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                                        @Override
+                                                        public void onClick(DialogInterface dialogInterface, int i) {
+                                                            dialogInterface.dismiss();
+                                                            progressDialog.show();
+                                                            VolleyRequest.getInstance().stringRequest(mStringRequest,
+                                                                    new HttpParams.Builder()
+                                                                            .url(GloableParams.ADDRESS_INMATERIAL_CONFIRMPOST)
+                                                                            .method(Request.Method.POST)
+                                                                            .addParam("piid", pi_id)
+                                                                            .tag(TAG + "confirmpost")
+                                                                            .flag(FLAG_CONFIRM_POST).build(),
+                                                                    30 * 1000, IOCOutMakeMaterialOper.this);
+                                                        }
+                                                    }).create().show();
+                                        }else {
+                                            new AlertDialog.Builder(mActivity)
+                                                    .setMessage("不允许过账!" + FastjsonUtil.getText(resultObject, "data"))
+                                                    .setNegativeButton(R.string.text_btn_close, null)
+                                                    .create().show();
+                                        }
+
+                                    }else {
+                                        new AlertDialog.Builder(mActivity)
+                                                .setMessage("确认将单据过账？")
+                                                .setNegativeButton(R.string.cancel, null)
+                                                .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
+                                                    @Override
+                                                    public void onClick(DialogInterface dialogInterface, int i) {
+                                                        dialogInterface.dismiss();
+                                                        progressDialog.show();
+                                                        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                                                                new HttpParams.Builder()
+                                                                        .url(GloableParams.ADDRESS_INMATERIAL_CONFIRMPOST)
+                                                                        .method(Request.Method.POST)
+                                                                        .addParam("piid", pi_id)
+                                                                        .tag(TAG + "confirmpost")
+                                                                        .flag(FLAG_CONFIRM_POST).build(),
+                                                                30 * 1000, IOCOutMakeMaterialOper.this);
+                                                    }
+                                                }).create().show();
                                     }
-                                }).create().show();
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+
                     }
                 });
 

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

@@ -273,6 +273,7 @@ public class GloableParams {
     public static String ADDRESS_DELETEALLDETAIL;
     public static String ADDRESS_PDAIO_IN_GETWHCODE;
     public static String ADDRESS_GETPRODLIST;
+    public static String ADDRESS_BARCODE_FIRST_IN_FIRST_OUT_VERIFICATION;       //条码先进先出校验
 
 
 
@@ -788,6 +789,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_MAKESNPACKAGE = "/api/pda/receiving/makeSnPackage.action";
 
 
+    //条码先进先出校验
+    private static final String ADDRESSTAIL_BARCODE_FIRST_IN_FIRST_OUT_VERIFICATION = "/api/pda/outMaterial/checkBarcodeDate.action";
+
+
 
 
     /***********************************************************************************************/
@@ -1256,6 +1261,7 @@ public class GloableParams {
         GloableParams.ADDRESS_DELETEALLDETAIL= uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_DELETEALLDETAIL;
         GloableParams.ADDRESS_PDAIO_IN_GETWHCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_GETWHCODE;
         GloableParams.ADDRESS_GETPRODLIST = uriHead + GloableParams.ADDRESSTAIL_GETPRODLIST;
+        GloableParams.ADDRESS_BARCODE_FIRST_IN_FIRST_OUT_VERIFICATION = uriHead + GloableParams.ADDRESSTAIL_BARCODE_FIRST_IN_FIRST_OUT_VERIFICATION;
 
     }
 }

app/src/main/res/values/strings.xml

@@ -433,4 +433,8 @@
         <item>重新采集</item>
         <item>未提交列表</item>
     </string-array>
+
+    <string name="yes">是</string>
+    <string name="no">否</string>
+
 </resources>

build.gradle

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