'合并修改'

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.feign.TmsshipFeign;
@@ -27,6 +28,8 @@ public class TMSController {
     @Autowired
     private TmsTrainFeign tmsTrainFeign;
     @Autowired
+    AmsFeign amsFeign;
+    @Autowired
     TmsshipFeign tmsshipFeign;
 
     /*======================================船运==========================================*/
@@ -436,6 +439,235 @@ public class TMSController {
         return tmsshipFeign.addShipmentInstructions(omsshipShipmentInstructions);
     }
 
+    /**
+     * 货权转移
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getAmsshipCargoTranferResultList")
+    @ApiOperation(value = "展示货权转移")
+    public RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsshipCargoTranferResultList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("insertamsshipCargoTransferResult")
+    @ApiOperation(value = "新增货权转移")
+    RESTfulResult insertamsshipCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
+        return amsFeign.insertamsshipCargoTransferResult(amsshipCargoTransferResult);
+    }
+
+    @PostMapping("deleteByCargoId/{cargoTransferResultId}")
+    @ApiOperation(value = "逻辑删除货权转移")
+    RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
+        return amsFeign.deleteByCargoId(cargoTransferResultId);
+    }
+
+    @PostMapping("editCargoTransferResult")
+    @ApiOperation(value = "修改货权转移")
+    RESTfulResult editCargoTransferResult(@RequestBody Map<String, Object> amsshipCargoTransferResult) {
+        return amsFeign.editCargoTransferResult(amsshipCargoTransferResult);
+    }
+
+    @PostMapping("selectByCargoTranferResultId/{cargoTransferResultId}")
+    @ApiOperation(value = "通过id查询货权转移")
+    RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId) {
+        return amsFeign.selectByCargoTranferResultId(cargoTransferResultId);
+    }
+
+    /**
+     * 提货委托
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getAmsshipDeliveryAttroneyList")
+    @ApiOperation(value = "展示提货委托")
+    public RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsshipDeliveryAttroneyList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("insertshipDeliveryAttorney")
+    @ApiOperation(value = "新增提货委托")
+    RESTfulResult insertshipDeliveryAttorney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
+        return amsFeign.insertshipDeliveryAttorney(amsshipDeliveryAttorney);
+    }
+
+    @PostMapping("deleteByAttorneyId/{attorneyId}")
+    @ApiOperation(value = "逻辑删除提货委托")
+    RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
+        return amsFeign.deleteByAttorneyId(attorneyId);
+    }
+
+    @PostMapping("editDeliveryAttroney")
+    @ApiOperation(value = "修改提货委托")
+    RESTfulResult editDeliveryAttroney(@RequestBody Map<String, Object> amsshipDeliveryAttorney) {
+        return amsFeign.editDeliveryAttroney(amsshipDeliveryAttorney);
+    }
+
+    @PostMapping("getDeliveryAttorneyId/{attorneyId}")
+    @ApiOperation(value = "通过id查询提货委托")
+    RESTfulResult getDeliveryAttorneyId(@PathVariable("attorneyId") Integer attorneyId) {
+        return amsFeign.getDeliveryAttorneyId(attorneyId);
+    }
+
+    @PostMapping("sendDeliveryAttorneyStatus/{attorneyId}")
+    @ApiOperation(value = "下发提货委托")
+    RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId) {
+        return amsFeign.sendDeliveryAttorneyStatus(attorneyId);
+    }
+
+    /**
+     * 放货通知
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getshipDeliveryNoticeList")
+    @ApiOperation(value = "展示放货通知")
+    public RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getshipDeliveryNoticeList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("insertDeliveryNotice")
+    @ApiOperation(value = "新增放货通知")
+    RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice) {
+        return amsFeign.insertDeliveryNotice(amsshipDeliveryNotice);
+    }
+
+    @PostMapping("deleteByNoticeId/{noticeId}")
+    @ApiOperation(value = "逻辑删除放货通知")
+    RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId) {
+        return amsFeign.deleteByNoticeId(noticeId);
+    }
+
+    @PostMapping("editDeliveryNotice")
+    @ApiOperation(value = "修改放货通知")
+    RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> editDeliveryNotice) {
+        return amsFeign.editDeliveryNotice(editDeliveryNotice);
+    }
+
+    @PostMapping("selectByNoticeId/{noticeId}")
+    @ApiOperation(value = "通过id查询放货通知")
+    RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId) {
+        return amsFeign.selectByNoticeId(noticeId);
+    }
+
+    @PostMapping("sendDeliveryNotice/{noticeId}")
+    @ApiOperation(value = "下发放货通知")
+    RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
+        return amsFeign.sendDeliveryNotice(noticeId);
+    }
+
+
+    /**
+     * 下拉框
+     * @return
+     */
+    @GetMapping("getGroupId")
+    @ApiOperation(value = "得到下拉")
+    public RESTfulResult getGroupId(){
+        return tmsshipFeign.getGroupId();
+    }
+
+    @GetMapping("getCargoId")
+    @ApiOperation(value = "得到货物下拉")
+    public RESTfulResult getCargoId(){
+        return tmsshipFeign.getCargoId();
+    }
+
+    @GetMapping("insertBetchId")
+    @ApiOperation(value = "得到批次下拉")
+    public RESTfulResult insertBetchId(){
+        return tmsshipFeign.insertBetchId();
+    }
+
+    @GetMapping("getAttorneyId")
+    @ApiOperation(value = "得到提货下拉")
+    public RESTfulResult getAttorneyId(){
+        return tmsshipFeign.getAttorneyId();
+    }
+
+    @GetMapping("getNoticeId")
+    @ApiOperation(value = "得到放货下拉")
+    public RESTfulResult getNoticeId(){
+        return tmsshipFeign.getNoticeId();
+    }
+
+    @GetMapping("getPortId")
+    @ApiOperation(value = "得到港口下拉")
+    public RESTfulResult getPortId(){
+        return tmsshipFeign.getPortId();
+    }
+
+    @GetMapping("getRmRawId")
+    @ApiOperation(value = "得到仓库下拉")
+    public RESTfulResult getRmRawId(){
+        return tmsshipFeign.getRmRawId();
+    }
+
+    @GetMapping("getPierId")
+    @ApiOperation(value = "得到码头下拉")
+    public RESTfulResult getPierId(){
+        return tmsshipFeign.getPierId();
+    }
+
+    @GetMapping("getResultNumber")
+    @ApiOperation(value = "得到实绩编号下拉")
+    public RESTfulResult getResultNumber(){
+        return tmsshipFeign.getResultNumber();
+    }
+
+    @GetMapping("getCarrier")
+    @ApiOperation(value = "得到承运商下拉")
+    public RESTfulResult getCarrier(){
+        return tmsshipFeign.getCarrier();
+    }
+
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到托运方下拉")
+    public RESTfulResult getShipperId(){
+        return tmsshipFeign.getShipper();
+    }
+
+    @GetMapping("getOrderId")
+    @ApiOperation(value = "得到装船指令下拉")
+    public RESTfulResult getTask(){
+        return tmsshipFeign.getTask();
+    }
+
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "得到托运方下拉")
+    public RESTfulResult getCapacityId(){
+        return tmsshipFeign.getCapacityId();
+    }
 
 
     /*======================================火运==========================================*/