liyg 1 рік тому
батько
коміт
8903b1cab2

+ 3 - 2
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -583,8 +583,9 @@ 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("")){
-                throw new Exception("单元格数据异常(通知单号/车号/计量日期/净重/皮重/毛重),请检查模板或数据是否正确!");
+                    || item.get("毛重")==null || item.get("毛重").equals("")
+                    ||  item.get("磅单号")==null || item.get("磅单号").equals("")){
+                throw new Exception("单元格数据异常(通知单号/车号/计量日期/净重/皮重/毛重/磅单号),请检查模板或数据是否正确!");
             }
             item.put("净重", DataChange.dataToBigDecimal(item.get("毛重")).subtract(DataChange.dataToBigDecimal(item.get("皮重"))));
             //校验数据

+ 2 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1256,11 +1256,13 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             APC .TRANS_PLAN_ID "transPlanId",
+            OTO .ALTERNATE_FIELDS20     "trainSeq",
             APC .MATERIAL_ID "materialId",
             TWR .RESULT_ID "resultId",
             TUR .RESULT_ID "unloadResultId",
             #{item.通知单号} "requireNumber",
             #{item.计量日期} "weightTime",
+            #{item.磅单号} "poundNo",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",