修改

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

@@ -119,4 +119,22 @@ public class ReportController {
     Map<String, Object> updateTransUnitPrice(@RequestBody(required=false) HashMap<String,Object> map){
         return reportFeign.updateTransUnitPrice(map);
     }
+
+    @ApiOperation(value="发运单查询")
+    @PostMapping(value = "/selecttype")
+    Map<String, Object> selecttype(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize) {
+        return reportFeign.selecttype(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="派车单查询")
+    @PostMapping(value = "/selecttype1")
+    Map<String, Object> selecttype1(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                   Integer apiId,
+                                   Integer pageNum,
+                                   Integer pageSize) {
+        return reportFeign.selecttype1(mapValue, apiId, pageNum, pageSize);
+    }
 }

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

@@ -440,12 +440,19 @@ public class TMSController extends BaseRESTfulController {
                 || 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("单元格数据异常（通知单号/车号/装车日期/发站/到站/净重/皮重/毛重），请检查模板或数据是否正确!");
+                    || item.get("装车日期")==null || item.get("装车日期").equals("")){
+                throw new Exception("单元格数据异常（通知单号/车号/装车日期/发站/到站），请检查模板或数据是否正确!");
+            }
+            BigDecimal tareWeight = DataChange.dataToBigDecimal(item.get("皮重"));
+            BigDecimal grossWeight = DataChange.dataToBigDecimal(item.get("毛重"));
+            BigDecimal netWeight = DataChange.dataToBigDecimal(item.get("净重"));
+            if(tareWeight.compareTo(BigDecimal.ZERO) > 0 && grossWeight.compareTo(BigDecimal.ZERO) > 0){
+                item.put("净重", grossWeight.subtract(tareWeight));
+            }else if(netWeight.compareTo(BigDecimal.ZERO) > 0){
+                item.put("净重", netWeight);
+            }else {
+                throw new Exception("单元格数据异常：净重/皮重/毛重，请检查模板或数据是否正确!");
             }
-            item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //通知单统计
             String requirementNumber = item.get("通知单号").toString();
             if (map.get(requirementNumber) != null) {
@@ -537,11 +544,18 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.purchaseTrainLoadReport(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "修改火运装车")
     @PostMapping("/updateTrainLoad")
     public Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map){
         return tmsFeign.updateTrainLoad(map);
     }
 
+    @ApiOperation(value = "修改火运装车序号")
+    @PostMapping("/updateTrainLoadSeq")
+    public Map<String, Object> updateTrainLoadSeq(@RequestBody(required = false) Map<String, Object> map){
+        return tmsFeign.updateTrainLoadSeq(map);
+    }
+
     @ApiOperation(value = "采购火运计量作业")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseTrainWeight")
@@ -567,11 +581,11 @@ public class TMSController extends BaseRESTfulController {
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据
-            if(weightTime == null){
-                weightTime = item.get("计量日期").toString();
-            }else if(!weightTime.equals(item.get("计量日期").toString())){
-                throw new Exception("同一个Excel只允许一批车辆，请检查计量日期！");
-            }
+//            if(weightTime == null){
+//                weightTime = item.get("计量日期").toString();
+//            }else if(!weightTime.equals(item.get("计量日期").toString())){
+//                throw new Exception("同一个Excel只允许一批车辆，请检查计量日期！");
+//            }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
         }
@@ -666,11 +680,11 @@ public class TMSController extends BaseRESTfulController {
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据
-            if(unloadTime == null){
-                unloadTime = item.get("卸车日期").toString();
-            }else if(!unloadTime.equals(item.get("卸车日期").toString())){
-                throw new Exception("同一个Excel只允许一批车辆，请检查卸车日期！");
-            }
+//            if(unloadTime == null){
+//                unloadTime = item.get("卸车日期").toString();
+//            }else if(!unloadTime.equals(item.get("卸车日期").toString())){
+//                throw new Exception("同一个Excel只允许一批车辆，请检查卸车日期！");
+//            }
             //车牌号去重
             capacitySet.add(item.get("车号").toString());
         }

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

@@ -57,4 +57,16 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/saleReports/updateTransUnitPrice")
     Map<String, Object> updateTransUnitPrice(HashMap<String, Object> map);
+
+    @PostMapping(value = "api/v1/report/destination/selecttype")
+    Map<String, Object> selecttype(@RequestBody(required = false) HashMap<String, Object> map,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam  Integer pageNum,
+                                         @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/destination/selecttype1")
+    Map<String, Object> selecttype1(@RequestBody(required = false) HashMap<String, Object> map,
+                                   @RequestParam Integer apiId,
+                                   @RequestParam  Integer pageNum,
+                                   @RequestParam  Integer pageSize);
 }

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

@@ -181,6 +181,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoad")
     Map<String, Object> updateTrainLoad(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/tmsloadresults/updateTrainLoadSeq")
+    Map<String, Object> updateTrainLoadSeq(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

@@ -1204,6 +1204,7 @@
             TWR .RESULT_ID "resultId",
             TUR .RESULT_ID "unloadResultId",
             #{item.通知单号} "requireNumber",
+            #{item.计量日期} "weightTime",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -1236,8 +1237,12 @@
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
+            #{item.卸车日期} "unloadTime",
             #{item.车号} "capacityId",
             #{item.通知单号} "requireNumber",
+            #{item.皮重} "tareWeight",
+            #{item.毛重} "grossWeight",
+            #{item.净重} "netWeight",
             CASE
                 WHEN TWR .NET_WEIGHT > 0 THEN TWR .NET_WEIGHT
                 ELSE TLR .ACTUAL_TONNAGE