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

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

@@ -305,7 +305,7 @@ public class StatisticalReportController extends BaseRESTfulController {
     @ApiOperation(value="查询该组织机构下的销售统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "486", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -317,14 +317,20 @@ public class StatisticalReportController extends BaseRESTfulController {
                                          Integer pageSize,
                                          String startTime,
                                          String endTime,
-                                         String orgCode
+                                         String orgCode,
+                                         String isPage,
+                                          String index
     ){
-         if (orgCode!=null||!orgCode.equals("")){
+         if (orgCode!=null&&!"null".equals(orgCode)){
              mapValue.put("orgCode",orgCode);
-         }else {
-             return failed("抱歉,您还没有绑定组织,请联系自动化部");
          }
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if("yes".equals(isPage)){
+            return success(statisticalReportService.getSaleOrderList(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSaleOrderList(mapValue);
@@ -336,7 +342,7 @@ public class StatisticalReportController extends BaseRESTfulController {
     @ApiOperation(value="查询该组织机构下的采购统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "486", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
@@ -348,12 +354,18 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           Integer pageSize,
                                           String startTime,
                                           String endTime,
-                                          String orgCode
+                                          String orgCode,
+                                              String isPage,
+                                              String index
     ){
-        if (orgCode!=null||!orgCode.equals("")){
+        if (orgCode!=null&&!"null".equals(orgCode)){
             mapValue.put("orgCode",orgCode);
-        }else {
-            return failed("抱歉,您还没有绑定组织,请联系自动化部");
+        }
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if ("yes".equals(isPage)){
+            return success(statisticalReportService.getPurchaseOrderList(mapValue));
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
@@ -366,33 +378,74 @@ public class StatisticalReportController extends BaseRESTfulController {
     @ApiOperation(value="查询该组织机构下的内转统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "s", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getInwardList")
+    @PostMapping("/getPurchaseInwardList")
     public RESTfulResult getInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
                                               String startTime,
                                               String endTime,
-                                              String orgCode
+                                              String orgCode,
+                                               String isPage,
+                                             String index
     ){
-        if (orgCode!=null||!orgCode.equals("")){
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if (orgCode!=null&&!"null".equals(orgCode)){
             mapValue.put("orgCode",orgCode);
-        }else {
-            return failed("抱歉,您还没有绑定组织,请联系自动化部");
+        }
+        if ("yes".equals(isPage)){
+            return  success(statisticalReportService.getPurchaseInwardList(mapValue));
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
-        List<Map<String, Object>> report = statisticalReportService.getInwardList(mapValue);
+        List<Map<String, Object>> report = statisticalReportService.getPurchaseInwardList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
         return success(pageList);
     }
 
+    @ApiOperation(value="查询该组织机构下的内转统计报表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "s", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getInwardInFactory")
+    public RESTfulResult getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       String startTime,
+                                       String endTime,
+                                       String orgCode,
+                                       String isPage,
+                                       String index
+    ){
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if (orgCode!=null&&!"null".equals(orgCode)){
+            mapValue.put("orgCode",orgCode);
+        }
+        if ("yes".equals(isPage)){
+            return  success(statisticalReportService.getInwardInFactory(mapValue));
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getInwardInFactory(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
+        return success(pageList);
+    }
 
 
 

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

@@ -64,5 +64,9 @@ public interface StatisticalReportMapper {
     List<Map<String, Object>> getPurchaseOrderList(Map<String, Object> mapValue);
 
     //查看该组织架构下的内转统计报表
-    List<Map<String, Object>> getInwardList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getPurchaseInwardList(Map<String, Object> mapValue);
+
+
+    //查看该组织架构下的厂内内转统计报表
+    List<Map<String, Object>> getInwardInFactory(Map<String, Object> mapValue);
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -61,7 +61,11 @@ public interface IStatisticalReportService {
 
 
     //查询该组织机构下的内转统计报表
-    List<Map<String, Object>> getInwardList(Map<String, Object> mapValue);
+    List<Map<String, Object>> getPurchaseInwardList(Map<String, Object> mapValue);
+
+
+    //查看该组织机构下的纯内转统计报表
+    List<Map<String,Object>> getInwardInFactory(Map<String,Object> map);
 
 }
 

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

@@ -233,8 +233,15 @@ public class StatisticalReportImpl implements IStatisticalReportService {
 
     //查看该组织架构下的内转统计报表
     @Override
-    public List<Map<String, Object>> getInwardList(Map<String, Object> mapValue) {
-        return  statisticalReportMapper.getInwardList(mapValue);
+    public List<Map<String, Object>> getPurchaseInwardList(Map<String, Object> mapValue) {
+        return  statisticalReportMapper.getPurchaseInwardList(mapValue);
     }
 
+    //查看该组织架构下的内转统计报表
+    @Override
+    public List<Map<String, Object>> getInwardInFactory(Map<String, Object> mapValue) {
+        return  statisticalReportMapper.getInwardInFactory(mapValue);
+    }
+
+
 }

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

@@ -1814,6 +1814,7 @@
                           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_CAPACITY RC
@@ -1874,7 +1875,7 @@
     </select>
 <!--根据组织获取销售订单-->
     <select id="getSaleOrderList" resultType="java.util.Map" parameterType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
+        select DISTINCT OO.ORDER_NUMBER "orderNumber",
                RM.MATERIAL_NAME "materialName",
                RS.SHIPPER_NAME "sendName",
                RC.CONSIGNEE_COMPANY_NAME "reciveName",
@@ -1883,7 +1884,9 @@
                TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
                TWR.RESULT_TARE_WEIGHT "tareWeight",
                TWR.RESULT_GROSS_WEIGHT "grossWeight",
-               RC2.CAPACITY_NUMBER "capacityNumber"
+               RC2.CAPACITY_NUMBER "capacityNumber",
+               RL.LINE_NAME "lineName",
+               RC3.CARRIER_NAME "carrierName"
         from OMSTRUCK_ORDER OO
         left join AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1893,31 +1896,47 @@
         ON TTR.ORDER_ID=OO.ORDER_ID
         LEFT JOIN RMS_CAPACITY RC2
         ON RC2.CAPACITY_ID=OO.CAPACITY_ID
+        left join RMS_LINE RL
+        ON RL.LINE_ID=OO.LINE_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         left join TMSTRUCK_LOAD_RESULT TLR
         ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
-        LEFT JOIN AMS_SALE_ORDER ASO
+        JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_CARRIER ASOC
+        ON ASOC.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID=ASOC.CARRIER_ID
         left join RMS_SHIPPER RS
         ON ASO.SHIPPER_ID = RS.SHIPPER_ID
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID=ASO.RECEIVE_ID
-        where OO.OPTIONER_CODE = #{orgCode}
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
+        <where>
+        OO.ORDER_TYPE = 2
+        <if test="orgCode!=null">
+         AND   OO.OPTIONER_CODE = #{orgCode}
         </if>
+<!--        <if test="oneDate != null">-->
+<!--            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR.RESULT_GROSS_WEIGHT_TIME-->
+<!--        </if>-->
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>
+        <if test="index!=null">
+         and  (instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0) or   (instr( RS.SHIPPER_NAME, #{index}) > 0) or
+            (instr(RM.MATERIAL_NAME, #{index}) > 0) or   (instr(RC3.CARRIER_NAME, #{index}) > 0) or
+            (instr( RL.LINE_NAME, #{index}) > 0)
+        </if>
+        </where>
         ORDER BY OO.ORDER_NUMBER DESC
     </select>
-    <select id="getInwardList" resultType="java.util.Map" parameterType="java.util.Map">
+    <select id="getPurchaseInwardList" resultType="java.util.Map" parameterType="java.util.Map">
         select *
-        from (select oo.order_id                   "orderId",
+        from (select DISTINCT oo.order_id                   "orderId",
                      rm.material_name              "materialName",
                      rc.capacity_number            "capacityNumber",
                      rs.supplier_name              "sendName",
@@ -1928,10 +1947,14 @@
                      twr3.result_gross_weight_time "grossweightTime",
                      twr4.result_tare_weight       "tareWeight",
                      twr4.result_tare_weight_time  "tareWeightTime",
-                     twr4.result_net_weight        "resultNetWeight"
+                     twr4.result_net_weight        "resultNetWeight",
+                     RC.CARRIER_NAME "carrierName",
+                     RL.LINE_NAME "lineName"
                        from omstruck_order oo
                        left join omstruck_order_material oom
                        on oom.order_id = oo.order_id
+                       LEFT JOIN RMS_LINE RL
+                        ON RL.LINE_ID=OO.LINE_ID
                        left join rms_material rm
                        on rm.material_id = oom.material_id
                        left join rms_capacity rc
@@ -1940,6 +1963,8 @@
                        on aip.plan_id = oo.order_plan_id
                        left join amstruck_requirement_plan arp
                        on arp.plan_id = aip.plan_id
+                       left join RMS_CARRIER  rc
+                       on AIP.CARRIER_ID=rc.CARRIER_ID
                        left join amstruck_inward_requirement air
                        on air.requirement_id = arp.requirement_id
                        left join ams_purchase_order apo
@@ -1950,7 +1975,6 @@
                                  on rce.consignee_id = apo.receive_unit_id
                        left join tmstruck_total_result ttr
                                  on ttr.order_id = oo.order_id
-
                        left join tmstruck_weight_result twr1
                                  on twr1.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc1
@@ -1963,7 +1987,6 @@
                                  on twr2.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc2
                                  on rtc2.truck_calculate_id = twr2.result_gross_place_id
-
                        left join tmstruck_weight_result twr3
                                  on twr3.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc3
@@ -1971,25 +1994,38 @@
                        left join tmstruck_unload_result tur
                                  on tur.result_total_id = ttr.result_total_id
                        left join rms_warehouse rw2
-                                 on rw2.warehouse_id = tur.result_unload_place_id
+                        on rw2.warehouse_id = tur.result_unload_place_id
+                       LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
+                       ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                       LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER2
+                       ON TER2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                       LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR2
+                       ON TLFR2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                        left join tmstruck_weight_result twr4
-                                 on twr4.result_total_id = ttr.result_total_id
+                       on twr4.result_total_id = ttr.result_total_id
                        left join rms_truck_calculate rtc4
-                                 on rtc4.truck_calculate_id = twr4.result_tare_place_id
-              where oo.order_type in (10, 20)
-                and tlr.segment_sqe = 3
-                and twr2.gross_segment_sqe = 4
-                and twr3.gross_segment_sqe = 7
-                and tur.segment_sqe = 8
-                and twr4.tare_segment_sqe = 9
-                and twr2.result_gross_weight_time is not null
+                       on rtc4.truck_calculate_id = twr4.result_tare_place_id
+                   where TLFR1.SEGMENT_SQE = 5
+                   AND TER2.SEGMEN_SQE = 6
+                   AND TWR3.GROSS_SEGMENT_SQE = 7
+                   AND TUR.SEGMENT_SQE = 8
+                   AND TWR4.TARE_SEGMENT_SQE = 9
+                  AND TLFR2.SEGMENT_SQE = 10
+                  and oo.ORDER_TYPE in (10,20,15,16)
+        <if test="orgCode!=null">
                 and oo.OPTIONER_CODE =  #{orgCode}
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
         </if>
+       <if test="index!=null">
+           and  (instr(rs.supplier_name, #{index}) > 0) or  (instr(rm.material_name , #{index}) > 0)
+           or  (instr(rc.capacity_number , #{index}) > 0)   or  (instr(rce.consignee_company_name , #{index}) > 0)
+           or  (instr( RC.CARRIER_NAME , #{index}) > 0)  or     (instr(RL.LINE_NAME , #{index}) > 0)
+       </if>
+<!--        <if test="oneDate != null">-->
+<!--            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR4.RESULT_TARE_WEIGHT_TIME-->
+<!--        </if>-->
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TWR4.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TWR4.RESULT_TARE_WEIGHT_TIME
         </if>
              )
     </select>
@@ -2003,35 +2039,104 @@
                TWR.RESULT_TARE_WEIGHT "tareWeight",
                TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
                TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
-                TWR.RESULT_NET_WEIGHT "resultNetWeight"
+               TWR.RESULT_NET_WEIGHT "resultNetWeight",
+               RL.LINE_NAME "lineName",
+               RC3.CARRIER_NAME "carrierName"
+
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID
+        LEFT JOIN RMS_LINE RL
+        ON RL.LINE_ID=OO.LINE_ID
         LEFT JOIN RMS_CAPACITY RC
-        ON OO.CAPACITY_ID=OO.CAPACITY_ID
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID=OO.CARRIER_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID=APO.SUPPLIER_UNIT_ID
         LEFT JOIN RMS_CONSIGNEE RC2
-        ON RC2.CONSIGNEE_COMPANY_NAME =APO.RECEIVE_UNIT_ID
+        ON RC2.CONSIGNEE_ID =APO.RECEIVE_UNIT_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON  TTR.ORDER_ID=OO.ORDER_ID
         left join TMSTRUCK_LOAD_RESULT TLR
-         ON TTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+         ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
-         WHERE  OO.OPTIONER_CODE=#{orgCode}
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
-        </if>
+        <where>
+        OO.ORDER_TYPE IN (5,6,7,8,17,18)
+        <if test="orgCode!=null">
+        AND   OO.OPTIONER_CODE=#{orgCode}
+        </if>
+        <if test="index!=null">
+            and  (instr(RC.CAPACITY_NUMBER, #{index}) > 0) or  (instr(RS.SHIPPER_NAME, #{index}) > 0)
+            or (instr( RC2.CONSIGNEE_COMPANY_NAME, #{index}) > 0) or (instr( RC3.CARRIER_NAME, #{index}) > 0)
+            or (instr(RL.LINE_NAME, #{index}) > 0) or   (instr(RM.MATERIAL_NAME, #{index}) > 0)
+        </if>
+<!--        <if test="oneDate != null">-->
+<!--            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR.RESULT_TARE_WEIGHT_TIME-->
+<!--        </if>-->
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
         </if>
+        </where>
+    </select>
+<!--  查询厂内内转统计报表-->
+    <select id="getInwardInFactory" resultType="java.util.Map" parameterType="java.util.Map">
+        select * from (
+        select
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RW1.WAREHOUSE_NAME "reciveName",
+        RW2.WAREHOUSE_NAME "sendName",
+        RM.MATERIAL_NAME "materialName",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
+        TWR.RESULT_TARE_WEIGHT "tareWeight",
+        greatest(TWR.RESULT_TARE_WEIGHT_TIME,TWR.RESULT_GROSS_WEIGHT_TIME) "netWeightTime",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossweightTime",
+        TWR.RESULT_GROSS_WEIGHT "grossweight",
+        RL.LINE_NAME "lineName",
+        RC2.CARRIER_NAME "carrierName"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
+        left join RMS_LINE RL ON OO.LINE_ID=RL.LINE_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
+        left join RMS_TRUCK_CALCULATE RTC1 on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        left join RMS_TRUCK_CALCULATE RTC2 on RTC2.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        left join AMSTRUCK_INWARD_PLAN AIP on AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        left join AMSTRUCK_REQUIREMENT_PLAN ARP on AIP.PLAN_ID = ARP.PLAN_ID
+        left join RMS_CARRIER RC2 ON RC2.CARRIER_ID=AIP.CARRIER_ID
+        left join AMSTRUCK_INWARD_REQUIREMENT AIR on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        left join RMS_SHIPPER RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
+        left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
+        left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMS_WAREHOUSE RW1 on ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW1.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
+        <where>
+            OO.ORDER_TYPE = 11
+            <if test="orgCode!=null">
+                AND OO.OPTIONER_CODE=#{orgCode}
+            </if>
+<!--            <if test="oneDate != null">-->
+<!--                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = netWeightTime-->
+<!--            </if>-->
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= netWeightTime
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= netWeightTime
+            </if>
+            <if test="index!=null">
+                and (instr(RC.CAPACITY_NUMBER, #{index}) > 0) or (instr(RW1.WAREHOUSE_NAME, #{index}) > 0)
+                or (instr(RW2.WAREHOUSE_NAME, #{index}) > 0) or (instr(RM.MATERIAL_NAME , #{index}) > 0)
+                or (instr( RC2.CARRIER_NAME, #{index}) > 0) or (instr(RL.LINE_NAME, #{index}) > 0)
+            </if>
+            )
+        </where>
     </select>
-
 
 </mapper>