From 9bfc063682e0f50fa847e7be05b9bc6f16575284 Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 7 Nov 2024 08:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 8 ++++---- .../controller/inout/IoOrderReviewController.java | 14 +++++++------- .../api/service/collect/IoCollectOrderService.java | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 695b380aa..7789b6580 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1657,13 +1657,13 @@ public class IoCodeTempController extends BaseController { orderService.deleteByBillNo(orderId); return ResultVOUtils.error(507, "上货产品不符！"); } - }else { + } else { //todo 判断货位里面是否有相同产品 UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceResponses.get(0); List byRelId = fifoCodeService.findByRelId(addOrderRequest.getWorkPlaceCode(), udiRelevanceResponse1.getId()); - if (byRelId != null && byRelId.size() > 0){ + if (byRelId != null && byRelId.size() > 0) { orderService.deleteByBillNo(orderId); - return ResultVOUtils.error(507,"当前产品已绑定货位"); + return ResultVOUtils.error(507, "当前产品已绑定货位"); } } if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) { @@ -2765,7 +2765,7 @@ public class IoCodeTempController extends BaseController { Integer reCountObj = item.getScanCount(); int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代 for (int i = 0; i < reCount; i++) { - if (StrUtil.isNotBlank(code)){ + if (StrUtil.isNotBlank(code)) { codeList.add(code); } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 7f8a0ec6f..86e8d9e58 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -554,18 +554,18 @@ public class IoOrderReviewController extends BaseController { orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setReviewSp(true); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); +// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { orderEntity.setId(null); orderService.insertOrder(orderEntity); heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); - orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); - addInoutService.dealProcess(orderEntity); - orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); - if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { - ioCheckInoutService.check(orderEntity.getBillNo()); - } +// orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); +// addInoutService.dealProcess(orderEntity); +// orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); +// if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { +// ioCheckInoutService.check(orderEntity.getBillNo()); +// } } orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 8a035d2b3..d895e6a4f 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -395,18 +395,18 @@ public class IoCollectOrderService extends ServiceImpl