tjiao

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

@@ -534,6 +534,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 13:
             case 19:
             case 12:
+            case 14:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
@@ -1954,8 +1955,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                  mesMap=omstruckOrderMapper.getSporadicOrder(map);
                  type += "零星退货";
                  mesMap.put("type", type);
-
-
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.107:8008}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.118:8008}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:

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

@@ -2572,8 +2572,8 @@
     </select>
 
     <!-- 物资信息 -->
-    <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RM.MATERIAL_NAME  "materialName",
+    <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+        SELECT RM.MATERIAL_NAME  "materialName",OOM.MATERIAL_PRIORITY "materialPriority",
                CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
                (case
                     when OOM.ORDER_MATERIAL_WEIGHT is not null
@@ -2594,6 +2594,7 @@
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE ORDER_ID = #{orderId}
+        ORDER BY OOM.MATERIAL_PRIORITY
     </select>
 
     <!-- 内转原料司机接单 -->

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

@@ -179,10 +179,13 @@
     <select id="getMaoWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
-               TWR.RESULT_GROSS_WEIGHT     "weight"
+               TWR.RESULT_GROSS_WEIGHT     "weight",
+               RM.MATERIAL_NAME             "materialName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join RMS_TRUCK_CALCULATE RTC
             on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        left join RMS_MATERIAL RM
+            on TWR.MATERIAL_ID = RM.MATERIAL_ID
         where TWR.RESULT_TOTAL_ID = #{resultTotalId} and TWR.GROSS_SEGMENT_SQE = #{segmentSqe}
     </select>
 
@@ -229,10 +232,13 @@
     <select id="getPiWeightMes" parameterType="map" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
-               TWR.RESULT_TARE_WEIGHT       "weight"
+               TWR.RESULT_TARE_WEIGHT       "weight",
+               RM.MATERIAL_NAME             "materialName"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                 left join RMS_MATERIAL RM
+                           on TWR.MATERIAL_ID = RM.MATERIAL_ID
         where TWR.RESULT_TOTAL_ID = #{resultTotalId} and TWR.TARE_SEGMENT_SQE = #{segmentSqe}
     </select>