处理单据确认

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

@@ -225,17 +225,17 @@ public class IoCollectOrderCodeManController extends BaseController {
             for (int i = 0; i < codeList.size(); i++) {
                 String code = codeList.get(i);
                 IoCollectOrderCodeMan ioCollectOrderCodeMan = codeManMap.get(code);
-                if (ioCollectOrderCodeMan != null){
+                if (ioCollectOrderCodeMan != null) {
                     //更新业务表为无需确认拆零码、码明细确认拆零字段为true
                     ioCollectOrderCodeMan.setIsSplitCode(true);
                     collectOrderCodeManService.updateById(ioCollectOrderCodeMan);
                     bizIdFks.add(ioCollectOrderCodeMan.getBizIdFk());
                 }
             }
-            if (bizIdFks.size() > 0){
+            if (bizIdFks.size() > 0) {
                 UpdateWrapper<IoCollectOrderBiz> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.set("splitUnCheck",false);
+                updateWrapper.set("splitUnCheck", false);
-                updateWrapper.in("id",bizIdFks);
+                updateWrapper.in("id", bizIdFks);
                 collectOrderBizService.update(updateWrapper);
             }
             return ResultVOUtils.success("更新成功");
@@ -255,6 +255,12 @@ public class IoCollectOrderCodeManController extends BaseController {
                 } else {
                     errMsgCountMap.put(errMsg, 1);
                 }
+                if (StrUtil.isNotEmpty(response.getBizId())) {
+                    IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
+                    collectOrderBiz.setId(Long.parseLong(response.getBizId()));
+                    collectOrderBiz.setSplitUnCheck(true);
+                    collectOrderBizService.updateById(collectOrderBiz);
+                }
             }
         }
         for (Map.Entry<String, Integer> entry : errMsgCountMap.entrySet()) {
@@ -295,7 +301,7 @@ public class IoCollectOrderCodeManController extends BaseController {
             return ResultVOUtils.error(500, "单据不存在");
         if (CollUtil.isNotEmpty(deleteTageCodeRequest.getCodeList())) {
             List<IoCollectOrderCodeMan> ioCollectOrderCodes = collectOrderCodeManService.selectByCodeAndOrderId(deleteTageCodeRequest.getCodeList(), orderId);
-            if (ioCollectOrderCodes.size() == 0){
+            if (ioCollectOrderCodes.size() == 0) {
                 return ResultVOUtils.error("无效条码");
             }
             for (IoCollectOrderCodeMan ioCollectOrderCode : ioCollectOrderCodes) {
@@ -303,14 +309,12 @@ public class IoCollectOrderCodeManController extends BaseController {
                 deleteTageCodeRequest.setCodeManId(Long.valueOf(ioCollectOrderCode.getId()));
                 collectOrderService.removeCode(deleteTageCodeRequest);
             }
-        }
+        } else
-        else
             return ResultVOUtils.error("无效条码");
-        if (StrUtil.isEmpty(messages)){
+        if (StrUtil.isEmpty(messages)) {
             return ResultVOUtils.success("剔除成功!");
-        }
+        } else
-        else
+            return ResultVOUtils.error(501, messages.toString());
-            return ResultVOUtils.error(501,messages.toString());
     }
 
 }

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

@@ -369,6 +369,7 @@ public class IoCollectOrderController extends BaseController {
                 collectOrderBiz.setScanCount(0);
                 collectOrderBiz.setScanActCount(0);
                 collectOrderBiz.setTempSplitCount(0);
+                collectOrderBiz.setSplitUnCheck(false);
                 collectOrderBiz.setTempWorkPlaceCount(0);
                 if (collectOrderBiz.getCount() == 0) {
                     collectOrderBizService.removeById(collectOrderBiz.getId());

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

@@ -48,7 +48,7 @@ public class AddOrderCodeRequest {
      * 单据号
      */
     private String billNo;
-
+    private String workPlaceQueueCode;
     private String orderFinishBillNo;
 
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -393,7 +393,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
                         int actCount1 = 0;
                         actCount1 = IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount;
-                        if (actCount1 > collectOrderBiz.getCount()) {
+                        if (actCount1 > IntUtil.value(collectOrderBiz.getCount())) {
                             int needCount = IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getScanActCount());
                             if (needCount > 0) {
                                 if (vailInSplit(collectOrderBiz, putWorkPlaceCode, needCount)) {