as

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

@@ -241,4 +241,28 @@ public class StatisticalReportController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
+
+    @ApiOperation(value="查询内转统计报表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "动态表头", 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("/getInwardReport")
+    public RESTfulResult getInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String startTime,
+                                            String endTime
+    ){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getInwardReport(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
 }

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

@@ -34,4 +34,6 @@ public interface StatisticalReportMapper {
 
     List<Map<String, Object>> getInwardReportResult(Map<String,Object> mapValue);
 
+    //查看内转统计报表
+    List<Map<String, Object>> getInwardReport(Map<String, Object> mapValue);
 }

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

@@ -34,5 +34,8 @@ public interface IStatisticalReportService {
     List<Map<String, Object>> getSporadicSuppliesReport2(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getPurInwardReport(Map<String, Object> mapValue);
+
+    //查看内转统计报表
+    List<Map<String, Object>> getInwardReport(Map<String, Object> mapValue);
 }
 

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

@@ -137,4 +137,10 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         }
         return inwardReportResult;
     }
+
+    @Override
+    public List<Map<String, Object>> getInwardReport(Map<String, Object> mapValue) {
+        return statisticalReportMapper.getInwardReport(mapValue);
+    }
+
 }

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

@@ -1063,4 +1063,39 @@
             order by "outGatepostTimeFirst" desc, "entryGateTimeFirst" desc
         </if>
     </select>
+
+    <select id="getInwardReport" parameterType="map" resultType="java.util.Map">
+        select
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER  "capacityNumber",
+            RS.SHIPPER_NAME     "shipperName",
+            RW1.WAREHOUSE_NAME  "unloadName",
+            RW2.WAREHOUSE_NAME  "loadName",
+            RM.MATERIAL_NAME    "materialName",
+            TWR.RESULT_NET_WEIGHT   "resultNetWeight",
+            TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
+            TWR.RESULT_TARE_WEIGHT      "resultTareWeight",
+            TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+            TWR.RESULT_GROSS_WEIGHT     "resultGrossWeight"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_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 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 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 and TWR.RESULT_NET_WEIGHT >= 0
+        <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;= TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
+        </if>
+    </select>
 </mapper>