feat(wms): 增加产品和原材料的规格、材质等信息字段

klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java

@@ -99,4 +99,11 @@ public class WmsStockVo {
     //实际库区/库位自关联
     private Long actualWarehouseId;
     private String actualWarehouseName;
+
+
+    private String specification;  // 规格
+    private String material;       // 材质
+    private String surfaceTreatmentDesc; // 表面处理
+    private String zincLayer;      // 锌层
+    private String manufacturer;   // 厂家
 }

klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java

@@ -91,7 +91,12 @@ public class WmsStockServiceImpl implements IWmsStockService {
                 "mc.item_id",
                 "w.actual_warehouse_name",
                 "CASE WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name ELSE NULL END",
-                "CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END"
+                "CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END",
+                "CASE WHEN mc.item_type = 'product' THEN p.specification WHEN mc.item_type = 'raw_material' THEN r.specification ELSE NULL END",
+                "CASE WHEN mc.item_type = 'product' THEN p.material WHEN mc.item_type = 'raw_material' THEN r.material ELSE NULL END",
+                "CASE WHEN mc.item_type = 'product' THEN p.surface_treatment_desc WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc ELSE NULL END",
+                "CASE WHEN mc.item_type = 'product' THEN p.zinc_layer WHEN mc.item_type = 'raw_material' THEN r.zinc_layer ELSE NULL END",
+                "CASE WHEN mc.item_type = 'product' THEN p.manufacturer WHEN mc.item_type = 'raw_material' THEN r.manufacturer ELSE NULL END"
         );
 
         return qw;
@@ -166,7 +171,13 @@ public class WmsStockServiceImpl implements IWmsStockService {
             "mc.item_id",
             "w.warehouse_name",
             "CASE WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name ELSE NULL END",
-            "CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END"
+            "CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END",
+            // 新增分组字段（规格、材质等）
+            "CASE WHEN mc.item_type = 'product' THEN p.specification WHEN mc.item_type = 'raw_material' THEN r.specification ELSE NULL END",
+            "CASE WHEN mc.item_type = 'product' THEN p.material WHEN mc.item_type = 'raw_material' THEN r.material ELSE NULL END",
+            "CASE WHEN mc.item_type = 'product' THEN p.surface_treatment_desc WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc ELSE NULL END",
+            "CASE WHEN mc.item_type = 'product' THEN p.zinc_layer WHEN mc.item_type = 'raw_material' THEN r.zinc_layer ELSE NULL END",
+            "CASE WHEN mc.item_type = 'product' THEN p.manufacturer WHEN mc.item_type = 'raw_material' THEN r.manufacturer ELSE NULL END"
         );
 
         return qw;

klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml

@@ -39,6 +39,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN mc.item_type = 'raw_material' THEN r.raw_material_code
                 ELSE NULL
             END AS itemCode,
+            CASE
+                WHEN mc.item_type = 'product' THEN p.specification
+                WHEN mc.item_type = 'raw_material' THEN r.specification
+                ELSE NULL
+                END AS specification,
+            CASE
+                WHEN mc.item_type = 'product' THEN p.material
+                WHEN mc.item_type = 'raw_material' THEN r.material
+                ELSE NULL
+                END AS material,
+            CASE
+                WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
+                WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc
+                ELSE NULL
+                END AS surfaceTreatmentDesc,
+            CASE
+                WHEN mc.item_type = 'product' THEN p.zinc_layer
+                WHEN mc.item_type = 'raw_material' THEN r.zinc_layer
+                ELSE NULL
+                END AS zincLayer,
+            CASE
+                WHEN mc.item_type = 'product' THEN p.manufacturer
+                WHEN mc.item_type = 'raw_material' THEN r.manufacturer
+                ELSE NULL
+                END AS manufacturer,
             COUNT(*) AS totalQuantity,
             SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
         FROM wms_material_coil mc
@@ -80,6 +105,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                    WHEN mc.item_type = 'raw_material' THEN r.raw_material_code
                    ELSE NULL
                    END                                        AS itemCode,
+               CASE
+                   WHEN mc.item_type = 'product' THEN p.specification
+                   WHEN mc.item_type = 'raw_material' THEN r.specification
+                   ELSE NULL
+                   END                                                   AS specification,
+               CASE
+                   WHEN mc.item_type = 'product' THEN p.material
+                   WHEN mc.item_type = 'raw_material' THEN r.material
+                   ELSE NULL
+                   END                                                   AS material,
+               CASE
+                   WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
+                   WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc
+                   ELSE NULL
+                   END                                                   AS surfaceTreatmentDesc,
+               CASE
+                   WHEN mc.item_type = 'product' THEN p.zinc_layer
+                   WHEN mc.item_type = 'raw_material' THEN r.zinc_layer
+                   ELSE NULL
+                   END                                                   AS zincLayer,
+               CASE
+                   WHEN mc.item_type = 'product' THEN p.manufacturer
+                   WHEN mc.item_type = 'raw_material' THEN r.manufacturer
+                   ELSE NULL
+                   END                                                   AS manufacturer,
                COUNT(*)                                       AS totalQuantity,
                SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
         FROM wms_material_coil mc