From 933970a05c519faa171af76620f0a6d622f88c8a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 5 Apr 2025 16:19:30 +0800 Subject: [PATCH] =?UTF-8?q?4/5=20=E6=89=AB=E7=A0=81=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 2 +- .../collect/IoCollectOriginController.java | 2 +- .../collect/IoCollectOrderCodeManService.java | 24 +++++++++++-------- .../collect/IoCollectOriginService.java | 16 ++++++++++--- 4 files changed, 29 insertions(+), 15 deletions(-) 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 c63a04933..a2590cea0 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -628,7 +628,7 @@ public class IoCollectOrderController extends BaseController { @PostMapping("/udiwms/basic/collect/order/finishReturnOrder") @Transactional(rollbackFor = Exception.class) public BaseResponse finishReturnOrder(@RequestBody CollectOrderRequest collectOrderRequest) { - return collectOriginService.submitreturnOrder(collectOrderRequest); + return collectOriginService.submitreturnOrder(collectOrderRequest,1); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index b1ebbf0da..3f7f6cb4f 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -326,6 +326,6 @@ public class IoCollectOriginController extends BaseController { @PostMapping("/udiwms/basic/collect/origin/order/returnSubmit") public BaseResponse returnOrderSubmit(@RequestBody CollectOrderRequest collectOrderRequest) { //假数据设置 - return collectOriginService.submitreturnOrder(collectOrderRequest); + return collectOriginService.submitreturnOrder(collectOrderRequest,2); } } 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 59ac4554a..0a29a4a87 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -14,10 +14,7 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.WorkOperType; import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; import com.glxp.api.entity.auth.SysWorkplace; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; -import com.glxp.api.entity.basic.SysWorkplacePutRel; -import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.basic.*; import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; @@ -207,6 +204,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl IntUtil.value(collectOrderBiz.getCount())) { - int needCount = IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getScanActCount()); - if (needCount > 0) { - if (vailInSplit(collectOrderBiz, putWorkPlaceCode, needCount)) { - throw new JsonException(502, collectOrderBiz.getCpmctymc() + "当前拆零数量还有剩余，是否继续扫码进行拆零？"); + if (!addTagCodeReqeust.getBusType().startsWith("YPCFTF")) { + if (actCount > IntUtil.value(collectOrderBiz.getCount())) { + int needCount = IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getScanActCount()); + if (needCount > 0) { + if (vailInSplit(collectOrderBiz, putWorkPlaceCode, needCount)) { + throw new JsonException(502, collectOrderBiz.getCpmctymc() + "当前拆零数量还有剩余，是否继续扫码进行拆零？"); + } } + throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！"); } - throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！"); } collectOrderBiz.setAddScanCount(1); collectOrderBiz.setAddScanActCount(scanCount); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index 9ea6ea14c..f3cbfa22b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -240,7 +240,7 @@ public class IoCollectOriginService { } @Transactional(rollbackFor = Exception.class) - public BaseResponse submitreturnOrder(CollectOrderRequest collectOrderRequest) { + public BaseResponse submitreturnOrder(CollectOrderRequest collectOrderRequest,Integer type) { if (StrUtil.isBlank(collectOrderRequest.getBillNo())) { return ResultVOUtils.error(500, "单据号不能为空"); } @@ -327,13 +327,22 @@ public class IoCollectOriginService { // }else { // //整取 // } + IoCollectCodeBackup collectCodeBackup = new IoCollectCodeBackup(); BeanUtils.copyProperties(ioCollectCodeResponse,collectCodeBackup); collectCodeBackup.setBillNo(collectOrder.getBillNo()); collectCodeBackup.setId(null); collectCodeBackup.setBusType(collectOrder.getBusType()); collectCodeBackup.setRelId(Long.valueOf(ioCollectCodeResponse.getRelId())); - ioCollectCodeBackups.add(collectCodeBackup); + IoCollectOrderCodeMan one = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper() + .eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo()) + .eq(IoCollectOrderCodeMan::getUdiCode, ioCollectCodeResponse.getCode())); + if (type == 1 && one != null){ + //手动扫码退货 + ioCollectCodeBackups.add(collectCodeBackup); + }else if (type == 2){ + ioCollectCodeBackups.add(collectCodeBackup); + } } @@ -347,6 +356,7 @@ public class IoCollectOriginService { orderBackup.setWorkPlaceCode(prescriptionOrder.getWorkPlaceCode()); ioCollectOrderBackupService.save(orderBackup); List ioCollectOrderBizs = collectOrderBizService.listByBillNo(ioCollectOrder.getBillNo()); + List list = ioCollectOrderCodeManService.list(new LambdaQueryWrapper().eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo())); ArrayList ioCollectOrderBizBackups = new ArrayList<>(); for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){ IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup(); @@ -358,7 +368,7 @@ public class IoCollectOriginService { collectOrderOriginService.updateById(collectOrder); ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups); collectOrderService.removeOrderByBillNo(ioCollectOrder); - List list = ioCollectOrderCodeManService.list(new LambdaQueryWrapper().eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo())); + if (list.size() > 0){ ioCollectOrderCodeManService.removeByBillNo(collectOrder.getBillNo()); }