1

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

@@ -566,11 +566,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());
         }
@@ -665,11 +665,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/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1216,6 +1216,7 @@
             TWR .RESULT_ID "resultId",
             TUR .RESULT_ID "unloadResultId",
             #{item.通知单号} "requireNumber",
+            #{item.计量日期} "weightTime",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -1248,6 +1249,7 @@
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",
+            #{item.卸车日期} "unloadTime",
             #{item.车号} "capacityId",
             #{item.通知单号} "requireNumber",
             CASE