Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -256,7 +256,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
      * @throws Exception
      */
     public int steelOrderEnFactory(Map<String, Object> map, Map<String, Object> selectMap,BigDecimal resultTotalId) throws Exception{
-        if(!"OK".equals(selectMap.get("insertUpdateRemark"))){
+        if(!"OK".equals(selectMap.get("insertUpdateRemark")) && DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 1){
             throw new Exception("钢材科未确认进厂！");
         }
         //发送空委托

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

@@ -2280,7 +2280,9 @@
                            NVL( r_cap.capacity_id, 0 ) "capacityIds",
                             RDOINDEP.ORG_NAME "transInDep",
                            RDOOUTDEP.ORG_NAME "transOutDep",
-                           RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse"
+                           RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse",
+                           oo.ORDER_NUMBER  "orderNumber",
+                           TWR.RESULT_NET_WEIGHT    "netWeight"
                        FROM
                            AMS_SALE_ORDER ASO
                                LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
@@ -2289,7 +2291,7 @@
                                LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = ASM.MATERIAL_ID
                                LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
                                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
-                               LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                               LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS2.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
                                LEFT JOIN RMS_CONSIGNEE RC ON ASO.receive_id = RC.CONSIGNEE_ID
                                LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                                LEFT JOIN omstruck_order oo ON oo.order_plan_id = asom.sale_order_material_id
@@ -2299,6 +2301,9 @@
                                LEFT JOIN RMS_DEP_ORG RDOINDEP ON RDOINDEP.ORG_CODE = ASO.TRANSFER_IN_DEP
                                LEFT JOIN RMS_DEP_ORG RDOOUTDEP ON RDOOUTDEP.ORG_CODE = ASO.TRANSFER_OUT_DEP
                                LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
+                               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 = ASM.MATERIAL_ID
                        WHERE
                            ASO.SALE_TYPE = 4
                          AND ASO.DELETED = 0

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

@@ -761,7 +761,7 @@
       or RS.SHIPPER_NAME LIKE #{con}
     </if>
     <if test="userId!=null">
-      AND oo.INSERT_USERNAME LIKE #{userId}
+      AND AIR.INSERT_USERNAME LIKE #{userId}
     </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TTTR.INSERT_TIME