luobang 2 years ago
parent
commit
6ad404bcda

+ 3 - 3
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1954,7 +1954,7 @@
                     RSR.SALER_NAME "saler",
                     RSR.SALER_NAME "saler",
                     RM.MATERIAL_ID  "materialId",
                     RM.MATERIAL_ID  "materialId",
                     RM.MATERIAL_NAME  "materialName",
                     RM.MATERIAL_NAME  "materialName",
-                    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+                    RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "materialSpe",
                     (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '否'
                     (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '否'
                         THEN R_CARRIER.CARRIER_ABBREVIATION
                         THEN R_CARRIER.CARRIER_ABBREVIATION
                         ELSE '自提'
                         ELSE '自提'
@@ -2338,7 +2338,7 @@
         RSR.SALER_NAME "saler",
         RSR.SALER_NAME "saler",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_NAME  "materialName",
         RM.MATERIAL_NAME  "materialName",
-        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+        RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "materialSpe",
         (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
         (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
         THEN '自提'
         THEN '自提'
         ELSE R_CARRIER.CARRIER_ABBREVIATION
         ELSE R_CARRIER.CARRIER_ABBREVIATION
@@ -2650,7 +2650,7 @@
         RSR.SALER_NAME "saler",
         RSR.SALER_NAME "saler",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_NAME  "materialName",
         RM.MATERIAL_NAME  "materialName",
-        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+        RM.MATERIAL_SPECIFICATION || '(' ||RM.MATERIAL_MODEL || ')' "materialSpe",
         (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
         (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
         THEN '自提'
         THEN '自提'
         ELSE R_CARRIER.CARRIER_ABBREVIATION
         ELSE R_CARRIER.CARRIER_ABBREVIATION