修改计时

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

@@ -234,11 +234,68 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     String startTime,
                                                     String endTime
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getPurInwardReport(mapValue);
         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,sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getInwardReport(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
+
+    @ApiOperation("对内转车辆装货点进行统计")
+    @PostMapping("/getLoading")
+    public RESTfulResult getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
+                                    Integer apiId,
+                                    Integer pageNum,
+                                    Integer pageSize,
+                                    String startTime,
+                                    String endTime){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getLoading(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
+
+    @ApiOperation("对内转车辆装卸货点进行统计")
+    @PostMapping("/getUnLoading")
+    public RESTfulResult getUnLoading(@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.getUnLoading(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
+
 }

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

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

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

@@ -34,5 +34,12 @@ 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);
+
+    List<Map<String, Object>> getLoading(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getUnLoading(Map<String, Object> mapValue);
 }
 

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

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

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

@@ -268,8 +268,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
-                measureCommission.put("ReceivUnit","四川省达州钢铁集团有限责任公司");
-                measureCommission.put("sendUnit","四川省达州钢铁集团有限责任公司");
                 break;
             case 12:
             case 13:

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

@@ -152,7 +152,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("resultId",tmstruckUnloadResultMapper.selectMaxId());
             map.put("Sqe",sqe);
             map.put("totalId",totalId);
-            i += tmstruckUnloadResultMapper.insertSelective(generateUnload(map));
+            TmstruckUnloadResult tmstruckUnloadResult = generateUnload(map);
+            i += tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //查询是否有净重 如果没有净重更新路段顺序号需要继续回皮 有就结束订单
@@ -213,7 +214,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //添加卸货点
         if(map.get("warehouseId") !=null){
             tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        }if(map.get("personnelSsoId") !=null){
+        }
+        if(map.get("personnelSsoId") !=null){
             //通过SSo主键查询人员管理主键
             Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String)map.get("personnelSsoId"));
             if(personnelId !=null){
@@ -222,7 +224,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         }
         //判断物资是否为空
         if(map.get("materialId") != null){
-            tmstruckUnloadResult.setUnloaderId(DataChange.dataToBigDecimal(map.get("materialId")));
+            tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         }
         //添加卸货时间
         tmstruckUnloadResult.setResultEndTime(new Date());

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

@@ -1063,4 +1063,238 @@
             order by "outGatepostTimeFirst" desc, "entryGateTimeFirst" desc
         </if>
     </select>
+
+    <select id="getInwardReport" parameterType="map" resultType="java.util.Map">
+        select * from (
+            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>
+        )
+        <where>
+            <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="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="unloadName != null">
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadName != null">
+                and
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" 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="resultTareWeightTime != null">
+                and
+                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
+                    "resultTareWeightTime" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="resultTareWeight != null">
+                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
+                    "resultTareWeight" 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="resultGrossWeight != null">
+                and
+                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
+                    "resultGrossWeight" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <select id="getLoading" parameterType="map" resultType="java.util.Map">
+        SELECT * FROM(
+        SELECT MATERIAL_NAME "materialName",
+        COUNT(RC.CAPACITY_NUMBER) "capacityNumber",
+        SUM(TWR.RESULT_NET_WEIGHT)  "resultNetWeight",
+        count(TWR.RESULT_NET_WEIGHT) "number",
+        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 TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.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_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 = 11
+        AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_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
+        </if>
+        GROUP BY MATERIAL_NAME, WAREHOUSE_NAME
+        )
+        <where>
+        <if test="materialName != null">
+            and
+            <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                "materialName" 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="number != null">
+                and
+                <foreach collection="number" item="item" open="(" separator="or" close=")">
+                    "number" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getUnLoading" parameterType="map" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT
+        COUNT(RC.CAPACITY_NUMBER) "capacityNumber",
+	    SUM(TWR.RESULT_NET_WEIGHT)  "resultNetWeight",
+        count(TWR.RESULT_NET_WEIGHT) "number",
+        MATERIAL_NAME          "materialName",
+        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 TMSTRUCK_WEIGHT_RESULT TWR
+		ON TWR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.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_END_TIME IS NOT NULL
+        AND OO.ORDER_TYPE = 11
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TUR.RESULT_END_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TUR.RESULT_END_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TUR.RESULT_END_TIME
+        </if>
+		GROUP BY MATERIAL_NAME, WAREHOUSE_NAME
+		)
+        <where>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" 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="resultNetWeight != null">
+                and
+                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                    "resultNetWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="number != null">
+                and
+                <foreach collection="number" item="item" open="(" separator="or" close=")">
+                    "number" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1439,7 +1439,7 @@
     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
+  AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     )
     <where>
       <if test="resultLoadEndTime != null">

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

@@ -1151,13 +1151,16 @@
               CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
               OO.INSERT_UPDATE_REMARK   "demo",
               RM.MATERIAL_ID          "materialId",
-              RW.WAREHOUSE_NAME       "unloadPlace"
+              RW.WAREHOUSE_NAME       "unloadPlace",
+              RW.WAREHOUSE_NAME       "ReceivUnit",
+              RW2.WAREHOUSE_NAME      "sendUnit"
        from OMSTRUCK_ORDER OO
         left join AMSTRUCK_INWARD_PLAN  AIP on OO.ORDER_PLAN_ID = AIP.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 AMSTRUCK_REQUIREMENT_MATERIAL ARM ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        left join RMS_WAREHOUSE RW2 on RW2.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM  on OO.ORDER_ID = OOM.ORDER_ID
         left join RMS_MATERIAL  RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
         left join RMS_CAPACITY  RC on OO.CAPACITY_ID = RC.CAPACITY_ID