修改

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

@@ -74,7 +74,6 @@ public class WmshOutboundResultController extends BaseRESTfulController {
         map.put("status", new BigDecimal(0));
         int i1 = wmshGridMaterialService.updatePortStock(map);
         if (i1 == -1){
-//            System.out.println("港存库出库数量大于实时库存");
             return failed("出库数量大于港存库实时库存");
     }else {
 

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

@@ -1,7 +1,9 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.WmshGridMaterialMapper;
+import com.steerinfo.dil.mapper.WmshOutboundResultMapper;
 import com.steerinfo.dil.model.WmshGridMaterial;
+import com.steerinfo.dil.model.WmshOutboundResult;
 import com.steerinfo.dil.service.IWmshGridMaterialService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,8 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
 
     @Autowired
     private WmshGridMaterialMapper wmshGridMaterialMapper;
+    @Autowired
+    private WmshOutboundResultMapper wmshOutboundResultMapper;
 
     /**
      * 展示下游港口实时库存
@@ -99,11 +103,26 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
 
     @Override
     public int clearWmshGridMaterial(Map<String, Object> map) {
+        int i=0;
         BigDecimal gmId =DataChange.dataToBigDecimal(map.get("gmId"));
         WmshGridMaterial wmshGridMaterial=new WmshGridMaterial();
         wmshGridMaterial.setGmId(gmId);
         wmshGridMaterial.setGmTonnage(new BigDecimal(0));
-        int i = wmshGridMaterialMapper.updateByPrimaryKeySelective(wmshGridMaterial);
+         i = wmshGridMaterialMapper.updateByPrimaryKeySelective(wmshGridMaterial);
+        //实时库存
+        String isClear =(String) map.get("isClean");
+        WmshOutboundResult wmshOutboundResult =new WmshOutboundResult();
+        BigDecimal id = DataChange.dataToBigDecimal(wmshOutboundResultMapper.getResultId());
+        wmshOutboundResult.setResultId(id);
+        String gckd = DataChange.generateEightDigitsNumber("GCKD", id.intValue());
+        wmshOutboundResult.setResultNumber(gckd);
+        wmshOutboundResult.setResultClearing(isClear);
+
+        wmshOutboundResult.setInsertTime(new Date());
+        wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
+        BigDecimal portId = DataChange.dataToBigDecimal(map.get("portId"));
+        wmshOutboundResult.setHarborId(portId);
+        i = wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
         return i;
     }
 

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ESFeign:
     url: ${ESFEIGN_URL:172.16.33.166:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 server:
   #正式环境