From 9320dfe462c01fef5de7642632dffcf130f5e7db Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 30 Aug 2023 16:59:38 +0800 Subject: [PATCH] =?UTF-8?q?pda=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoAddInoutService.java | 32 +++++++++---------- .../service/inout/IoCheckInoutService.java | 1 - .../inout/impl/IoOrderServiceImpl.java | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 7f89cdb02..56de85ffb 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -452,12 +452,13 @@ public class IoAddInoutService { */ @Transactional(rollbackFor = Exception.class) public BaseResponse waitOrderByPda(PdaPostOrderRequest pdaPostOrderRequest) { -// if (CollUtil.isEmpty(pdaPostOrderRequest.getOrderDetailCodeEntities())) { -// return ResultVOUtils.error(500, "提交失败，单据还未扫码或和扫码校验存在异常！"); -// } IoOrderEntity orderEntity = pdaPostOrderRequest.getOrderEntity(); - List orderDetailBizEntities = pdaPostOrderRequest.getOrderDetailBizEntities(); + IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); + BaseResponse tempResponse = checkSubmitEnable(temp); + if (tempResponse != null) + return tempResponse; + List orderDetailBizEntities = pdaPostOrderRequest.getOrderDetailBizEntities(); List codeTempEntities = pdaPostOrderRequest.getCodeTempEntities(); orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); @@ -547,7 +548,6 @@ public class IoAddInoutService { return tempResponse; List orderDetailBizEntities = pdaPostOrderRequest.getOrderDetailBizEntities(); - List orderDetailCodeEntities = pdaPostOrderRequest.getOrderDetailCodeEntities(); List codeTempEntities = pdaPostOrderRequest.getCodeTempEntities(); orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); @@ -556,10 +556,10 @@ public class IoAddInoutService { if (CollUtil.isNotEmpty(orderDetailBizEntities)) { orderDetailBizEntities.forEach(orderDetailBizEntity -> { orderDetailBizService.insert(orderDetailBizEntity); - }); - } - if (CollUtil.isNotEmpty(orderDetailCodeEntities)) { - orderDetailCodeEntities.forEach(orderDetailCodeEntity -> { + IoOrderDetailCodeEntity orderDetailCodeEntity = new IoOrderDetailCodeEntity(); + BeanUtil.copyProperties(orderDetailBizEntity, orderDetailCodeEntity); + orderDetailCodeEntity.setReCount(orderDetailBizEntity.getScanCount()); + orderDetailCodeEntity.setCount(orderDetailBizEntity.getCodeCount()); orderDetailCodeService.insert(orderDetailCodeEntity); }); } @@ -571,13 +571,13 @@ public class IoAddInoutService { orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); orderService.update(orderEntity); - - if (checkWebNewType == 0) { - ioCheckInoutService.checkCodeResult(orderEntity.getBillNo()); - } else { - dealProcess(orderEntity); - ioCheckInoutService.checkRightResult(orderEntity.getBillNo()); - } + ioCheckInoutService.checkCodeResult(orderEntity.getBillNo()); +// if (checkWebNewType == 0) { +// +// } else { +// dealProcess(orderEntity); +// ioCheckInoutService.checkRightResult(orderEntity.getBillNo()); +// } return ResultVOUtils.success("提交成功！"); } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 5da5cead4..0659da43b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -219,7 +219,6 @@ public class IoCheckInoutService { }); - //生成多出来的 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index b516c6aed..bedbf3125 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -717,7 +717,7 @@ public class IoOrderServiceImpl implements IoOrderService { break; case Constant.ORDER_STATUS_INCODE: - filterOrderRequest.setStatuses(Arrays.asList(1, 3)); +// filterOrderRequest.setStatuses(Arrays.asList(1, 3)); filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4)); break; case Constant.ORDER_STATUS_WAIT_AUDITED: