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

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

@@ -217,6 +217,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //查询采购零星物资订单给app 12
     Map<String,Object>  getSporadicOrder(@Param("orderId") BigDecimal orderId);
 
+    //查询采购零星物资出厂订单给app 13
+    Map<String,Object> getLxOutFactoryOrder(@Param("orderId") BigDecimal orderId);
+
     //查询发运计划运输订单给APP  2 3 4
     Map<String, Object> getFYJHOrderMessageToApp(@Param("orderId") BigDecimal orderId);
 

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

@@ -2748,15 +2748,15 @@
           AND OO.ORDER_STATUS in (4, 5)
     </select>
 
-<!--查询采购零星物资信息给app 12    -->
+<!--查询采购零星物资信息给app 12 -->
     <select id="getSporadicOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT  OO.ORDER_ID        "orderId",
                 OO.ORDER_NUMBER    "orderNumber",
                 OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
                 RC.CAPACITY_NUMBER "capacityNumber",
                 OO.ORDER_TYPE      "orderType",
-                RS.SUPPLIER_NAME "consigneeCompanyName",
-                RC2.CONSIGNEE_COMPANY_NAME "receiveAddressName"
+                RS.SUPPLIER_NAME  "shipperName",
+                RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
 
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
@@ -2768,7 +2768,7 @@
                  LEFT JOIN RMS_CONSIGNEE RC2
                            ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
-        AND OO.ORDER_STATUS in (4, 5)
+          AND OO.ORDER_STATUS in (4, 5)
     </select>
 
     <!--  查询内转运输订单给APP 9 10 11-->
@@ -2893,4 +2893,26 @@
         from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId}
     </select>
+
+<!--  查询采购零星物资出厂订单给app 13  -->
+    <select id="getLxOutFactoryOrder" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        SELECT  OO.ORDER_ID        "orderId",
+                OO.ORDER_NUMBER    "orderNumber",
+                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+                RC.CAPACITY_NUMBER "capacityNumber",
+                OO.ORDER_TYPE      "orderType",
+                RS.SHIPPER_NAME "loadName",
+                RC2.CONSIGNEE_COMPANY_NAME "unloadName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join AMSTRUCK_SPORADIC_ORDER ASO
+                           ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SEND_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_STATUS in (4, 5)
+    </select>
 </mapper>

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

@@ -167,7 +167,8 @@
 <!--    通过总实绩ID和路段顺序号查询计毛实绩数据 -->
     <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_TIME "pointDate",
+               TWR.RESULT_GROSS_WEIGHT     "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join RMS_TRUCK_CALCULATE RTC
             on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
@@ -216,7 +217,8 @@
 <!--  通过总实绩ID和路段顺序号查询计皮实绩数据  -->
     <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_TIME "pointDate",
+               TWR.RESULT_TARE_WEIGHT       "weight"
         from TMSTRUCK_WEIGHT_RESULT TWR
                  left join RMS_TRUCK_CALCULATE RTC
                            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID