修改

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

@@ -557,17 +557,18 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              Integer status) {
+                                                              Integer status,
+                                                              String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,status,con);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
     @ApiOperation(value = "新增提货委托")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
-        return tmsshipFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.insertshipDeliveryAttorney(map);
     }
 
     @PostMapping("deleteByAttorneyId/{attorneyId}")
@@ -646,9 +647,9 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.sendDeliveryNotice(noticeId);
     }
     //船舶动态表
-    @PostMapping("/selectAll")
-    Map<String, Object> selectAll(){
-        return tmsshipFeign.selectAll();
+    @PostMapping("/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics(){
+        return tmsshipFeign.selectAllShipDynamaics();
     }
 
     /**

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

@@ -131,6 +131,14 @@ public class WMSHController extends BaseRESTfulController {
         return wmshFeign.addWarehousingResult(wmshInboundResult);
     }
 
+    @PostMapping("clearWmshGridMaterial")
+    @ApiOperation(value = "添加港存库入库实绩")
+    RESTfulResult clearWmshGridMaterial(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.clearWmshGridMaterial(wmshInboundResult);
+    }
+
+
+
     @PostMapping("addResult")
     @ApiOperation(value = "添加港存库出库实绩")
     RESTfulResult addResult(@RequestBody Map<String, Object> map) {

src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -579,7 +579,7 @@ public interface TmsshipFeign {
                                              @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupList")
-      Map<String, Object>      getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
+      Map<String, Object> getGroupList (@RequestBody(required = false) Map<String, Object> mapValue,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
                                              @RequestParam Integer apiId,
@@ -634,16 +634,17 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam Integer status);
+                                                 @RequestParam Integer status,
+                                                       @RequestParam String con);
 
     /**
      * 新增提货委托
      *
-     * @param amsshipDeliveryAttorney
+     * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
-    Map<String, Object> insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+    Map<String, Object> insertshipDeliveryAttorney(@RequestBody(required = false) Map<String, Object> map);
 
     /**
      * 逻辑删除提货委托
@@ -743,8 +744,8 @@ public interface TmsshipFeign {
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
 
     //船舶动态表
-    @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
-    Map<String, Object> selectAll();
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAllShipDynamaics")
+    Map<String, Object> selectAllShipDynamaics();
 
 
     //获取合同水分值，实装吨位，水分吨位

src/main/java/com/steerinfo/dil/feign/WMSHFeign.java

@@ -123,4 +123,7 @@ public interface WMSHFeign {
     @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
     RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
 
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
+    RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -18,19 +18,19 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8017}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+    url: ${TMSSHIPFEIGN_URL:localhost:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHFEIGN_URL:localhost:8013}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ openfeign:
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -320,6 +320,7 @@
                         RW.WAREHOUSE_ID   "warehouseId",
                         RW.WAREHOUSE_NAME "warehouseName"
                  from RMS_WAREHOUSE RW
+
                  <where>
                      <if test="type != null">
                          RW.WAREHOUSE_TYPE_ID = #{type}
@@ -755,8 +756,6 @@
         <if test="index!=null">
         where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
         </if>
-
-
     </select>
     <select id="getPlanCount" resultType="java.lang.Integer">
         SELECT