修改内转钢材到异地库

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

@@ -498,8 +498,8 @@
                                    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpa",
                                    OTO.ORDER_NO                                   "orderNum",
                                    TWR.RESULT_NET_WEIGHT                          "materialWeight",
-                                   to_date(OTO.OUTSTATION_TIME,'yyyy-mm-dd')                            "OutStation",
-                                   to_date(OTO.ENSTATION_TIME,'yyyy-mm-dd')                             "EnStation",
+                                   to_char(OTO.OUTSTATION_TIME,'yyyy-mm-dd')      "OutStation",
+                                   to_char(OTO.ENSTATION_TIME,'yyyy-mm-dd')       "EnStation",
                                    OTO.ORDER_WAGON_NO                             "wagonNo",
                                    OTO.ORDER_WAGON_WEIGHT                         "wagonWeight",
                                    OTO.BILLING_WEIGHT                             "wagonBillWeight",
@@ -507,7 +507,9 @@
                                    RAR.ARRIVAL_NAME                               "sendStation",
                                    ASO.SALE_REMARK                                "orderType",
                                    OTO.ORDER_ID                                    "trainOrderId",
-                                   RPG.GRID_ID                                      "gridId"
+                                   RPG.GRID_ID                                      "gridId",
+                                   decode(wgm.DELETED,0,'入库',1,'出库','未入库')      "wgmDelete",
+                                   R_CAPACITY.CAPACITY_NUMBER                       "capacityNum"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR ON RAR.ARRIVAL_ID = TPAR.SEND_STATION_ID
@@ -522,12 +524,15 @@
                           LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
                           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASM.MATERIAL_ID
                           LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          LEFT JOIN RMS_CAPACITY   R_CAPACITY ON  R_CAPACITY.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTT_ORDER TTO ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                           LEFT JOIN OMSTRAIN_ORDER OTO ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                           LEFT JOIN RMS_PWAREHOUSE_GRID RPG ON RPG.STACKING_ID = OO.ORDER_ID
+                          LEFT JOIN WMSP_GRID_MATERIAL  WGM ON WGM.GRID_ID = RPG.GRID_ID
+                                    and wgm.MATERIAL_ID = rm.MATERIAL_ID
                           WHERE ASO.SALE_TYPE = 4
 <!--                          <if test="oneDate != null">-->
 <!--                            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = RPG.INSERT_TIME-->

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

@@ -893,11 +893,13 @@
           and TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'YYYY-MM-DD hh24:mi:ss') >= TO_CHAR(SYSDATE - 1, 'YYYY-MM-DD hh24:mi:ss')
     </select>
     <select id="getWeightTask" resultType="java.math.BigDecimal" parameterType="decimal">
-        SELECT twr.RESULT_TARE_WEIGHT FROM TMSTRUCK_WEIGHT_RESULT TWR
+        SELECT * FROM (SELECT twr.RESULT_TARE_WEIGHT FROM TMSTRUCK_WEIGHT_RESULT TWR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_ID = TTR.ORDER_ID
         WHERE OO.ORDER_ID = #{orderId}
+        ORDER BY TWR.RESULT_TARE_WEIGHT DESC)
+        WHERE ROWNUM = 1
     </select>
 </mapper>