'修改船运'

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

@@ -1,9 +1,8 @@
 package com.steerinfo.dil.controller;
 
-import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.dil.feign.TmsshipFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
-import com.steerinfo.dil.feign.TmsshipFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
@@ -29,8 +28,6 @@ public class TMSController extends BaseRESTfulController {
     @Autowired
     private TmsTrainFeign tmsTrainFeign;
     @Autowired
-    AmsFeign amsFeign;
-    @Autowired
     TmsshipFeign tmsshipFeign;
 
     /*======================================船运==========================================*/
@@ -458,31 +455,31 @@ public class TMSController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsshipCargoTranferResultList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipCargoTranferResultList(mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("insertamsshipCargoTransferResult")
     @ApiOperation(value = "新增货权转移")
     RESTfulResult insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
-        return amsFeign.insertamsshipCargoTransferResult(amsshipCargoTransferResult);
+        return tmsshipFeign.insertamsshipCargoTransferResult(amsshipCargoTransferResult);
     }
 
     @PostMapping("deleteByCargoId/{cargoTransferResultId}")
     @ApiOperation(value = "逻辑删除货权转移")
     RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
-        return amsFeign.deleteByCargoId(cargoTransferResultId);
+        return tmsshipFeign.deleteByCargoId(cargoTransferResultId);
     }
 
     @PostMapping("editCargoTransferResult")
     @ApiOperation(value = "修改货权转移")
     RESTfulResult editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
-        return amsFeign.editCargoTransferResult(amsshipCargoTransferResult);
+        return tmsshipFeign.editCargoTransferResult(amsshipCargoTransferResult);
     }
 
     @PostMapping("selectByCargoTranferResultId/{cargoTransferResultId}")
     @ApiOperation(value = "通过id查询货权转移")
     RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
