dsfa

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

@@ -265,7 +265,11 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "/updateDomesticLoadResult")
     public RESTfulResult updateDomesticLoadResult(@RequestBody(required = false) Map<String, Object> map) {
-        return success(tmstrainLoadingResultService.updateDomesticLoadResult(map));
+        int i = tmstrainLoadingResultService.updateDomesticLoadResult(map);
+        if(i==-1){
+            return success("有委托发送失败,请联系技术人员");
+        }
+        return success("发送成功");
     }
 
     @ApiOperation(value = "根据物资名和外轮船名查询采购订单号")

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

@@ -50,6 +50,9 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     @Autowired
     private TmstrainTotalResultMapper tmstrainTotalResultMapper;
 
+    @Autowired
+    private TmstrainMeasureCommissionServiceImpl tmstrainMeasureCommissionService;
+
     /**
      * 查看所有装车实绩
      * @param map
@@ -142,6 +145,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         List<TmstrainLoadingTemp> loadingTemps=new ArrayList<>();
         //装车实绩list
         List<TmstrainLoadingResult> loadingResults=new ArrayList<>();
+        int i = 0;
         for(Map<String,Object> map:list){
             TmstrainLoadingTemp temp=new TmstrainLoadingTemp();
             TmstrainLoadingResult result=new TmstrainLoadingResult();
@@ -192,6 +196,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             }
             loadingTemps.add(temp);
             loadingResults.add(result);
+             i += addTotalResult(maxId);
         }
         //批量插入
         tmstrainLoadingTempMapper.batchInsert(loadingTemps);
@@ -228,8 +233,15 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             count += tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
         }
         //全部补录成功，发送计量委托
-        if(resultIdList.size()-count==0)
+        if(resultIdList.size()-count==0){
             System.out.println("发送计量委托");
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("resultIdList",resultIdList);
+            int i = tmstrainMeasureCommissionService.batchSendMeasureCommission(map1);
+            if(i==-1){
+                return i;
+            }
+        }
         return count;
     }