修改

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

@@ -356,4 +356,5 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     // 通过运单下的物资信息
     int closeInwardOrderByPlan(BigDecimal bigDecimal);
 
+    Map<String, Object> getInwardSteelOrderMessageToApp(Map<String, Object> map);
 }

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

@@ -2023,8 +2023,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         String steelJudge = null;
         switch (orderType){
             case 1:
+                 mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                 steelJudge = "steel";
+                 break;
             case 4:
-                mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardSteelOrderMessageToApp(map);
                 steelJudge = "steel";
                 break;
             case 2:

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

@@ -4071,7 +4071,50 @@
         )
         ORDER BY "orderNumber" DESC
     </select>
-    
+    <select id="getInwardSteelOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus",
+        RAS.ARRIVAL_NAME "sendStaionName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR  ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+
     <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
         UPDATE OMSTRUCK_ORDER OO
         SET OO.ORDER_STATUS = 7