修改火车委托

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

@@ -62,6 +62,10 @@ public class TmstrainMeasureCommissionController extends BaseRESTfulController {
     @ApiOperation(value = "批量新增计量委托")
     @PostMapping(value = "/batchSendMeasureCommission")
     public RESTfulResult batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) {
-        return success(tmstrainMeasureCommissionService.batchSendMeasureCommission(map));
+        int i = tmstrainMeasureCommissionService.batchSendMeasureCommission(map);
+        if (i==-1){
+            return success("有委托发送失败,请联系技术人员");
+        }
+        return success("发送成功");
     }
 }

src/main/java/com/steerinfo/dil/service/impl/TmstrainMeasureCommissionServiceImpl.java

@@ -52,6 +52,9 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         for (Map<String, Object> objectMap : resultIdList) {
             count += addTrainMeasureCommission(objectMap);
         }
+        if (resultIdList.size()-count!=0){
+            return -1;
+        }
         return count;
     }
 
@@ -65,6 +68,7 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         //查询计量委托
         Map<String, Object> measureCommission = getTrainMeasureCommission(map);
         measureCommission.put("steelyardNum", "铁专线");
+        //车皮号
         measureCommission.put("transportNum", map.get("transportNum"));
         measureCommission.put("isRelationEAS", true);
         measureCommission.put("flowTo", "进厂");
@@ -77,8 +81,7 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         map.put("resultTotalId", measureCommission.get("resultTotalId"));
         measureCommission.remove("resultTotalId");
         //添加计量委托其他数据
-//        int i = sendMesToMeasure(measureCommission);
-        int i = 1;
+        int i = sendMesToMeasure(measureCommission);
         if(i == 1){
             //添加计量委托实绩
             addMeasureCommission(map);
@@ -148,7 +151,6 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         sendMap.add(map);
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data", sendMap);
-
         String url = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
         String jsonData = null;
         try {