修改Buug

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/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1619,8 +1619,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
                 break;
             case 12:
-                mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
-
+                mesMap = omstruckOrderMapper.getSporadicOrder(orderId);
+                break;
+            case 13:
+                mesMap = omstruckOrderMapper.getLxOutFactoryOrder(orderId);
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

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

@@ -2748,18 +2748,27 @@
           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"
+                OO.ORDER_TYPE      "orderType",
+                RS.SUPPLIER_NAME "consigneeCompanyName",
+                RC2.CONSIGNEE_COMPANY_NAME "receiveAddressName"
+
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 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_SUPPLIER RS
+                           ON RS.SUPPLIER_ID=ASO.RECEIVE_UNIT_ID
+                 LEFT JOIN RMS_CONSIGNEE RC2
+                           ON RC2.CONSIGNEE_ID=ASO.SEND_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-->
@@ -2883,4 +2892,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>