1521 钢构件订单新增页面框和列表添加【版本】和【ECO】字段信息

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());

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;
 

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java

@@ -92,4 +92,14 @@ public class DeliverStructuralPackageOrderForPackageItemVO {
      * 该订单下包含的托盘号
      */
     private List<String> trayNos;
+
+    /**
+     * 版本号（从钢构件基础信息获取）
+     */
+    private String version;
+
+    /**
+     * ECO（从钢构件基础信息获取）
+     */
+    private String eco;
 }

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;
 }

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;
 }

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml

@@ -5,6 +5,7 @@
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         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.drawing_no as "packageDrawingNo",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
@@ -38,7 +39,7 @@
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         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 id="getInfo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         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",di.code AS "factory_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
@@ -64,7 +66,7 @@
     <select id="getInfoByDeliverOrderNo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO">
         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

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