From 0876d5fa8b8cfde5a07b3c16620f8193195c7f26 Mon Sep 17 00:00:00 2001 From: 10002617 Date: Thu, 18 Jun 2026 16:44:28 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"1573=20=E6=89=98=E7=9B=98=E8=80=81?= =?UTF-8?q?=E9=BC=A0=E5=9B=BE=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E3=80=90=E6=80=BB=E9=87=8D=E3=80=91=E6=B2=A1=E5=8F=96=E5=88=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a00ec8232a0b2b5e0a18ca1152c61e695dab1d14. --- .../wms/admin/controller/StructuralPackageOrderController.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 c3b16cb7..b787d2c2 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 @@ -557,7 +557,6 @@ public class StructuralPackageOrderController extends BaseController { DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(firstTray.getId()); VUtil.trueThrowBusinessError(Objects.isNull(trayVO)).throwMessage("数据不存在"); - DeliverStructuralPackageOrderVO orderVO = structuralPackageOrderService.getInfo(id); PackageVO vo = new PackageVO() .setNo(trayVO.getPackageNo()) .setExternalOrderNo(trayVO.getExternalOrderNo()) @@ -568,7 +567,7 @@ public class StructuralPackageOrderController extends BaseController { .setEco(trayVO.getEco()) .setWorkbenchCode(trayVO.getWorkbenchCode()) .setCate(trayVO.getPackageCate()) - .setWeight(orderVO.getWeight()) + .setWeight(trayVO.getWeight()) .setDrawingNo(trayVO.getPackageDrawingNo()) .setName(trayVO.getPackageDesc()) .setQrCode(QRCodeUtil.generateQRCodeBase64(trayVO.getPackageNo(), 100, 100));