修复清场

.gitignore

@@ -5,4 +5,6 @@ rebel.xml
 .rebel.xml.bak
 out/artifacts/
 dil-api.iml
-src/test
+src/test
+/dil-api.iws
+/dil-api.ipr

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

@@ -142,7 +142,6 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
             BigDecimal gmId = DataChange.dataToBigDecimal(gmMap.get("gmId"));
             tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
         }
-        gmMap.put("resultLoadShipDate",mapVal.get("resultLoadShipDate"));
         //获得实装数量
         BigDecimal resultActualInstallations = new BigDecimal((String) mapVal.get("resultActualInstallations"));
         //装船时间
@@ -152,6 +151,10 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         String resultIsClear = (String) mapVal.get("resultIsClear");
         tmsshipLoadShipResult.setResultIsclear(resultIsClear);
         if (resultIsClear.equals("清场")){
+            gmMap.put("portId",rowMap.get("downSwimPortId"));
+            gmMap.put("batchId",rowMap.get("batchId"));
+            gmMap.put("resultLoadShipDate",mapVal.get("resultLoadShipDate"));
+            gmMap.put("isClean",resultIsClear);
            wmshboundFeign.clearWmshGridMaterial(gmMap);
         }else {
             Map<String,Object> outBoundMap=new HashMap<>();
@@ -160,6 +163,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
             outBoundMap.put("batchId",rowMap.get("batchId"));
             outBoundMap.put("resultMaterialNumber",resultActualInstallations);
             outBoundMap.put("resultLoadShipDate",mapVal.get("resultLoadShipDate"));
+            outBoundMap.put("isClean",resultIsClear);
             RESTfulResult resTfulResult=wmshboundFeign.addResult(outBoundMap);
             if(!resTfulResult.getStatus().equals("succeed")){
                 throw new Exception("下游港口出库失败："+resTfulResult.getData());