1

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) {

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

@@ -1238,6 +1238,9 @@
             #{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