From d9c5bc74124e3f29fbcfa42822f5686a5fc295e1 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Wed, 3 Jun 2026 15:53:16 +0800 Subject: [PATCH] =?UTF-8?q?1521=20=E9=92=A2=E6=9E=84=E4=BB=B6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E6=A1=86=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=91=E5=92=8C=E3=80=90ECO=E3=80=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StructuralPackageOrderController.java | 1 + .../pojo/qo/PackageDeliverOrderSaveItemQO.java | 10 ++++++++++ ...eliverStructuralPackageOrderForPackageItemVO.java | 10 ++++++++++ .../pojo/vo/DeliverStructuralPackageOrderVO.java | 12 ++++++++++++ .../repository/entity/WmsStructuralPackageOrder.java | 10 ++++++++++ .../mapper/WmsStructuralPackageOrderMapper.xml | 6 ++++-- .../mapper/WmsStructuralPackageOrderTrayMapper.xml | 4 +++- 7 files changed, 50 insertions(+), 3 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 c268d230..7a638637 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 @@ -318,6 +318,7 @@ public class StructuralPackageOrderController extends BaseController { request.getItems().forEach(orderQO -> { WmsStructuralPackageOrder order = Convert.convert(WmsStructuralPackageOrder.class, orderQO); order.setOrderNo(orderNo); + if (Objects.isNull(order.getId())) { order.setId(IdUtil.getSnowflakeNextId()); order.setCreateBy(UserUtil.getUserName()); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java index 71cfa890..310f9b62 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageDeliverOrderSaveItemQO.java @@ -79,6 +79,16 @@ public class PackageDeliverOrderSaveItemQO { */ private String kzkri; + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; + @JsonIgnore private String key1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java index 8b7cbe11..b6691392 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java @@ -92,4 +92,14 @@ public class DeliverStructuralPackageOrderForPackageItemVO { * 该订单下包含的托盘号 */ private List trayNos; + + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java index 9410388f..513550d4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java @@ -169,4 +169,16 @@ public class DeliverStructuralPackageOrderVO { * 工厂编号 */ private String factoryNo; + + /** + * 版本号（从钢构件基础信息获取） + */ + @ExcelColumn(value = "版本", colIndex = 12) + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + @ExcelColumn(value = "ECO", colIndex = 13) + private String eco; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java index 55b6d2f8..fd45a3f2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java @@ -121,4 +121,14 @@ public class WmsStructuralPackageOrder implements Serializable { * 是否存在缺货零件 */ private Boolean quehuo; + + /** + * 版本号（从钢构件基础信息获取） + */ + private String version; + + /** + * ECO（从钢构件基础信息获取） + */ + private String eco; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml index e53167a3..516845aa 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml @@ -5,6 +5,7 @@ SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" - ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no" + ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -51,6 +52,7 @@ SELECT o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp."no" AS "package_no" ,sp."name" AS "package_desc",sp.drawing_no as "package_drawing_no",sp.remark as "package_remark",o.num - ,wh.no as "warehouse_no" + ,wh.no as "warehouse_no",o.version,o.eco FROM wms_structural_package_deliver_order pdo inner join wms_structural_package_deliver_order_map pdom on pdo.id=pdom.deliver_id LEFT JOIN wms_structural_package_order o on o.id=pdom.order_id diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml index 930afaea..3394c6ca 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml @@ -6,6 +6,7 @@ SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",o.*,m.no||wb."no" AS "workbench_code" ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no" ,sp."name" AS "package_desc",(SELECT COUNT(*) FROM wms_structural_package_order_tray ot WHERE ot.order_id=o.id) AS "trayNum",m."no" AS "model_no",'' as "tray_no",null as "tray",spdom.deliver_id + ,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -47,7 +48,7 @@ SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.order_id,o.*,m.no||wb."no" AS "workbench_code" ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no" ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,ot.id as "tray_id" - ,o.quehuo + ,o.quehuo,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id @@ -65,6 +66,7 @@ SELECT ot.id,ot.weight,o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no" ,sp.cate as "package_cate",sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.order_id ,ot.no as "tray_no",ot.tray,ot.station,ot.state,sp.version as "package_version",sp.drawing_no as "package_drawing_no" + ,o.version,o.eco FROM wms_structural_package_order o LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id" LEFT JOIN user_supplier us ON o.supplier_id=us.id