拼装车不发送委托

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

@@ -263,7 +263,7 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     }
 
 
-    //内转物流修改出库
+    //进口矿新增
     @ApiOperation(value = "进口矿（万州港-达州）")
     @PostMapping(value = "/addShipLoadResult")
     public RESTfulResult addShipLoadResult(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
@@ -1056,9 +1057,15 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             }
             i += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
             i += addTotalResult(resultId);
-            Map<String,Object> map2=new HashMap<>();
-            map2.put("resultId",resultId);
-            resultIdList.add(map2);
+            //出库标重和计算标重一致则为非拼装，发送委托；否则为拼装车不发送委托
+            if(DataChange.dataToBigDecimal(map1.get("resultBillableTonnage")).compareTo(tmstrainLoadingResult.getResultBillableTonnage())==0){
+                Map<String,Object> map2=new HashMap<>();
+                map2.put("resultId",resultId);
+                resultIdList.add(map2);
+            }else{
+                System.out.println("拼装或勾选，不发送委托！");
+                System.out.println(tmstrainLoadingResult);
+            }
         }
          map.put("resultIdList",resultIdList);
         //判断是否为老区轨道衡