内转厂内 内转老区-轨道衡 2021年11月28日17:27:20

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

@@ -62,8 +62,10 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
+                                          Integer orderType,
                                           String con
     ){
+        mapValue.put("orderTypee", orderType);
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){
@@ -77,6 +79,7 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
         if(mapValue.size() == 0){
             //将查询结果存入索引中
             allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
+            DataChange.dataTo2Number(allQualityResult, "resultDeduction");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_quality_list");

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

@@ -23,6 +23,9 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     //查询内转国产矿进口矿 进厂实绩
     List<Map<String, Object>> getImportedDomesticNzLoadResult(Map<String, Object> map);
 
+    //查询内转厂内物资进厂实绩
+    List<Map<String, Object>> getInFactoryMaterialEnFactoryResult(Map<String, Object> map);
+
     //查询所有内转进厂实绩
     List<Map<String, Object>> getAllInwardTurnEnFactoryResult(Map<String, Object> map);
 

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

@@ -36,6 +36,9 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     //查询内转国产矿进口矿出厂实绩
     List<Map<String, Object>> getImportedDomesticNzEnFactoryResult(Map<String, Object> map);
 
+    //查询内转厂内物资出厂实绩
+    List<Map<String, Object>> getInFactoryOutFactoryResult(Map<String, Object> map);
+
     //通过总实绩Id
     BigDecimal getResultIdByTotalId(Integer resultTotalId);
 

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

@@ -25,6 +25,9 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //查询内转进口矿/国产矿装车实绩
     List<Map<String, Object>> getImportedDomesticNzLoadResult(Map<String, Object> map);
 
+    //查询内转厂内物资装车实绩
+    List<Map<String, Object>> getInFactoryLoadResult(Map<String, Object> map);
+
     //查询最大ID值
     @Select("select seq_tmstruck_load_result.nextval from dual")
     BigDecimal selectMaxId();

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

@@ -26,5 +26,5 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
     List<Map<String,Object>>  selectQualityResultForConverted(Map<String,Object> map);
 
     //内转查询质检作业
-    List<Map<String, Object>> getInwardQualityResult(Integer orderType);
+    List<Map<String, Object>> getInwardQualityResult(Map<String, Object> map);
 }

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

@@ -27,5 +27,6 @@ public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceipt
     //查询内转钢材到异地库收货实绩
     List<Map<String, Object>> getSteelNzReceiptResult(Map<String, Object> map);
 
-    List<Map<String, Object>> getInwardReceipt(Integer orderType);
+    //获取内转收货实绩
+    List<Map<String, Object>> getInwardReceipt(Map<String, Object> map);
 }

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

@@ -14,9 +14,15 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
     //查询采购卸货实绩
     List<Map<String, Object>> getCGUnloadResult(Map<String, Object> map);
 
-    //查询内转采购进口矿国产矿实绩
+    //查询内转采购进口矿国产矿卸货实绩
     List<Map<String, Object>> getImportedDomesticNzUnloadResult(Map<String, Object> map);
 
+    //查询内转采购进口矿国产矿卸货实绩(老区-厂内)
+    List<Map<String, Object>> getImportedDomesticNzUnload2Result(Map<String, Object> map);
+
+    //查询内转厂内卸货实绩
+    List<Map<String, Object>> getInFactoryUnloadResult(Map<String, Object> map);
+
     //查询最大ID值
     @Select("select seq_tmstruck_unload_result.nextval from dual")
     BigDecimal selectMaxId();

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

@@ -62,6 +62,9 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //查询国产矿进口矿计毛实绩(老区-厂内)
     List<Map<String, Object>> getImportedDomesticNzJiMao2Result(Map<String, Object> map);
 
+    //查询内转厂内物资计量实绩
+    List<Map<String, Object>> getInFactoryJiLiangResult(Map<String, Object> map);
+
     //查询订单下所有的物资件数和物资理重
     List<Map<String, Object>> getMaterialMes(Integer orderId);
 

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

@@ -107,7 +107,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10:
                 break;
             case 11:
-
+                return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
 
         }
         return null;

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

@@ -122,6 +122,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 10:
                 break;
             case 11:
+                return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
         }
         return null;
     }

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

@@ -82,11 +82,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 8:
                 return tmstruckLoadResultMapper.getCGJKLoadResult(map); // apiId = 91
             case 9:
