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

src/main/java/com/steerinfo/dil/controller/TmstruckLoadResultController.java

@@ -373,10 +373,9 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                         Integer pageSize,
                                         Integer orderType,
                                         Integer orderStatus){
-        if(mapval == null){
-            mapval.put("orderType",orderType);
-            mapval.put("orderStatus",orderStatus);
-        }
+
+        mapval.put("orderType",orderType);
+        mapval.put("orderStatus",orderStatus);
         //不分页筛选数据
         List<Map<String, Object>> LoadingResult = tmstruckLoadResultService.getCgNzLoadingResult(mapval);
         PageHelper.startPage(pageNum,pageSize);

src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java

@@ -130,7 +130,8 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer orderType,String con
+                                           Integer orderType,
+                                           String con
     ){
 
         mapValue.put("orderTypee", orderType);

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

@@ -60,4 +60,9 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
 //    通过运输订单获取零星物资进厂实绩
     List<Map<String, Object>> getSporadicSuppliesEnFactoryResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getCGNZEnFactory(Map<String, Object> map);
+
+    List<Map<String, Object>> getCgNzOutFactory(Map<String, Object> map);
+
 }

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

@@ -108,6 +108,6 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //根据运输id查询所有的零星物资出厂实绩
     List<Map<String, Object>> getSporadicSuppliesLoadResult(Map<String, Object> map);
 
-    List<Map<String, Object>> getCgNzLoadingResult();
+    List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object>mapVal);
 
 }

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

@@ -112,7 +112,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
-                break;
+                return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map);
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:

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

@@ -126,7 +126,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 9:
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
-                break;
+                return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:

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

@@ -566,6 +566,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     @Override
     public List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval) {
-        return tmstruckLoadResultMapper.getCgNzLoadingResult();
+        return tmstruckLoadResultMapper.getCgNzLoadingResult(mapval);
     }
 }

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

