From 1b1474307d11056121166045ebf79e98173ee8e6 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 31 Oct 2024 14:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoCollectOrderCodeManController.java | 26 +++++++++++-------- .../collect/IoCollectOrderController.java | 1 + .../api/req/inout/AddOrderCodeRequest.java | 2 +- .../collect/IoCollectOrderCodeManService.java | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 4046e3eb4..b8f14f7d1 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/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 updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("splitUnCheck",false); - updateWrapper.in("id",bizIdFks); + updateWrapper.set("splitUnCheck", false); + 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 entry : errMsgCountMap.entrySet()) { @@ -295,7 +301,7 @@ public class IoCollectOrderCodeManController extends BaseController { return ResultVOUtils.error(500, "单据不存在"); if (CollUtil.isNotEmpty(deleteTageCodeRequest.getCodeList())) { List 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 - return ResultVOUtils.error(501,messages.toString()); + } else + return ResultVOUtils.error(501, messages.toString()); } } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 8d1decd25..b8a488716 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/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()); diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java index be7161795..21abb033b 100644 --- a/src/main/java/com/glxp/api/req/inout/AddOrderCodeRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 3666b6294..b77f0e6a0 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -393,7 +393,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl 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)) {