-                return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 10:
-
-                break;
+                return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
+                return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
         }
         return null;
     }

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

@@ -31,12 +31,14 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
 
     /**
      * 查询所有的质检作业
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
     @Override
     public List<Map<String, Object>> getQualityResult(Map<String, Object> map) {
-        Integer orderType = (Integer)map.get("orderType");
+        Integer orderType = (Integer)map.get("orderTypee");
         switch (orderType){
             case 1:
                 break;
@@ -50,11 +52,10 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
             case 6:
             case 7:
             case 8:
-                return tmstruckQualityResultMapper.getQualityResult(map);
+                return tmstruckQualityResultMapper.getQualityResult(map); //apiId:150
             case 9:
-                return tmstruckQualityResultMapper.getInwardQualityResult(orderType);
             case 10:
-                return tmstruckQualityResultMapper.getInwardQualityResult(orderType);
+                return tmstruckQualityResultMapper.getInwardQualityResult(map); //apiId:150
             case 11:
                 break;
 

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

@@ -54,10 +54,8 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
             case 8:
                 return tmstruckReceiptResultMapper.getCGReceiptResult(map); //apiId: 107
             case 9:
-                break;
             case 10:
-
-                break;
+                return tmstruckReceiptResultMapper.getInwardReceipt(map); //apiId: 107
             case 11:
 
         }

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

@@ -108,15 +108,13 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 9:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnloadResult(map); //apiId:355
             case 10:
-
-                break;
+                return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
-
+                return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
         }
         return null;
     }
 
-
     /**
      * 更新卸货实绩内容 扫码人员扫码后获取信息传输数据给接口
      * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；

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

@@ -90,7 +90,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 10:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
-
+                return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
         }
         return null;
     }

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

@@ -1067,4 +1067,104 @@
         </where>
         <include refid="orderByEnterTime"></include>
     </select>
+
+<!--    查询内转厂内物资进厂实绩  -->
+    <select id="getInFactoryMaterialEnFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select TER.RESULT_ID "resultId",
+        RM.MATERIAL_NAME "materialName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RG.GATEPOST_NAME "gatepostName",
+        TER.RESULT_ENTRY_MODE "resultEntryMode",
+        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        RW1.WAREHOUSE_NAME "loadingName",
+        RW2.WAREHOUSE_NAME "unloadingName"
+
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+        ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = TLR.LOADING_ID
+        LEFT JOIN RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join RMS_DRIVER_CAPACITY RDC
+        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = RDC.CAPACITY_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 = 11
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadingName != null">
+                and
+                <foreach collection="loadingName" item="item" open="(" separator="or" close=")">
+                    "loadingName" 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="unloadingName != null">
+                and
+                <foreach collection="unloadingName" item="item" open="(" separator="or" close=")">
+                    "unloadingName" 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="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadingName != null">
+                and
+                <foreach collection="loadingName" item="item" open="(" separator="or" close=")">
+                    "loadingName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultEntryGateTime != null">
+                and
+                <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
+                    "resultEntryGateTime" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByEnterTime"></include>
+
+    </select>
 </mapper>

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

@@ -983,4 +983,70 @@
         </where>
         <include refid="orderByOutTime"></include>
     </select>
+
+<!--    查询内转厂内物资出厂实绩  -->
+    <select id="getInFactoryOutFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select TLFR.RESULT_ID                     "resultId",
+                    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 RMS_DRIVER_CAPACITY RDC
+        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = RDC.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 = 11
+        )
+        <where>
+            <if test="orderNumber != null">
+                <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="gatepostName != null">
+                and
+                <foreach collection="gatepostName" item="item" open="(" separator="or" close=")">
+                    "gatepostName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultOutMode != null">
+                and
+                <foreach collection="resultOutMode" item="item" open="(" separator="or" close=")">
+                    "resultOutMode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultOutGateTime != null">
+                and
+                <foreach collection="resultOutGateTime" item="item" open="(" separator="or" close=")">
+                    "resultOutGateTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultTruckSnapshotPicture != null">
+                and
+                <foreach collection="resultTruckSnapshotPicture" item="item" open="(" separator="or" close=")">
+                    "resultTruckSnapshotPicture" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByOutTime"></include>
+    </select>
 </mapper>

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

@@ -1291,7 +1291,7 @@
                                     ON RC.CAPACITY_ID = RDC.CAPACITY_ID
                           LEFT JOIN RMS_WAREHOUSE RW
                                     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-                 WHERE OO.ORDER_TYPE = 9
+                 WHERE OO.ORDER_TYPE = #{orderTypee}
                    AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
              )
         <where>
@@ -1349,4 +1349,91 @@
         </if>
     </select>
 
+<!--  查询内转厂内物资装车实绩  -->
+    <select id="getInFactoryLoadResult" parameterType="java.util.Map" resultType="java.util.Map">
+
+        SELECT *
+        FROM (
+                 SELECT RM.MATERIAL_NAME           "materialName",
+                        OO.ORDER_NUMBER            "orderNumber",
+                        RC.CAPACITY_NUMBER         "capacityNumber",
+                        OOM.ORDER_MATERIAL_NUMBER  "orderMaterialNumber",
+                        TLR.RESULT_LOAD_START_TIME "resultLoadStartTime",
+                        TLR.RESULT_LOAD_END_TIME   "resultLoadEndTime",
+                        TLR.RESULT_LOAD_DURATION   "resultLoadDuration",
+                        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 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_DRIVER_CAPACITY RDC
+                                    ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                          LEFT JOIN RMS_CAPACITY RC
+                                    ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                          LEFT JOIN RMS_WAREHOUSE RW
+                                    ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+                 WHERE OO.ORDER_TYPE = 11
+                   AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        )
+        <where>
+            <if test="resultLoadEndTime != null">
+                <foreach collection="resultLoadEndTime" item="item" open="(" separator="or" close=")">
+                    "resultLoadEndTime" 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="resultLoadDuration != null">
+                and
+                <foreach collection="resultLoadDuration" item="item" open="(" separator="or" close=")">
+                    "resultLoadDuration" 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="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultLoadStartTime != null">
+                and
+                <foreach collection="resultLoadStartTime" item="item" open="(" separator="or" close=")">
+                    "resultLoadStartTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "resultLoadStartTime" desc
+        </if>
+
+    </select>
+
 </mapper>

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

@@ -528,19 +528,22 @@
     where RESULT_ID = #{resultId}
   </select>
 
-  <select id="getInwardQualityResult" resultType="java.util.LinkedHashMap">
-    select TQR.RESULT_ID                    "resultId",
-    APO.PURCHASE_ORDER_NO            "purchaseOrderNo",
-    RM.MATERIAL_NAME                 "materialName",
-    DB.RESULT_FOREIGN_SHIP_NAME      "resultForeignShipName",
-    OO.ORDER_NUMBER                  "orderNumber",
-    TWR.RESULT_POUND_NO              "resultPoundNo",
-    RC.CAPACITY_NUMBER               "capacityNumber",
-    TQR.RESULT_ISSAMPLING            "resultIssampling",
-    TQR.RESULT_DEDUCTION             "resultDeduction",
-    TQR.RESULT_DEDUCTION_DESCRIPTION "resultDeductionDescription",
-    RW.WAREHOUSE_NAME                "warehouseName",
-    TQR.INSERT_TIME                  "insertTime"
+  <select id="getInwardQualityResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    select
+    *
+    from(
+    select TQR.RESULT_ID "resultId",
+            APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+            RM.MATERIAL_NAME "materialName",
+            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+            OO.ORDER_NUMBER "orderNumber",
+            TWR.RESULT_POUND_NO "resultPoundNo",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            TQR.RESULT_ISSAMPLING "resultIssampling",
+            TQR.RESULT_DEDUCTION "resultDeduction",
+            TQR.RESULT_DEDUCTION_DESCRIPTION "resultDeductionDescription",
+            RW.WAREHOUSE_NAME "warehouseName",
+            TQR.INSERT_TIME "insertTime"
     from TMSTRUCK_QUALITY_RESULT TQR
     left join rms_warehouse rw
     on rw.warehouse_id = tqr.result_sampling_point_id
@@ -566,7 +569,8 @@
     on db.batch_id = apo.batch_id
     left join rms_material rm
     on rm.material_id = db.material_id
-    where oo.order_type = #{orderType}
+    where oo.order_type = #{orderTypee}
+    )
     <where>
       <if test="purchaseOrderNo != null">
         <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">

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

@@ -611,43 +611,108 @@
       <include refid="orderBy"></include>
     </select>
 
-  <select id="getInwardReceipt" resultType="java.util.Map">
-    select TRR.RESULT_ID               "resultId",
-           APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-           RM.MATERIAL_NAME            "materialName",
-           OO.ORDER_NUMBER             "orderNumber",
-           RC.CAPACITY_NUMBER          "capacityNumber",
-           DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-           TUR.UNLOAD_STATUS           "unloadStatus",
-           TWR.RESULT_NET_WEIGHT       "resultNetWeight",
-           tqr.result_issampling       "Issampling",
-           TRR.INSERT_USERNAME         "insertUsername",
-           TRR.INSERT_TIME             "insertTime"
-    from TMSTRUCK_RECEIPT_RESULT TRR
-           left join TMSTRUCK_TOTAL_RESULT TTR
-                     on TTR.RESULT_TOTAL_ID = TRR.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 RMS_DRIVER_CAPACITY RDC
-                     on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-           left join RMS_CAPACITY RC
-                     on RC.CAPACITY_ID = RDC.CAPACITY_ID
-           left join TMSTRUCK_WEIGHT_RESULT TWR
-                     on TWR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
-           left join TMSTRUCK_UNLOAD_RESULT TUR
-                     on TUR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
-           left join OMSTRUCK_ORDER_MATERIAL OOM
-                     on OOM.ORDER_ID = OO.ORDER_ID
-           left join RMS_MATERIAL RM
-                     on OOM.MATERIAL_ID = RM.MATERIAL_ID
-           left join tmstruck_quality_result tqr
-                     on tqr.total_result_id = ttr.result_total_id
-    where TRR.STATUS = 1
-      and OO.ORDER_TYPE = #{orderType}
+  <select id="getInwardReceipt" parameterType="java.util.Map" resultType="java.util.Map">
 
+    select *
+    from (
+           select TRR.RESULT_ID               "resultId",
+                  APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+                  RM.MATERIAL_NAME            "materialName",
+                  OO.ORDER_NUMBER             "orderNumber",
+                  RC.CAPACITY_NUMBER          "capacityNumber",
+                  DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+                  TUR.UNLOAD_STATUS           "unloadStatus",
+                  TWR.RESULT_NET_WEIGHT       "resultNetWeight",
+                  tqr.result_issampling       "issampling",
+                  TRR.INSERT_USERNAME         "insertUsername",
+                  TRR.INSERT_TIME             "insertTime"
+           from TMSTRUCK_RECEIPT_RESULT TRR
+                  left join TMSTRUCK_TOTAL_RESULT TTR
+                            on TTR.RESULT_TOTAL_ID = TRR.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 RMS_DRIVER_CAPACITY RDC
+                            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                  left join RMS_CAPACITY RC
+                            on RC.CAPACITY_ID = RDC.CAPACITY_ID
+                  left join TMSTRUCK_WEIGHT_RESULT TWR
+                            on TWR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+                  left join TMSTRUCK_UNLOAD_RESULT TUR
+                            on TUR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+                  left join OMSTRUCK_ORDER_MATERIAL OOM
+                            on OOM.ORDER_ID = OO.ORDER_ID
+                  left join RMS_MATERIAL RM
+                            on OOM.MATERIAL_ID = RM.MATERIAL_ID
+                  left join tmstruck_quality_result tqr
+                            on tqr.total_result_id = ttr.result_total_id
+           where TRR.STATUS = 1
+             and OO.ORDER_TYPE = #{orderTypee}
+         )
+    <where>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="purchaseOrderNo != null">
+        and
+        <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+          "purchaseOrderNo" 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="resultForeignShipName != null">
+        and
+        <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+          "resultForeignShipName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="unloadStatus != null">
+        and
+        <foreach collection="unloadStatus" item="item" open="(" separator="or" close=")">
+          "unloadStatus" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultNetWeight != null">
+        and
+        <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+          "resultNetWeight" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="issampling != null">
+        and
+        <foreach collection="issampling" item="item" open="(" separator="or" close=")">
+          "issampling" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="insertUsername != null">
+        and
+        <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+          "insertUsername" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="insertTime != null">
+        and
+        <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+          "insertTime" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy"></include>
   </select>
 </mapper>

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

@@ -488,7 +488,7 @@
             </if>
         </if>
         <if test="orderField == null  ">
-            order by "insertTime" desc
+            order by "resultStartTime" desc
         </if>
     </sql>
 
@@ -717,4 +717,160 @@
         <include refid="orderBy"></include>
     </select>
 
+<!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
+    <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
+
+        SELECT *
+        FROM (
+                 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"
+                 FROM TMSTRUCK_UNLOAD_RESULT TUR
+                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                          LEFT JOIN OMSTRUCK_ORDER OO
+                                    ON OO.ORDER_ID = TTR.ORDER_ID
+                          LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                                    ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                          LEFT JOIN RMS_CAPACITY RC
+                                    ON RC.CAPACITY_ID = RDC.CAPACITY_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 TMSTRUCK_WEIGHT_RESULT TWR
+                                    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>
+            <if test="orderNumber != null">
+                <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="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultNetWeight != null">
+                and
+                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                    "resultNetWeight" 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="resultStartTime != null">
+                and
+                <foreach collection="resultStartTime" item="item" open="(" separator="or" close=")">
+                    "resultStartTime" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+<!--  查询内转厂内卸货实绩  -->
+    <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
+
+        SELECT *
+        FROM (
+                 SELECT TUR.RESULT_ID             "resultId",
+                        OO.ORDER_NUMBER           "orderNumber",
+                        RC.CAPACITY_NUMBER        "capacityNumber",
+                        RM.MATERIAL_NAME          "materialName",
+                        OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+                        TUR.RESULT_START_TIME     "resultStartTime",
+                        TUR.RESULT_END_TIME       "resultEndTime",
+                        TUR.RESULT_DURATION       "resultDuration",
+                        RW.WAREHOUSE_NAME         "warehouseName"
+                 FROM TMSTRUCK_UNLOAD_RESULT TUR
+                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                    ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                          LEFT JOIN OMSTRUCK_ORDER OO
+                                    ON OO.ORDER_ID = TTR.ORDER_ID
+                          LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                                    ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                          LEFT JOIN RMS_CAPACITY RC
+                                    ON RC.CAPACITY_ID = RDC.CAPACITY_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_WAREHOUSE RW
+                                    ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                 WHERE TUR.RESULT_START_TIME IS NOT NULL
+                   AND OO.ORDER_TYPE = 11
+             )
+        <where>
+            <if test="orderNumber != null">
+                <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="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialNumber != null">
+                and
+                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
+                    "orderMaterialNumber" 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="resultStartTime != null">
+                and
+                <foreach collection="resultStartTime" item="item" open="(" separator="or" close=")">
+                    "resultStartTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultEndTime != null">
+                and
+                <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
+                    "resultEndTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultDuration != null">
+                and
+                <foreach collection="resultDuration" item="item" open="(" separator="or" close=")">
+                    "resultDuration" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
 </mapper>

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

@@ -2051,4 +2051,105 @@
         </if>
     </select>
 
+<!--    查询内转厂内物资计量实绩 -->
+    <select id="getInFactoryJiLiangResult" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+                 select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+                        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",
+                        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
+                        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
+                        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
+                        TWR.RESULT_POUND_NO          "resultPoundNo",
+                        TWR.INSERT_UPDATE_REMARK      "insertUpdateRemark"
+                 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 RMS_DRIVER_CAPACITY RDC
+                                    on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                          left join RMS_CAPACITY RC
+                                    on RC.CAPACITY_ID = RDC.CAPACITY_ID
+                          left join RMS_TRUCK_CALCULATE RTC
+                                    on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_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
+                 where RESULT_TARE_WEIGHT_TIME is not null
+                   and OO.ORDER_TYPE = 11
+             )
+        <where>
+        <if test="materialName != null">
+            <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                "materialName" 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="truckCalculateNumber != null">
+            and
+            <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
+                "truckCalculateNumber" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultGrossWeight != null">
+            and
+            <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
+                "resultGrossWeight" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultGrossWeightTime != null">
+            and
+            <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
+                "resultGrossWeightTime" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultTareWeight != null">
+            and
+            <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
+                "resultTareWeight" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultPoundNo != null">
+            and
+            <foreach collection="resultPoundNo" item="item" open="(" separator="or" close=")">
+                "resultPoundNo" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultTareWeightTime != null">
+            and
+            <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
+                "resultTareWeightTime" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="resultNetWeight != null">
+            and
+            <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                "resultNetWeight" like '%${item}%'
+            </foreach>
+        </if>
+    </where>
+    <include refid="orderBy"></include>
+    <if test="orderField == null  ">
+        order by "resultTareWeightTime" desc
+    </if>
+    </select>
+
 </mapper>