1

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

@@ -437,10 +437,12 @@ public class TMSController extends BaseRESTfulController {
             //校验行
             if(item.get("通知单号")==null || item.get("通知单号").equals("")
                 || item.get("车号")==null || item.get("车号").equals("")
+                    || item.get("发站")==null || item.get("发站").equals("")
+                    || item.get("到站")==null || item.get("到站").equals("")
                     || item.get("装车日期")==null || item.get("装车日期").equals("")
                     || item.get("皮重")==null || item.get("皮重").equals("")
                     || item.get("毛重")==null || item.get("毛重").equals("")){
-                throw new Exception("单元格数据异常（通知单号/车号/装车日期/净重/皮重/毛重），请检查模板或数据是否正确!");
+                throw new Exception("单元格数据异常（通知单号/车号/装车日期/发站/到站/净重/皮重/毛重），请检查模板或数据是否正确!");
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //通知单统计
@@ -525,6 +527,20 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "查询采购火运装货报表")
+    @PostMapping("/purchaseTrainLoadReport")
+    public Map<String, Object> purchaseTrainLoadReport(@RequestBody(required = false) Map<String, Object> map,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize) {
+        return tmsFeign.purchaseTrainLoadReport(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/updateTrainLoad")
+    public Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.updateTrainLoad(map);
+    }
+
     @ApiOperation(value = "采购火运计量作业")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseTrainWeight")
@@ -679,18 +695,14 @@ public class TMSController extends BaseRESTfulController {
             if(requirementMap!=null){
                 List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
                 orderList.add(order);
-                BigDecimal weight = DataChange.dataToBigDecimal(requirementMap.get("weight"));
-                requirementMap.put("weight",weight.add(DataChange.dataToBigDecimal(order.get("unloadWeight"))));
                 requirementMap.put("orderList",orderList);
             }else{
                 requirementMap = new HashMap<>();
                 List<Map<String,Object>> orderList = new ArrayList<>();
                 orderList.add(order);
-                BigDecimal weight = DataChange.dataToBigDecimal(order.get("unloadWeight"));
                 requirementMap.put("transPlanId",order.get("transPlanId"));
                 requirementMap.put("materialId",order.get("materialId"));
                 requirementMap.put("unloadPointId",order.get("unloadPointId"));
-                requirementMap.put("weight",weight);
                 requirementMap.put("unloadTime",unloadTime);
                 requirementMap.put("userId",userId);
                 requirementMap.put("userName",userName);
@@ -704,9 +716,9 @@ public class TMSController extends BaseRESTfulController {
         for(String requireNumber : requireList){
             Map<String,Object> requirementMap =(Map<String, Object>) map.get(requireNumber);
             List<Map<String,Object>> orderList = (ArrayList) requirementMap.get("orderList");
-            if(universalMapper.countTransOrder(requirementMap) != orderList.size()){
-                throw new Exception("卸车车数与装车车数不一致！");
-            }
+//            if(universalMapper.countTransOrder(requirementMap) != orderList.size()){
+//                throw new Exception("卸车车数与装车车数不一致！");
+//            }
             result = tmsFeign.purchaseTrainUnload(requirementMap);
             if (!"succeed".equals(result.get("status"))) {
                 throw new Exception("上传失败:" + result.get("message"));

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -172,6 +172,15 @@ public interface TmsFeign {
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize);
 
+    @PostMapping("api/v1/tms/tmsloadresults/purchaseTrainLoadReport")
+    Map<String, Object> purchaseTrainLoadReport(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoad")
+    Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map);
+
 
     @PostMapping("api/v1/tms/tmsweightresults/purchaseTrainWeightList")
     Map<String, Object> purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,

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

@@ -1231,7 +1231,7 @@
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
             <where>
                 OTO.DELETED != 1
-                AND 7 >= TO_NUMBER (to_date(#{item.计量日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
+                AND 30 >= TO_NUMBER (to_date(#{item.计量日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
                 AND TO_NUMBER (to_date(#{item.计量日期}, 'yyyymmdd') - TLR.LOAD_START_TIME) >= 0
                 AND ATR.SERIAL_NUMBER =#{item.通知单号}
                 AND OTO.CAPACITY_ID = #{item.车号}
@@ -1265,7 +1265,7 @@
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
             <where>
                 OTO.DELETED != 1
-                AND 7 >= TO_NUMBER (to_date(#{item.卸车日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
+                AND 30 >= TO_NUMBER (to_date(#{item.卸车日期}, 'yyyymmdd') - TLR.LOAD_START_TIME)
                 AND TO_NUMBER (to_date(#{item.卸车日期}, 'yyyymmdd') - TLR.LOAD_START_TIME) >= 0
                 AND ATR.SERIAL_NUMBER =#{item.通知单号}
                 AND OTO.CAPACITY_ID = #{item.车号}