From f25ecf1c54f3207e4de516de168a3b679632a7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 25 Jun 2026 16:48:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(package):=20=E4=BF=AE=E5=A4=8D=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=8C=96=E5=8C=85=E8=A3=85=E8=AE=A2=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86ID=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除订单项中的供应商ID设置避免数据冗余 - 简化交付订单状态更新逻辑移除不必要的条件判断 - 优化二维码主记录的流程阶段更新确保正确标记入库状态 - 统一处理二维码扫描用户的更新逻辑 --- .../StructuralPackageOrderController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 60cae812..52e46cbc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -389,7 +389,6 @@ public class StructuralPackageOrderController extends BaseController { .setPackagingType((short) 0) .setQuantity(BigDecimal.valueOf(it.getNum())) .setUnit(it.getUnit()) - .setSupplierId(it.getSupplierId()) .setPoNumber(it.getExternalOrderNo()) .setPoLineNumber(it.getRowNo()) .setExtendId(it.getId()) @@ -1205,15 +1204,14 @@ public class StructuralPackageOrderController extends BaseController { List items = structuralPackageOrderTrayItemService.getList(request.getId()); items.forEach(it -> it.setStoreNum(it.getShipmentNum())); structuralPackageOrderTrayItemService.updateBatchById(items); - if (structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()) == 2) { - qrCodeMasterService.lambdaUpdate() - .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) - .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId()) - .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName()) - .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now()) - .eq(WmsQrCodeMaster::getExtendId, request.getId()) - .update(); - } + structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()); + qrCodeMasterService.lambdaUpdate() + .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) + .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId()) + .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName()) + .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now()) + .eq(WmsQrCodeMaster::getExtendId, request.getId()) + .update(); WmsStructuralPackageDeliverOrderMap om = structuralPackageDeliverOrderMapService.lambdaQuery() .eq(WmsStructuralPackageDeliverOrderMap::getOrderId, request.getId()) .one();