'物资字段增加规格型号'

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

@@ -84,6 +84,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
             String allMaterialName = "";
             String allMaterialNumber = "";
             String allMaterialTheoreticalWeight = "";
+            String allMaterialSpecificationModel = "";
             for (Map<String,Object> materialMap : materialMessages) {
                 if (materialMap != null) {
                     String materialName = (String) materialMap.get("materialName");
@@ -94,11 +95,16 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                     }
                     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);
             }
@@ -109,17 +115,24 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                 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 dispatchSaleOrderList;
     }
@@ -158,6 +171,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
             String allMaterialName = "";
             String allMaterialNumber = "";
             String allMaterialTheoreticalWeight = "";
+            String allMaterialSpecificationModel = "";
             if (materialMessages != null) {
                 for (Map<String, Object> materialMap : materialMessages) {
                     if (materialMap != null) {
@@ -169,11 +183,16 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                         }
                         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);
                 }
@@ -184,17 +203,24 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                     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);
             }
 //            // 将已经清空的map里面put进一个map和一个list<Map>
 //            map.put("materialMessages",materialMessages);
@@ -203,6 +229,7 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
                 map.put("allMaterialName",allMaterialName);
                 map.put("allMaterialNumber",allMaterialNumber);
                 map.put("allMaterialTheoreticalWeight",allMaterialTheoreticalWeight);
+                map.put("allMaterialSpecificationModel",allMaterialSpecificationModel);
             }
         }
         return mapList;

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

@@ -404,9 +404,9 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!--根据车序号查找公开派单主键    -->
     <select id="selectDispatchIdBySaleOrderMaterialId" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-        select  ADSO.DISPATCH_ID "dispatchId"
+        select ADSO.DISPATCH_ID "dispatchId"
         from AMS_DISPATCH_SALE_ORDER ADSO
-        where ADSO.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
+        where ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
     <!-- 展示所有公开抢单的销售订单的车序号 -->
     <select id="getOpenDispatchSaleOrder" parameterType="java.util.Map" resultType="java.util.Map">
@@ -450,9 +450,10 @@
     </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"
+        SELECT RM.MATERIAL_NAME                               AS "materialName",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
+               ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
@@ -491,7 +492,7 @@
         WHERE ADSO.DISPATCH_STATUS = 0
           AND ADSO.CARRIER_ID = #{carrierId}
     </select>
-<!-- pc端公开抢单界面显示   -->
+    <!-- pc端公开抢单界面显示   -->
     <select id="getLockDispatchSaleOrderListForPc" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
                ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
@@ -516,6 +517,7 @@
                            ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
                  LEFT JOIN RMS_CARRIER RCA
                            ON RCA.CARRIER_ID = ADSO.CARRIER_ID
-        WHERE ADSO.DISPATCH_STATUS = 0 and ADSO.DISPATCH_TYPE=1
+        WHERE ADSO.DISPATCH_STATUS = 0
+          and ADSO.DISPATCH_TYPE = 1
     </select>
 </mapper>