Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -156,7 +156,6 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
         }
-
         if (userId!=null){
             mapValue.put("userId",userId);
         }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -214,7 +214,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询内转运输订单给APP 9 10 11
     Map<String, Object> getNZOrderMessageToApp(Map<String, Object> map);
 
-    //查询采购零星物资订单给app 12 13
+    //查询采购零星物资订单给app 12 13 14
     Map<String,Object>  getSporadicOrder(Map<String, Object> map);
 
     //查询发运计划运输订单给APP  2 3 4

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);
                 }
@@ -1918,7 +1919,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
-        String type="";
         String inwardType="";
         //获取订单类型
         if(map.get("orderType") == null){
@@ -1972,16 +1972,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
             case 13:
-            case 15:
-            case 16:
+            case 14:
                 mesMap = omstruckOrderMapper.getSporadicOrder(map);
                 break;
             case 19:
                  mesMap=omstruckOrderMapper.getSporadicOrder(map);
-                     type += "零星退货";
-                     mesMap.put("type", type);
-
-
+                 mesMap.put("type", "零星退货");
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
 

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
 

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>
 
@@ -394,12 +400,12 @@
         select OO.ORDER_ID         "orderId",
         TTR.RESULT_TOTAL_ID        "resultTotalId",
         ASO.SPORADIC_ORDER_NO      "sporadicOrderNo",
+        ASO.SPORADIC_ORDER_ID       "sporadicOrderId",
         OO.ORDER_NUMBER            "orderNumber",
         RS.SUPPLIER_NAME           "sendCompany",
         RC2.CONSIGNEE_COMPANY_NAME "receiveCompany",
         ASO.INSERT_TIME            "insertTime",
         RC.CAPACITY_NUMBER         "capacityNumber",
-        RM.MATERIAL_NAME           "materialName",
         rce.carrier_name           "carrierName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
@@ -412,28 +418,15 @@
         on RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
         left join RMS_CONSIGNEE RC2
         on RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on oom.order_id = oo.order_id
-        left join rms_material rm
-        on rm.material_id = oom.material_id
         left join rms_carrier rce
         on rce.carrier_id = aso.carrier_id
         <where>
             <if test="status != null">
              and  OO.ORDER_STATUS = #{status}
            </if>
-
             <if test="type == 1">
-                and OO.ORDER_TYPE in (12, 13 , 20)
-            </if>
-            <if test="type == 2">
-                and OO.ORDER_TYPE = 14
-            </if>
-            <if test="type == 3">
-                and OO.ORDER_TYPE in (15,16)
-            </if>
-            <if test="type1!=null">
-                 and OO.ORDER_STATUS IN (2,5)
+                and OO.ORDER_TYPE in (12, 13 ,14)
+                and OO.CAPACITY_ID IS NOT NULL
             </if>
             <if test="carrierId != null">
                 and ASO.CARRIER_ID = (select rc.carrier_id from rms_carrier rc