@@ -83,7 +83,12 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
-        Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        Integer receiveId = 0 ;
+        if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 10){
+            receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        }else{
+            receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        }
         if(receiveId == 1){
             //发送委托给达州钢铁
             i += sendMeasureCommissionMes(map);
@@ -174,6 +179,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 3:
                 break;
             case 10:
+                break;
             case 11:
             case 4:
 

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

@@ -1289,5 +1289,142 @@
         </where>
         <include refid="orderByEnterTime"></include>
     </select>
+    <select id="getCGNZEnFactory" resultType="java.util.Map" parameterType="map">
+        select TER.RESULT_ID               "resultId",
+       APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+       RM.MATERIAL_NAME            "materialName",
+       DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+       OO.ORDER_NUMBER             "orderNumber",
+       RC.CAPACITY_NUMBER          "capacityNumber",
+       RG.GATEPOST_NAME            "gatepostName",
+       TER.RESULT_ENTRY_MODE       "resultEntryMode",
+       TER.RESULT_ENTRY_GATE_TIME  "resultEntryGateTime",
+       RS.SUPPLIER_NAME            "supplierName",
+       OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
+       TER.INSERT_TIME             "insertTime",
+       RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+  from TMSTRUCK_ENFACTORY_RESULT TER
+  left join TMSTRUCK_TOTAL_RESULT TTR
+    on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+  left join OMSTRUCK_ORDER OO
+    on TTR.ORDER_ID = OO.ORDER_ID
+  left join amstruck_inward_plan aip
+    on aip.plan_id = oo.order_plan_id
+  left join amstruck_requirement_plan arp
+    on arp.plan_id = aip.plan_id
+  left join amstruck_inward_requirement air
+    on air.requirement_id = arp.requirement_id
+  left join AMS_PURCHASE_ORDER APO
+    on apo.purchase_order_id = air.purchase_order_id
+  left join DIL_BATCH DB
+    on DB.BATCH_ID = APO.BATCH_ID
+  left join RMS_CAPACITY RC
+    on RC.CAPACITY_ID = OO.CAPACITY_ID
+  left join RMS_SUPPLIER RS
+    on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+  left join RMS_CONSIGNEE RCON
+    on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+  left join OMSTRUCK_ORDER_MATERIAL OOM
+    on OOM.ORDER_ID = OO.ORDER_ID
+  left join RMS_MATERIAL RM
+    on RM.MATERIAL_ID = OOM.MATERIAL_ID
+  left join RMS_GATEPOST RG
+    on RG.GATEPOST_ID = TER.GATEPOST_ID
+ where TER.RESULT_ENTRY_GATE_TIME is not null
+   and OO.ORDER_TYPE = 10
+        <where>
+            <if test="purchaseOrderId != null">
+                <foreach collection="purchaseOrderId" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderId" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                and
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultEntryMode != null">
+                and
+                <foreach collection="resultEntryMode" item="item" open="(" separator="or" close=")">
+                    "resultEntryMode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByEnterTime"></include>
+    </select>
+    <select id="getCgNzOutFactory" resultType="java.util.Map">
+        select TLFR.RESULT_ID                     "resultId",
+       APO.PURCHASE_ORDER_NO              "purchaseOrderNo",
+       RM.MATERIAL_NAME                   "materialName",
+       DB.RESULT_FOREIGN_SHIP_NAME        "resultForeignShipName",
+       OO.ORDER_NUMBER                    "orderNumber",
+       RC.CAPACITY_NUMBER                 "capacityNumber",
+       RG.GATEPOST_NAME                   "gatepostName",
+       TLFR.RESULT_OUT_MODE               "resultOutMode",
+       TLFR.RESULT_OUT_GATE_TIME          "resultOutGateTime",
+       TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
+  from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+  left join TMSTRUCK_TOTAL_RESULT TTR
+    on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+  left join OMSTRUCK_ORDER OO
+    on OO.ORDER_ID = TTR.ORDER_ID
+  left join amstruck_inward_plan aip
+    on aip.plan_id = oo.order_plan_id
+  left join amstruck_requirement_plan arp
+    on arp.plan_id = aip.plan_id
+  left join amstruck_inward_requirement air
+    on air.requirement_id = arp.requirement_id
+  left join AMS_PURCHASE_ORDER APO
+    on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+  left join DIL_BATCH DB
+    on DB.BATCH_ID = APO.BATCH_ID
+  left join OMSTRUCK_ORDER_MATERIAL OOM
+    on OOM.ORDER_ID = OO.ORDER_ID
+  left join RMS_MATERIAL RM
+    on RM.MATERIAL_ID = OOM.MATERIAL_ID
+  left join RMS_CAPACITY RC
+    on RC.CAPACITY_ID = OO.CAPACITY_ID
+  left join RMS_GATEPOST RG
+    on RG.GATEPOST_ID = TLFR.GATEPOST_ID
+ where RESULT_OUT_GATE_TIME is not null
+   and OO.ORDER_TYPE = 10
+    </select>
 
 </mapper>

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

@@ -1302,33 +1302,39 @@
         SELECT
                *
         FROM (
-                 SELECT APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-                        RM.MATERIAL_NAME            "materialName",
-                        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-                        OO.ORDER_NUMBER             "orderNumber",
-                        RC.CAPACITY_NUMBER          "capacityNumber",
-                        OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
-                        TLR.RESULT_LOAD_START_TIME  "resultLoadStartTime",
-                        RW.WAREHOUSE_NAME           "warehouseName"
-                 FROM TMSTRUCK_LOAD_RESULT TLR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN AMS_PURCHASE_ORDER APO
-                                    ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                          LEFT JOIN DIL_BATCH DB
-                                    ON DB.BATCH_ID = APO.BATCH_ID
-                          LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                                    ON OOM.ORDER_ID = OO.ORDER_ID
-                          LEFT JOIN RMS_MATERIAL RM
-                                    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-                 WHERE OO.ORDER_TYPE = #{orderTypee}
-                   AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        SELECT APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+        RM.MATERIAL_NAME            "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        OO.ORDER_NUMBER             "orderNumber",
+        RC.CAPACITY_NUMBER          "capacityNumber",
+        OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
+        TLR.RESULT_LOAD_START_TIME  "resultLoadStartTime",
+        RW.WAREHOUSE_NAME           "warehouseName"
+        FROM TMSTRUCK_LOAD_RESULT TLR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+        WHERE OO.ORDER_TYPE =#{orderTypee}
+        AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
              )
         <where>
             <if test="purchaseOrderNo != null">
@@ -1543,7 +1549,7 @@
             order by "resultLoadStartTime" desc
         </if>
     </select>
-    <select id="getCgNzLoadingResult" resultType="java.util.Map" parameterType="map">
+    <select id="getCgNzLoadingResult" resultType="java.util.Map" parameterType="java.lang.Integer">
           select *from ( select OO.ORDER_NUMBER              "orderNumber",
                        OOM.ORDER_MATERIAL_WEIGHT    "orderMaterialWeight",
                        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",

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

@@ -761,17 +761,15 @@
 
     <!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
     <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
-
         SELECT *
         FROM (
-        SELECT
-        TUR.RESULT_ID          "resultId",
+        SELECT TUR.RESULT_ID         "resultId",
         OO.ORDER_NUMBER       "orderNumber",
         RC.CAPACITY_NUMBER    "capacityNumber",
         RM.MATERIAL_NAME      "materialName",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         RW.WAREHOUSE_NAME     "warehouseName",
-        TUR.RESULT_START_TIME "resultStartTime"
+        TUR.RESULT_END_TIME "resultEndTime"
         FROM TMSTRUCK_UNLOAD_RESULT TUR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
@@ -787,7 +785,8 @@
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
+        WHERE TUR.RESULT_END_TIME IS NOT NULL
+        AND OO.ORDER_TYPE = 10
         )
         <where>
             <if test="orderNumber != null">
@@ -819,10 +818,10 @@
                     "warehouseName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultStartTime != null">
+            <if test="resultEndTime != null">
                 and
-                <foreach collection="resultStartTime" item="item" open="(" separator="or" close=")">
-                    "resultStartTime" like '%${item}%'
+                <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
+                    "resultEndTime" like '%${item}%'
                 </foreach>
             </if>
         </where>

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

@@ -1854,26 +1854,32 @@
     <select id="getImportedDomesticNzJiPi2Result" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
+        RM.MATERIAL_NAME             "materialName",
+        OO.ORDER_NUMBER              "orderNumber",
+        RC.CAPACITY_NUMBER           "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
-        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-        TWR.RESULT_POUND_NO "resultPoundNo"
+        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
+        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
+        TWR.RESULT_POUND_NO          "resultPoundNo"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
         left join AMS_PURCHASE_ORDER APO
-        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        on APO.PURCHASE_ORDER_ID = air.purchase_order_id
         left join DIL_BATCH DB
         on DB.BATCH_ID = APO.BATCH_ID
         left join RMS_CAPACITY RC
@@ -1970,22 +1976,28 @@
     <select id="getImportedDomesticNzJiMao2Result" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
+        RM.MATERIAL_NAME             "materialName",
+        OO.ORDER_NUMBER              "orderNumber",
+        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
+        RC.CAPACITY_NUMBER           "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        RS.SUPPLIER_NAME "supplierName",
-        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        RS.SUPPLIER_NAME             "supplierName",
+        rsr.shipper_name             "consigneeCompanyName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
         left join AMS_PURCHASE_ORDER APO
         on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
         left join DIL_BATCH DB
@@ -2000,8 +2012,8 @@
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-        left join RMS_CONSIGNEE RCON
-        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        left join rms_shipper rsr
+        on rsr.shipper_id = APO.RECEIVE_UNIT_ID
         where RESULT_GROSS_WEIGHT_TIME is not null
         and OO.ORDER_TYPE = 10
         )