'修改下拉框'

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -105,7 +104,7 @@ public class AMScontroller extends BaseRESTfulController {
     @PostMapping("updateLoadUnloadPrice")
     @ApiOperation(value = "修改港口装卸单价")
     RESTfulResult updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
-        return amsFeign.updateContractBreach(amsContractOtherPrice);
+        return amsFeign.updateLoadUnloadPrice(amsContractOtherPrice);
     }
 
     @PostMapping("selectLoadUnloadPriceToUpdate/{priceId}")
@@ -248,149 +247,48 @@ public class AMScontroller extends BaseRESTfulController {
     }
 
     /**
-     * 货权转移
-     *
-     * @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);
+    @GetMapping("getAddressDeliveryAddress")
+    @ApiOperation(value = "得到地址下拉")
+    public RESTfulResult getAddressDeliveryAddress(){
+        return amsFeign.getAddressDeliveryAddress();
     }
 
-    @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);
+    @GetMapping("getShipperId")
+    @ApiOperation(value = "得到托运人下拉")
+    public RESTfulResult getShipperId(){
+        return amsFeign.getShipperId();
     }
 
-    @PostMapping("insertDeliveryNotice")
-    @ApiOperation(value = "新增放货通知")
-    RESTfulResult insertDeliveryNotice(@RequestBody Map<String, Object> amsshipDeliveryNotice) {
-        return amsFeign.insertDeliveryNotice(amsshipDeliveryNotice);
+    @GetMapping("getCarrierId")
+    @ApiOperation(value = "得到承运商下拉")
+    public RESTfulResult getCarrierId(){
+        return amsFeign.getCarrierId();
     }
 
-    @PostMapping("deleteByNoticeId/{noticeId}")
-    @ApiOperation(value = "逻辑删除放货通知")
-    RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.deleteByNoticeId(noticeId);
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "获取船id下拉列表")
+    public RESTfulResult getCapacityId(){
+        return amsFeign.getCapacityId();
     }
 
-    @PostMapping("editDeliveryNotice")
-    @ApiOperation(value = "修改放货通知")
-    RESTfulResult editDeliveryNotice(@RequestBody Map<String, Object> editDeliveryNotice) {
-        return amsFeign.editDeliveryNotice(editDeliveryNotice);
+    @GetMapping("getMaterialId")
+    @ApiOperation(value = "得到物资下拉")
+    public RESTfulResult getMaterialId(){
+        return amsFeign.getMaterialId();
     }
 
-    @PostMapping("selectByNoticeId/{noticeId}")
-    @ApiOperation(value = "通过id查询放货通知")
-    RESTfulResult selectByNoticeId(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.selectByNoticeId(noticeId);
+    @GetMapping("getTruckCapacityId")
+    @ApiOperation(value = "得到车牌号下拉")
+    public RESTfulResult getTruckCapacityId(){
+        return amsFeign.getTruckCapacityId();
     }
 
-    @PostMapping("sendDeliveryNotice/{noticeId}")
-    @ApiOperation(value = "下发放货通知")
-    RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
-        return amsFeign.sendDeliveryNotice(noticeId);
+    @GetMapping("getLineId")
+    @ApiOperation(value = "获取运输线路下拉列表")
+    public RESTfulResult getLineId(){
+        return amsFeign.getLineId();
     }
 }

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

@@ -5,8 +5,6 @@ import com.steerinfo.dil.feign.BmstrainFeign;
 import com.steerinfo.dil.feign.BmstruckFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -64,6 +62,18 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId);
     }
 
+    @PostMapping("getPortHandlingFeeList")
+    @ApiOperation(value = "展示批次信息")
+    public RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getPortHandlingFeeList(mapValue, pageNum, pageSize, apiId);
+    }
+
     @PostMapping("addPortHandlingFee")
     @ApiOperation(value = "生成港口装卸费")
     RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception {
@@ -258,29 +268,31 @@ public class BMSController extends BaseRESTfulController {
         return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId);
     }
 
-    @PostMapping("getTrainResultList")
+    @PostMapping("getStatementTrainResultList")
     @ApiOperation(value = "展示未转账单的火运详单")
-    public RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer apiId,
-                                            Integer detailsId) {
+    public RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     Integer detailsId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getTrainResultList(mapValue, pageNum, pageSize, apiId, detailsId);
+        return bmstrainFeign.getStatementTrainResultList(mapValue, pageNum, pageSize, apiId, detailsId);
     }
 
     @PostMapping("getComplateTrainDetailsList")
     @ApiOperation(value = "展示账单下的详单")
-    public RESTfulResult getComplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+    public RESTfulResult getComplateTrainDetailsList(BigDecimal batchId,
+                                                     @RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId) {
+                                                     Integer apiId,
+                                                     BigDecimal statementId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return bmstrainFeign.getComplateTrainDetailsList(mapValue, pageNum, pageSize, apiId);
+        return bmstrainFeign.getComplateTrainDetailsList(batchId,mapValue, pageNum, pageSize, apiId,statementId);
     }
 
     @PostMapping("addTrainStatement")

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

@@ -111,7 +111,7 @@ public class QMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getAllEnFactoryResult")
+    @PostMapping("/getChangeQueue")
     public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
@@ -271,4 +271,23 @@ public class QMSController {
     public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue){
         return qmsTruckFeign.cancelQueue(mapValue);
     }
+
+    @ApiOperation(value="查询执行中订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllExecutionOrder")
+    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer orderType,
+                                              Integer status
+    ){
+        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status);
+    }
 }

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.TmsTrainFeign;
 import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.feign.TmsshipFeign;
-import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -437,8 +435,14 @@ public class TMSController {
     RESTfulResult addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
         return tmsshipFeign.addShipmentInstructions(omsshipShipmentInstructions);
     }
+
+
+
     /*======================================火运==========================================*/
 
