zx 3 年之前
父節點
當前提交
9ba9235b79

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1964,7 +1964,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 21:
-                mesMap = omstruckOrderMapper.getInwardOrderMessage(map);
+                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
                 inwardType += "计时";
                 mesMap.put("inwardType", inwardType);
                 mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");

+ 1 - 2
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -3409,7 +3409,6 @@
             ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
             ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
             ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
-
             RM.MATERIAL_NAME "materialName"
         FROM
             OMSTRUCK_ORDER OO
@@ -3420,7 +3419,7 @@
                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
-            OO.ORDER_ID = #{orderId} and  TTTR.RESULT_TIME_TYPE = 3
+            OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>