修改

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

@@ -96,6 +96,21 @@ public class WmshGridMaterialController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
+
+
+
+    @ApiOperation(value="船舶动态表展示库存吨位", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "158", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/gePortStockList")
+    public RESTfulResult gePortStockList(@RequestBody(required = false) Map<String,Object> mapVal
+                                            ){
+        List<Map<String, Object>> columnList = wmshGridMaterialService.getLoadPortStockList(mapVal);
+        return success(columnList);
+    }
     /**
      * 展示万州港港存库库存列表
      * @param mapVal

src/main/java/com/steerinfo/dil/mapper/WmshOutboundResultMapper.java

@@ -11,8 +11,9 @@ import java.util.Map;
 
 @Mapper
 public interface WmshOutboundResultMapper extends IBaseMapper<WmshOutboundResult, BigDecimal> {
+
     //查询最大序列号用于主键
-    @Select("select seq_wmsh_out.nextval from dual")
+    @Select("select seq_wmsh_grid_material.nextval from dual")
     Integer getResultId();
 
     //查询所有的出库实绩

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

@@ -121,18 +121,18 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
         //实时库存
         String isClear =(String) map.get("isClean");
         WmshOutboundResult wmshOutboundResult =new WmshOutboundResult();
-        BigDecimal id = DataChange.dataToBigDecimal(wmshOutboundResultMapper.getResultId());
+        BigDecimal id = DataChange.dataToBigDecimal(wmshGridMaterialMapper.selectMaxId());
         wmshOutboundResult.setResultId(id);
         String gckd = DataChange.generateEightDigitsNumber("GCKD", id.intValue());
         wmshOutboundResult.setResultNumber(gckd);
         wmshOutboundResult.setResultClearing(isClear);
-
         wmshOutboundResult.setInsertTime(new Date());
+        wmshOutboundResult.setResultTonnage(DataChange.dataToBigDecimal(map.get("resultMaterialNumber")));
         wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
         BigDecimal portId = DataChange.dataToBigDecimal(map.get("portId"));
         wmshOutboundResult.setHarborId(portId);
         i = wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
-        return i;
+        return id.intValue();
     }
 
     //展示港存库目前品种对应的库存

src/main/resources/bootstrap.yml

@@ -22,7 +22,7 @@ eureka:
     fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
     instance:
-      prefer-ip-address: true
+      prefer-ip-address: false
       status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
       instance-id: ${spring.cloud.client.ip-address}:${server.port}
 

src/main/resources/com/steerinfo/dil/mapper/WmshGridMaterialMapper.xml

@@ -498,11 +498,18 @@
                TLT.RESULT_BILLABLE_TONNAGE	"weight",
                WOR.RESULT_CLEARING         "resultClearing",
                WOR.INSERT_TIME             "insertTime",
-        TLT.RESULT_ID                "resultId",
-        WOR.RESULT_ID               "outBoundId"
+               TLT.RESULT_ID                "resultId",
+               WOR.RESULT_ID               "outBoundId",
+        (CASE WHEN TWR.RESULT_POUND_NO IS NULL THEN 1 ELSE 0 END) "isEdit"
         from TMSTRAIN_LOADING_TEMP TLT
                  left join AMS_PURCHASE_ORDER APO
                            on TLT.PURCHASE_ORDER_NO = APO.PURCHASE_ORDER_NO
+                 LEFT JOIN TMSTRAIN_LOADING_RESULT TLR
+                 ON TLT.RESULT_ID =TLR.TEMP_RESULT_ID
+                 LEFT JOIN TMSTRAIN_TOTAL_RESULT TTR
+                 ON TTR.LOADING_ID = TLR.RESULT_ID
+                 LEFT JOIN  TMSTRAIN_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID =TTR.TOTAL_RESULT_ID
                  left join WMSH_OUTBOUND_RESULT WOR
                            on TLT.OUTBOUNT_ID = WOR.RESULT_ID
                  left join DIL_BATCH DB