+
+
+
     //************************************TmstrainLoadingResultController********************
     @ApiOperation(value="查询装车作业信息")
     @ApiImplicitParams({
@@ -597,6 +601,125 @@ public class TMSController {
         return tmsTrainFeign.getUnloadingRouteName();
     }
 
+
+    @ApiOperation(value="查询请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(57)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWagonPlease")
+    public RESTfulResult getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer status){
+
+        return tmsTrainFeign.getAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, status);
+    }
+
+    @ApiOperation(value="通过Id查询请车作业")
+    @PostMapping ("/getWagonPleaseById/{resultId}")
+    public RESTfulResult getWagonPleaseById(@PathVariable("resultId")Integer resultId){
+        return tmsTrainFeign.getWagonPleaseById(resultId);
+    }
+
+    @ApiOperation(value="新增请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
+    })
+    @PostMapping("/addWagonPlease")
+    public RESTfulResult addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult){
+        return tmsTrainFeign.addWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value="修改请车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/updateWagonPlease")
+    public RESTfulResult updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult){
+        return tmsTrainFeign.updateWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value="逻辑删除请车作业 设置状态码为 3")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/deleteWagonPlease/{resultId}")
+    public RESTfulResult deleteWagonPlease(@PathVariable("resultId") Integer resultId){
+        return tmsTrainFeign.deleteWagonPlease(resultId);
+    }
+
+    @ApiOperation(value="下发请车作业 设置状态码为 1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendWagonPlease/{resultId}")
+    public RESTfulResult sendWagonPlease(@PathVariable("resultId") Integer resultId){
+        return tmsTrainFeign.sendWagonPlease(resultId);
+    }
+
+    //下拉框
+
+    @ApiOperation(value="查询所有发货单位")
+    @GetMapping("/getShipper")
+    public RESTfulResult getShipper(){
+        return tmsTrainFeign.getShipper();
+    }
+
+    @ApiOperation(value="查询批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(70)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getApproveAllWagonPlease")
+    public RESTfulResult getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize){
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过Id查询批车作业")
+    @PostMapping ("/getApproveWagonPleaseById/{resultId}")
+    public RESTfulResult getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId){
+        return tmsTrainFeign.getApproveWagonPleaseById(resultId);
+    }
+
+    @ApiOperation(value="新增批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/addApproveWagonPlease")
+    public RESTfulResult addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult){
+        return tmsTrainFeign.addApproveWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value="修改批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
+    })
+    @PostMapping("/updateApproveWagonPlease")
+    public RESTfulResult updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult){
+        return tmsTrainFeign.updateApproveWagonPlease(tmstrainPleaseApproveResult);
+    }
+
+    @ApiOperation(value="逻辑删除批车作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deleteApproveWagonPlease/{resultId}")
+    public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId){
+        return tmsTrainFeign.deleteApproveWagonPlease(resultId);
+    }
+
+
         /*======================================汽运==========================================*/
 
     @ApiOperation(value="查询运输预约")
@@ -636,8 +759,8 @@ public class TMSController {
 
     @ApiOperation(value = "通过Id查询请车作业")
     @PostMapping("/getPurPlanById/{planId}")
-    public RESTfulResult getWagonPleaseById(@PathVariable("planId") Integer planId) {
-        return tmsTruckFeign.getWagonPleaseById(planId);
+    public RESTfulResult getPurPlanById(@PathVariable("planId") Integer planId) {
+        return tmsTruckFeign.getPurPlanById(planId);
     }
 
     @ApiOperation(value = "新增运输计划 状态：0")
@@ -692,7 +815,7 @@ public class TMSController {
                                            Integer pageSize,
                                            Integer planId,
                                            Integer status) {
-        return tmsTruckFeign.getDecomposedPlan(mapValue, apiId, pageNum, pageSize, planId, status);
+        return tmsTruckFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status);
     }
 
 
@@ -714,7 +837,7 @@ public class TMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType) {
-        return tmsTruckFeign.getAllTruckOrder(mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
+        return tmsTruckFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
     }
 
     @ApiOperation(value = "不适用表头返回数据")

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

@@ -5,7 +5,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -449,4 +448,30 @@ public interface AmsFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
     RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
+
+    /**
+     * 下拉框
+     * @return
+     */
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getAddressDeliveryAddress")
+    RESTfulResult getAddressDeliveryAddress();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
+    RESTfulResult getShipperId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCarrierId")
+    RESTfulResult getCarrierId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityId")
+    RESTfulResult getCapacityId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getMaterialId")
+    RESTfulResult getMaterialId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckCapacityId")
+    RESTfulResult getTruckCapacityId();
+
+    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineId")
+    RESTfulResult getLineId();
+
 }

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