-        return amsFeign.selectByCargoTranferResultId(cargoTransferResultId);
+        return tmsshipFeign.selectByCargoTranferResultId(cargoTransferResultId);
     }
 
     /**
@@ -503,37 +500,37 @@ public class TMSController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsshipDeliveryAttroneyList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
     @ApiOperation(value = "新增提货委托")
     RESTfulResult insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
-        return amsFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
+        return tmsshipFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
     }
 
     @PostMapping("deleteByAttorneyId/{attorneyId}")
     @ApiOperation(value = "逻辑删除提货委托")
     RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
-        return amsFeign.deleteByAttorneyId(attorneyId);
+        return tmsshipFeign.deleteByAttorneyId(attorneyId);
     }
 
     @PostMapping("editDeliveryAttroney")
     @ApiOperation(value = "修改提货委托")
     RESTfulResult editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
-        return amsFeign.editDeliveryAttroney(amsshipDeliveryAttorney);
+        return tmsshipFeign.editDeliveryAttroney(amsshipDeliveryAttorney);
     }
 
     @PostMapping("getDeliveryAttorneyId/{attorneyId}")
     @ApiOperation(value = "通过id查询提货委托")
     RESTfulResult getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
-        return amsFeign.getDeliveryAttorneyId(attorneyId);
+        return tmsshipFeign.getDeliveryAttorneyId(attorneyId);
     }
 
     @PostMapping("sendDeliveryAttorneyStatus/{attorneyId}")
     @ApiOperation(value = "下发提货委托")
     RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId) {
-        return amsFeign.sendDeliveryAttorneyStatus(attorneyId);
+        return tmsshipFeign.sendDeliveryAttorneyStatus(attorneyId);
     }
 
     /**
@@ -554,37 +551,37 @@ public class TMSController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getshipDeliveryNoticeList(mapValue, pageNum, pageSize, apiId);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue, pageNum, pageSize, apiId);
     }
 
     @PostMapping("insertDeliveryNotice")
     @ApiOperation(value = "新增放货通知")
     RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice) {
-        return amsFeign.insertDeliveryNotice(amsshipDeliveryNotice);
+        return tmsshipFeign.insertDeliveryNotice(amsshipDeliveryNotice);
     }
 
     @PostMapping("deleteByNoticeId/{noticeId}")
     @ApiOperation(value = "逻辑删除放货通知")
     RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.deleteByNoticeId(noticeId);
+        return tmsshipFeign.deleteByNoticeId(noticeId);
     }
 
     @PostMapping("editDeliveryNotice")
     @ApiOperation(value = "修改放货通知")
     RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> editDeliveryNotice) {
-        return amsFeign.editDeliveryNotice(editDeliveryNotice);
+        return tmsshipFeign.editDeliveryNotice(editDeliveryNotice);
     }
 
     @PostMapping("selectByNoticeId/{noticeId}")
     @ApiOperation(value = "通过id查询放货通知")
     RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.selectByNoticeId(noticeId);
+        return tmsshipFeign.selectByNoticeId(noticeId);
     }
 
     @PostMapping("sendDeliveryNotice/{noticeId}")
     @ApiOperation(value = "下发放货通知")
     RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.sendDeliveryNotice(noticeId);
+        return tmsshipFeign.sendDeliveryNotice(noticeId);
     }
 
 
@@ -772,7 +769,7 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getDilBatch();
     }
 
-    @GetMapping(value = "/getCarrier")
+    @GetMapping(value = "/getCarrierId")
     public RESTfulResult getCarrierId(){
         return tmsTruckFeign.getCarrier();
     }

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

@@ -278,177 +278,6 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
-    /**
-     * 展示货权转移
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
-    RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                   @RequestParam Integer pageNum,
-                                                   @RequestParam Integer pageSize,
-                                                   @RequestParam Integer apiId);
-
-    /**
-     * 新增货权转移
-     *
-     * @param amsshipCargoTransferResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertamsshipCargoTransferResult")
-    RESTfulResult insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
-
-    /**
-     * 逻辑删除货权转移
-     *
-     * @param cargoTransferResultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/deleteByCargoId/{cargoTransferResultId}")
-    RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
-
-    /**
-     * 修改货权转移
-     *
-     * @param amsshipCargoTransferResult
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/editCargoTransferResult")
-    RESTfulResult editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
-
-    /**
-     * 查询货权转移
-     *
-     * @param cargoTransferResultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectByCargoTranferResultId/{cargoTransferResultId}")
-    RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
-
-    /**
-     * 展示提货委托
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAmsshipDeliveryAttroneyList")
-    RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 @RequestParam Integer pageNum,
-                                                 @RequestParam Integer pageSize,
-                                                 @RequestParam Integer apiId);
-
-    /**
-     * 新增提货委托
-     *
-     * @param amsshipDeliveryAttorney
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
-    RESTfulResult insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
-
-    /**
-     * 逻辑删除提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/deleteByAttorneyId/{attorneyId}")
-    RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 修改提货委托
-     *
-     * @param amsshipDeliveryAttorney
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/editDeliveryAttroney")
-    RESTfulResult editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
-
-    /**
-     * 查询提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getDeliveryAttorneyId/{attorneyId}")
-    RESTfulResult getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 下发提货委托
-     *
-     * @param attorneyId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/sendDeliveryAttorneyStatus/{attorneyId}")
-    RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
-
-    /**
-     * 展示放货通知
-     *
-     * @param mapValue
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getshipDeliveryNoticeList")
-    RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId);
-
-    /**
-     * 新增放货通知
-     *
-     * @param amsshipDeliveryNotice
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/insertDeliveryNotice")
-    RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
-
-    /**
-     * 逻辑删除放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/deleteByNoticeId/{noticeId}")
-    RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
-
-    /**
-     * 修改放货通知
-     *
-     * @param amsshipDeliveryNotice
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/editDeliveryNotice")
-    RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
-
-    /**
-     * 查询放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/selectByNoticeId/{noticeId}")
-    RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
-
-    /**
-     * 下发放货通知
-     *
-     * @param noticeId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
-    RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
-
     /**
      * 下拉框
      * @return

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

@@ -524,4 +524,175 @@ public interface TmsshipFeign {
 
     @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
     RESTfulResult getBatchId();
+
+    /**
+     * 展示货权转移
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getAmsshipCargoTranferResultList")
+    RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId);
+
+    /**
+     * 新增货权转移
+     *
+     * @param amsshipCargoTransferResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/insertamsshipCargoTransferResult")
+    RESTfulResult insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+
+    /**
+     * 逻辑删除货权转移
+     *
+     * @param cargoTransferResultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/deleteByCargoId/{cargoTransferResultId}")
+    RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+
+    /**
+     * 修改货权转移
+     *
+     * @param amsshipCargoTransferResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/editCargoTransferResult")
+    RESTfulResult editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult);
+
+    /**
+     * 查询货权转移
+     *
+     * @param cargoTransferResultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/selectByCargoTranferResultId/{cargoTransferResultId}")
+    RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId);
+
+    /**
+     * 展示提货委托
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAmsshipDeliveryAttroneyList")
+    RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId);
+
+    /**
+     * 新增提货委托
+     *
+     * @param amsshipDeliveryAttorney
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertshipDeliveryAttorney")
+    RESTfulResult insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+
+    /**
+     * 逻辑删除提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/deleteByAttorneyId/{attorneyId}")
+    RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 修改提货委托
+     *
+     * @param amsshipDeliveryAttorney
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/editDeliveryAttroney")
+    RESTfulResult editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney);
+
+    /**
+     * 查询提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getDeliveryAttorneyId/{attorneyId}")
+    RESTfulResult getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 下发提货委托
+     *
+     * @param attorneyId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/sendDeliveryAttorneyStatus/{attorneyId}")
+    RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId);
+
+    /**
+     * 展示放货通知
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getshipDeliveryNoticeList")
+    RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId);
+
+    /**
+     * 新增放货通知
+     *
+     * @param amsshipDeliveryNotice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/insertDeliveryNotice")
+    RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+
+    /**
+     * 逻辑删除放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/deleteByNoticeId/{noticeId}")
+    RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId);
+
+    /**
+     * 修改放货通知
+     *
+     * @param amsshipDeliveryNotice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/editDeliveryNotice")
+    RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice);
+
+    /**
+     * 查询放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/selectByNoticeId/{noticeId}")
+    RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId);
+
+    /**
+     * 下发放货通知
+     *
+     * @param noticeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
+    RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
 }