单据校验修改

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -159,22 +159,47 @@ public class IoCollectOrderCodeManController extends BaseController {
 
             collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
 
-            if (IntUtil.value(workPlace.getCheckInsert()) == 1) {
-                //信息提醒
-                if (collectOrderBiz == null) {
-                    collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
-                    collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
-                } else {
-                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                }
 
-            } else {
-                //禁止录入
-                if (collectOrderBiz == null)
-                    return ResultVOUtils.error(500, "非此单据追溯码！");
-                else {
-                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                }
+            switch (workPlace.getCheckInsert()) {
+                case 1: //插入
+                    if (collectOrderBiz == null) {
+                        collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
+                        collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
+                    } else {
+                        collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
+                    }
+                    break;
+                case 2: //不插入
+                    if (collectOrderBiz == null)
+                        return ResultVOUtils.error(500, "非此单据追溯码！");
+                    int count = collectOrderBiz.getScanCount() + 1;
+                    if (count > collectOrderBiz.getCount()) {
+                        return ResultVOUtils.error(500, "扫码数量超出！");
+                    }
+                    collectOrderBiz.setScanCount(count);
+
+                    break;
+                case 3: //提醒是否插入
+
+                    if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
+                        if (collectOrderBiz == null)
+                            return ResultVOUtils.error(502, "非此单据追溯码！");
+                        int count1 = collectOrderBiz.getScanCount() + 1;
+                        if (count1 > collectOrderBiz.getCount()) {
+                            return ResultVOUtils.error(502, "扫码数量超出！");
+                        }
+                    } else {
+                        if (collectOrderBiz == null) {
+                            collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
+                            collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
+                        } else {
+                            collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
+                        }
+                    }
+
+                    break;
+                default:
+                    break;
             }
 
 
@@ -190,23 +215,46 @@ public class IoCollectOrderCodeManController extends BaseController {
 
             //按单不校验三期
             collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs);
-            //先不管
-            if (IntUtil.value(workPlace.getCheckInsert()) == 1) {
-                //信息提醒
-                if (collectOrderBiz == null) {
-                    collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
-                    collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
-                } else {
-                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                }
-
-            } else {
-                //禁止录入
-                if (collectOrderBiz == null)
-                    return ResultVOUtils.error(500, "非此单据追溯码！");
-                else {
-                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                }
+            switch (workPlace.getCheckInsert()) {
+                case 1: //插入
+                    if (collectOrderBiz == null) {
+                        collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
+                        collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
+                    } else {
+                        collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
+                    }
+                    break;
+                case 2: //不插入
+                    if (collectOrderBiz == null)
+                        return ResultVOUtils.error(500, "非此单据追溯码！");
+                    int count = collectOrderBiz.getScanCount() + 1;
+                    if (count > collectOrderBiz.getCount()) {
+                        return ResultVOUtils.error(500, "扫码数量超出！");
+                    }
+                    collectOrderBiz.setScanCount(count);
+
+                    break;
+                case 3: //提醒是否插入
+
+                    if (!IntUtil.value(addTagCodeReqeust.getInsert())) {
+                        if (collectOrderBiz == null)
+                            return ResultVOUtils.error(502, "非此单据追溯码！");
+                        int count1 = collectOrderBiz.getScanCount() + 1;
+                        if (count1 > collectOrderBiz.getCount()) {
+                            return ResultVOUtils.error(502, "扫码数量超出！");
+                        }
+                    } else {
+                        if (collectOrderBiz == null) {
+                            collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
+                            collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
+                        } else {
+                            collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1);
+                        }
+                    }
+
+                    break;
+                default:
+                    break;
             }
         }
         collectOrderBizService.updateById(collectOrderBiz);

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -293,7 +293,7 @@ public class IoCodeTempController extends BaseController {
                 return baseResponse;
             }
         }
-        BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成");
+        BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成,缺少" + lostMsg.substring(1));
         udiEntity.setCode(code);
         baseResponse.setData(udiEntity);
         return baseResponse;

src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java

@@ -23,6 +23,7 @@ public class AddTagCodeReqeust {
     private String workPlaceCode;
     private String fromCorp;
     private String invCode;
+    private Boolean insert;
 
 
 }