@@ -2,8 +2,11 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -93,12 +96,12 @@ public interface BmstrainFeign {
      * @param apiId
      * @return
      */
-    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getTrainResultList")
-    RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam Integer detailsId);
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getStatementTrainResultList")
+    RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer detailsId);
 
     /**
      * 展示账单下的详单
@@ -110,10 +113,12 @@ public interface BmstrainFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
-    RESTfulResult getComplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+    RESTfulResult getComplateTrainDetailsList(@RequestParam BigDecimal batchId,
+                                              @RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId);
+                                              @RequestParam Integer apiId,
+                                              @RequestParam BigDecimal statementId);
 
     /**
      * 生成火运费账单

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

@@ -1,6 +1,9 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -137,4 +140,13 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
     public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue);
+
+    @PostMapping("/getAllExecutionOrder")
+    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("orderType")Integer orderType,
+                                              @RequestParam("status")Integer status
+    );
 }

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

@@ -66,7 +66,7 @@ public interface TmsTrainFeign {
 
 
     /*
-    TmstrainWagonUnloadResultController
+        TmstrainWagonUnloadResultController
      */
 
     @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoad")
@@ -106,4 +106,56 @@ public interface TmsTrainFeign {
 
     @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingRouteName")
     public RESTfulResult getUnloadingRouteName();
+
+
+
+    /**************************TmstrainPleaseApproveResultController************************************/
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getAllWagonPlease")
+    public RESTfulResult getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("status") Integer status);
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
+    public RESTfulResult getWagonPleaseById(@PathVariable("resultId")Integer resultId);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonPlease")
+    public RESTfulResult addWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateWagonPlease")
+    public RESTfulResult updateWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteWagonPlease/{resultId}")
+    public RESTfulResult deleteWagonPlease(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/sendWagonPlease/{resultId}")
+    public RESTfulResult sendWagonPlease(@PathVariable("resultId") Integer resultId);
+
+    //下拉框
+    @GetMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getShipper")
+    public RESTfulResult getShipper();
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveAllWagonPlease")
+    public RESTfulResult getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam("apiId") Integer apiId,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
+    public RESTfulResult getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/addApproveWagonPlease")
+    public RESTfulResult addApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/updateApproveWagonPlease")
+    public RESTfulResult updateApproveWagonPlease(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+
+    @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
+    public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
 }

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

@@ -38,7 +38,7 @@ public interface TmsTruckFeign {
                                             @RequestParam("con")String con);
 
     @PostMapping ("api/v1/truckTms/amstruckpurplans/getPurPlanById/{planId}")
-    public RESTfulResult getWagonPleaseById(@PathVariable("planId")Integer planId);
+    public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId);
 
     @PostMapping("api/v1/truckTms/amstruckpurplans/addPurPlan")
     public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);

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

@@ -5,7 +5,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -476,4 +475,50 @@ public interface TmsshipFeign {
      */
     @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/addShipmentInstructions")
     RESTfulResult addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+
+    /**
+     * 下拉框
+     * @return
+     */
+    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getGroupId")
+    RESTfulResult getGroupId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipcargotransferresults/getCargoId")
+    RESTfulResult getCargoId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/insertBetchId")
+    RESTfulResult insertBetchId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getAttorneyId")
+    RESTfulResult getAttorneyId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getNoticeId")
+    RESTfulResult getNoticeId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPortId")
+    RESTfulResult getPortId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getRmRawId")
+    RESTfulResult getRmRawId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliveryattorneys/getPierId")
+    RESTfulResult getPierId();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getResultNumber")
+    RESTfulResult getResultNumber();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getCarrier")
+    RESTfulResult getCarrier();
+
+    @GetMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/getShipper")
+    RESTfulResult getShipper();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getOrderId")
+    RESTfulResult getTask();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacityId")
+    RESTfulResult getCapacityId();
+
+    @GetMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getBatchId")
+    RESTfulResult getBatchId();
 }

src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:localhost:8088}
-  TmsShipFeign:
+  TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:localhost:8084}
@@ -70,4 +70,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8093
+  port: 8080