'增加规格型号字段'

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -974,6 +974,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String allMaterialName = "";
         String allMaterialNumber = "";
         String allMaterialTheoreticalWeight = "";
+        String allMaterialSpecificationModel = "";
         if (materialMessages == null || materialMessages.size() == 0) {
         } else {
             for (Map<String, Object> materialMap : materialMessages) {
@@ -986,11 +987,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     }
                     String saleOrderMaterialNumber = materialMap.get("saleOrderMaterialNumber").toString();
                     allMaterialNumber += saleOrderMaterialNumber + "/";
+                    String specificationModel = materialMap.get("specificationModel").toString();
+                    if (specificationModel != null) {
+                        allMaterialSpecificationModel += specificationModel + "/";
+                    }
                 }
             }
             String subMaterialName = null;
             String subMaterialNumber = null;
             String subMaterialTheoreticalWeight = null;
+            String subMaterialSpecificationModel = null;
             if (allMaterialName.length() >= 2) {
                 subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
             }
@@ -1001,17 +1007,24 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 2);
             }
             if (allMaterialNumber.length() < 2) {
-                subMaterialName = allMaterialNumber;
+                subMaterialNumber = allMaterialNumber;
             }
             if (allMaterialTheoreticalWeight.length() >= 2) {
                 subMaterialTheoreticalWeight = allMaterialTheoreticalWeight.substring(0, allMaterialTheoreticalWeight.length() - 2);
             }
             if (allMaterialTheoreticalWeight.length() < 2) {
-                subMaterialName = allMaterialTheoreticalWeight;
+                subMaterialTheoreticalWeight = allMaterialTheoreticalWeight;
+            }
+            if (allMaterialSpecificationModel.length() >= 2) {
+                subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+            }
+            if (allMaterialSpecificationModel.length() < 2) {
+                subMaterialSpecificationModel = allMaterialSpecificationModel;
             }
             map.put("allMaterialName", subMaterialName);
             map.put("allMaterialNumber", subMaterialNumber);
             map.put("allMaterialTheoreticalWeight", subMaterialTheoreticalWeight);
+            map.put("allMaterialSpecificationModel", subMaterialSpecificationModel);
         }
         return map;
     }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -2248,10 +2248,11 @@
     </select>
 
     <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RM.MATERIAL_NAME                 AS "materialName",
-               ASTM.MATERIAL_THEORETICAL_WEIGHT AS "materialTheoreticalWeight",
-               ASTM.SALE_ORDER_MATERIAL_NUMBER  AS "saleOrderMaterialNumber",
-               ASTM.MATERIAL_ID                 AS "materialId"
+        SELECT RM.MATERIAL_NAME                               AS "materialName",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
+               ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
+               ASTM.MATERIAL_ID                               AS "materialId"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID