Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -556,9 +556,12 @@ public class TMSController extends BaseRESTfulController {
             throw new Exception("未查询到装车信息，请先上传装车作业！");
         } else if(orderList.size() != universalMapper.countTransOrder(orderList.get(0))){
             throw new Exception("计量信息与装车信息数量不一致，请重新上传！");
+        } else if(orderList.get(0).get("unloadResultId")!=null){
+            throw new Exception("车皮已卸车，不允许再上传计量！");
         }
         map.put("orderList",orderList);
         map.put("transPlanId",orderList.get(0).get("transPlanId"));
+        map.put("materialId",orderList.get(0).get("materialId"));
         //新增TMS
         return tmsFeign.purchaseTrainWeight(map);
     }
@@ -633,7 +636,7 @@ public class TMSController extends BaseRESTfulController {
         //获取原本重量之和
         BigDecimal weightOld = BigDecimal.ZERO;
         for(Map<String,Object> item : orderList){
-            weightOld = weightOld.add(DataChange.dataToBigDecimal(item.get("unloadWeight")));
+            weightOld = weightOld.add(DataChange.dataToBigDecimal(item.get("unloadWeightOld")));
         }
         map.put("weightOld",weightOld);
         map.put("diff",DataChange.dataToBigDecimal(map.get("weight").toString()).subtract(weightOld));

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

@@ -866,7 +866,9 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             APC .TRANS_PLAN_ID "transPlanId",
+            APC .MATERIAL_ID "materialId",
             TWR .RESULT_ID "resultId",
+            TUR .RESULT_ID "unloadResultId",
             #{item.车号} "capacityId",
             #{item.净重} "netWeight",
             #{item.皮重} "tareWeight",
@@ -875,6 +877,7 @@
             LEFT JOIN OMS_ORDER_CHILD OOC ON OOC .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN TMS_WEIGHT_RESULT TWR
                 ON TWR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID AND TWR.NET_WEIGHT_TIME = to_date(#{weightTime}, 'yyyymmdd')
+            LEFT JOIN TMS_UNLOAD_RESULT TUR ON TUR .TRANS_ORDER_ID = OTO .TRANS_ORDER_ID
             LEFT JOIN  AMS_PLAN_CHILD APC ON APC.PLAN_CHILD_ID = OOC.PLAN_CHILD_ID
             LEFT JOIN AMS_REQUIREMENT_CHILD ARC ON ARC.REQUIREMENT_CHILD_ID = APC.REQUIREMENT_CHILD_ID
             LEFT JOIN AMS_TRANS_REQUIREMENT ATR ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID
@@ -890,7 +893,7 @@
             SELECT OTO .TRANS_ORDER_ID "transOrderId",
             OOC .ORDER_CHILD_ID "transOrderChildId",
             TUR .RESULT_ID "resultId",
-            TUR .ACTUAL_TONNAGE "unloadWeight",
+            TUR .ACTUAL_TONNAGE "unloadWeightOld",
             APC .TRANS_PLAN_ID "transPlanId",
             ARC .RECEIVING_POINT_ID "unloadPointId",
             APC .MATERIAL_ID "materialId",