小峰建国合并

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

@@ -1,8 +1,396 @@
 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.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author luobang
  * @create 2021-09-17 14:10
  */
-public class AMScontroller {
+@RestController
+@RequestMapping("${api.version}/ams")
+public class AMScontroller extends BaseRESTfulController {
+
+    @Autowired
+    AmsFeign amsFeign;
+
+    /**
+     * 违约规则
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getBreachList")
+    @ApiOperation(value = "展示违约列表")
+    public RESTfulResult getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getBreachList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addContractBreach")
+    @ApiOperation(value = "新增违约规则")
+    RESTfulResult addContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+        return amsFeign.addContractBreach(amsContractBreach);
+    }
+
+    @PostMapping("deleteContractBreach/{breachId}")
+    @ApiOperation(value = "逻辑删除违约规则")
+    RESTfulResult deleteContractBreach(@PathVariable("breachId") BigDecimal breachId) {
+        return amsFeign.deleteContractBreach(breachId);
+    }
+
+    @PostMapping("updateContractBreach")
+    @ApiOperation(value = "修改违约规则")
+    RESTfulResult updateContractBreach(@RequestBody Map<String, Object> amsContractBreach) {
+        return amsFeign.updateContractBreach(amsContractBreach);
+    }
+
+    @PostMapping("selectBreachToUpdate/{breachId}")
+    @ApiOperation(value = "查询违约规则")
+    RESTfulResult selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId) {
+        return amsFeign.selectBreachToUpdate(breachId);
+    }
+
+
+    /**
+     * 港口装卸单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadUnloadPriceList")
+    @ApiOperation(value = "展示港口装卸单价列表")
+    public RESTfulResult getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getLoadUnloadPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addLoadUnloadPrice")
+    @ApiOperation(value = "新增港口装卸单价")
+    RESTfulResult addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+        return amsFeign.addLoadUnloadPrice(amsContractOtherPrice);
+    }
+
+    @PostMapping("deleteLoadUnloadPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除港口装卸单价")
+    RESTfulResult deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteLoadUnloadPrice(priceId);
+    }
+
+    @PostMapping("updateLoadUnloadPrice")
+    @ApiOperation(value = "修改港口装卸单价")
+    RESTfulResult updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice) {
+        return amsFeign.updateContractBreach(amsContractOtherPrice);
+    }
+
+    @PostMapping("selectLoadUnloadPriceToUpdate/{priceId}")
+    @ApiOperation(value = "查询港口装卸单价")
+    RESTfulResult selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectLoadUnloadPriceToUpdate(priceId);
+    }
+
+
+    /**
+     * 火运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getTrainPriceList")
+    @ApiOperation(value = "展示火运单价列表")
+    public RESTfulResult getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTrainPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addTrainPrice")
+    @ApiOperation(value = "新增火运单价")
+    RESTfulResult addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+        return amsFeign.addTrainPrice(amsContractTrainPrice);
+    }
+
+    @PostMapping("deleteTrainPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除火运单价")
+    RESTfulResult deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteTrainPrice(priceId);
+    }
+
+    @PostMapping("updateTrainPrice")
+    @ApiOperation(value = "修改火运单价")
+    RESTfulResult updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice) {
+        return amsFeign.updateTrainPrice(amsContractTrainPrice);
+    }
+
+    @PostMapping("selectTrainPriceToUpdate/{priceId}")
+    @ApiOperation(value = "通过id查询火运单价")
+    RESTfulResult selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectTrainPriceToUpdate(priceId);
+    }
+
+    /**
+     * 运费单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getShipPriceList")
+    @ApiOperation(value = "展示水运单价列表")
+    public RESTfulResult getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getShipPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addShipPrice")
+    @ApiOperation(value = "新增水运单价")
+    RESTfulResult addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.addShipPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("deleteShipPrice/{priceId}")
+    @ApiOperation(value = "逻辑删除运费单价")
+    RESTfulResult deleteShipPrice(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.deleteShipPrice(priceId);
+    }
+
+    @PostMapping("updateShipPrice")
+    @ApiOperation(value = "修改水运单价")
+    RESTfulResult updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.updateShipPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("selectPriceToUpdate/{priceId}")
+    @ApiOperation(value = "通过id查询运费单价")
+    RESTfulResult selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId) {
+        return amsFeign.selectPriceToUpdate(priceId);
+    }
+
+    @PostMapping("getTruckPriceList")
+    @ApiOperation(value = "展示汽运单价列表")
+    public RESTfulResult getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckPriceList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addAmsContractTransportPrice")
+    @ApiOperation(value = "新增汽运单价")
+    RESTfulResult addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.addAmsContractTransportPrice(amsContractTransportPrice);
+    }
+
+    @PostMapping("updateAmsContractTransportPrice")
+    @ApiOperation(value = "修改汽运单价")
+    RESTfulResult updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice) {
+        return amsFeign.updateAmsContractTransportPrice(amsContractTransportPrice);
+    }
+
+    @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
+    @PostMapping(value = "/batchUpdateTransportPriceByOilPrice")
+    public RESTfulResult batchUpdateTransportPriceByOilPrice() {
+        return amsFeign.batchUpdateTransportPriceByOilPrice();
+    }
+
+    @PostMapping("getPurchaseOrderList")
+    @ApiOperation(value = "展示采购订单列表")
+    public RESTfulResult getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 货权转移
+     *
+     * @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);
+    }
 }

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

@@ -1,8 +1,322 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.BmsshipFeign;
+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.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
- * @author luobang
- * @create 2021-09-17 14:10
+ * @author hujianguo
+ * @create 2021-09-22 17:10
  */
-public class BMSController {
+@RestController
+@RequestMapping("${api.version}/bms")
+public class BMSController extends BaseRESTfulController {
+
+    @Autowired
+    BmsshipFeign bmsshipFeign;
+    @Autowired
+    BmstrainFeign bmstrainFeign;
+    @Autowired
+    BmstruckFeign bmstruckFeign;
+
+    /**
+     * 水运结算
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("getDetailsOrderList")
+    @ApiOperation(value = "展示详单列表")
+    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getBatch")
+    @ApiOperation(value = "展示批次信息")
+    public RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
+                                  Integer pageNum,
+                                  Integer pageSize,
+                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getBatch(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addPortHandlingFee")
+    @ApiOperation(value = "生成港口装卸费")
+    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception {
+        return bmsshipFeign.addPortHandlingFee(portHandlingFee);
+    }
+
+    @PostMapping("updatePortHandlingFee")
+    @ApiOperation(value = "修改港口装卸费信息")
+    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) {
+        return bmsshipFeign.updatePortHandlingFee(portHandlingFee);
+    }
+
+    @PostMapping("getFeeToUpdate/{feeId}")
+    @ApiOperation(value = "查询修改港口装卸费数据渲染表单")
+    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId) {
+        return bmsshipFeign.getFeeToUpdate(feeId);
+    }
+
+    @PostMapping("deletePortHandlingFee/{feeId}")
+    @ApiOperation(value = "逻辑删除港口装卸费")
+    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId) {
+        return bmsshipFeign.deletePortHandlingFee(feeId);
+    }
+
+    @PostMapping("getUncomplateDetailsOrderList")
+    @ApiOperation(value = "展示未生成账单的详单信息")
+    public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getUncomplateDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addDetailsOrder/{resultId}")
+    @ApiOperation(value = "生成水运计费详单")
+    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception {
+        return bmsshipFeign.addDetailsOrder(resultId);
+    }
+
+    @PostMapping("getStatementList")
+    @ApiOperation(value = "展示水运费和水分质检费账单信息")
+    public RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getStatementList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getLossStatementList")
+    @ApiOperation(value = "展示途损费账单信息")
+    public RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getLossStatementList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getWaterResult")
+    @ApiOperation(value = "展示水分质检实绩")
+    public RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getWaterResult(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addStatement")
+    @ApiOperation(value = "生成水运费账单")
+    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
+        return bmsshipFeign.addStatement(mapList);
+    }
+
+    @PostMapping("addWaterStatement")
+    @ApiOperation(value = "生成水分质检账单")
+    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception {
+        return bmsshipFeign.addWaterStatement(mapList);
+    }
+
+    @PostMapping("addLossStatement")
+    @ApiOperation(value = "生成途损账单")
+    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception {
+        return bmsshipFeign.addLossStatement(map);
+    }
+
+    @PostMapping("getStatementDetailsOrderList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                      BigDecimal batchId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getStatementDetailsOrderList(batchId, mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getShipResult")
+    @ApiOperation(value = "展示详单下的船运实绩")
+    public RESTfulResult getShipResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       BigDecimal batchId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmsshipFeign.getShipResult(batchId, mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getShipFeesFormula")
+    @ApiOperation(value = "查询水运费计算公式")
+    public RESTfulResult getShipFeesFormula() {
+        return bmsshipFeign.getShipFeesFormula();
+    }
+
+    @PostMapping("getLossFeesFormula")
+    @ApiOperation(value = "查询途损费计算公式")
+    public RESTfulResult getLossFeesFormula() {
+        return bmsshipFeign.getLossFeesFormula();
+    }
+
+    @PostMapping("getWaterFeesFormula")
+    @ApiOperation(value = "查询水分质检计算公式")
+    public RESTfulResult getWaterFeesFormula() {
+        return bmsshipFeign.getWaterFeesFormula();
+    }
+
+    @PostMapping("getTrainDetailsOrderList")
+    @ApiOperation(value = "展示火运详单")
+    public RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getUncomplateTrainDetailsList")
+    @ApiOperation(value = "展示未转账单的火运详单")
+    public RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getUncomplateTrainDetailsList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getTrainResultList")
+    @ApiOperation(value = "展示火运实绩")
+    public RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainResultList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addTrainDetails")
+    @ApiOperation(value = "生成火运详单")
+    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map) {
+        return bmstrainFeign.addTrainDetails(map);
+    }
+
+    @PostMapping("getTrainStatementList")
+    @ApiOperation(value = "展示火运账单列表")
+    public RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getTrainStatementList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getTrainResultList")
+    @ApiOperation(value = "展示未转账单的火运详单")
+    public RESTfulResult getTrainResultList(@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);
+    }
+
+    @PostMapping("getComplateTrainDetailsList")
+    @ApiOperation(value = "展示账单下的详单")
+    public RESTfulResult getComplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstrainFeign.getComplateTrainDetailsList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("addTrainStatement")
+    @ApiOperation(value = "生成火运费账单")
+    RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map) {
+        return bmstrainFeign.addTrainStatement(map);
+    }
+
+    @PostMapping("getTruckDetailsOrderList")
+    @ApiOperation(value = "展示汽运详单信息")
+    public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckDetailsOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getTruckResultList")
+    @ApiOperation(value = "展示汽运详单信息")
+    public RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer apiId,
+                                            Integer orderId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return bmstruckFeign.getTruckResultList(mapValue, pageNum, pageSize, apiId, new BigDecimal(orderId));
+    }
+
+    @PostMapping("addTruckDetailsOrder/{orderId}")
+    @ApiOperation(value = "新增汽运详单")
+    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
+        return bmstruckFeign.addTruckDetailsOrder(orderId);
+    }
 }

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

@@ -1,9 +1,274 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.QmsTruckFeign;
+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.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author luobang
  * @create 2021-09-17 14:09
  */
+@RestController
+@RequestMapping("${api.version}/qms")
 public class QMSController {
 
+    @Autowired
+    private QmsTruckFeign qmsTruckFeign;
+
+    @ApiOperation(value="触发电子围栏-->新增排队实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addQueueResult")
+    public RESTfulResult addQueueResult(String orderNumber){
+        return qmsTruckFeign.addQueueResult(orderNumber);
+    }
+
+
+    @ApiOperation(value="指令接收-->新增排队链表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/addQueueList")
+    public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue){
+        return qmsTruckFeign.addQueueList(mapValue);
+    }
+
+    @ApiOperation(value="指令接收")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(130)", 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("/orderReceive")
+    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize
+    ){
+        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="查询排队申请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(125)", 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("/getQueueApply")
+    public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize
+    ){
+        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="查询排队开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(128)", 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("/getQueueListByQueueUp")
+    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer gridId
+    ){
+        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId);
+    }
+
+
+    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
+    @PostMapping("/changeQueue")
+    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.changeQueue(mapValue);
+    }
+
+
+    @ApiOperation(value="查询排队转移")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(124)", 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("/getAllEnFactoryResult")
+    public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="排队取消-->修改排队链表deleted为1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueCancel")
+    public RESTfulResult queueCancel(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.queueCancel(mapValue);
+    }
+
+    @ApiOperation(value="查询排队取消")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(131)", 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("/getQueueCancel")
+    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize
+    ){
+        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过Id查询排队取消实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/getQueueCancelByResultId/{resultId}")
+    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+        return qmsTruckFeign.getQueueCancelByResultId(resultId);
+    }
+
+
+    @ApiOperation(value="修改排队取消实绩：时间、原因")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateQueueCancel")
+    public RESTfulResult updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsTruckFeign.updateQueueCancel(mapValue);
+    }
+
+
+    @ApiOperation(value="排队插队-->修改排队链表顺序号为最小")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueCutInLine")
+    public RESTfulResult queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.queueCutInLine(mapValue);
+    }
+
+
+    @ApiOperation(value="查询排队插队")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(132)", 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("/getQueueInsert")
+    public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize
+    ){
+        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="排队结束-->修改deleted = 1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/queueEndByPDA")
+    public RESTfulResult queueEnd(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsTruckFeign.queueEnd(mapValue);
+    }
+
+    @ApiOperation(value="查询排队结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(133)", 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("/getQueueEndResult")
+    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize
+    ){
+        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="汽车监控")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(135)", 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("/capacityMonitor")
+    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize
+    ){
+        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="链表监控")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(134)", 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("/listMonitor")
+    public RESTfulResult listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize
+    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+    @PostMapping("/getQueueStatusList")
+    public RESTfulResult getQueueStatusList(){
+        return qmsTruckFeign.getQueueStatusList();
+    }
+
+    @ApiOperation(value="通过车牌号查询司机接单")
+    @PostMapping("/getOrderReceive/{capacityNumber}")
+    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
+        return qmsTruckFeign.getOrderReceive(capacityNumber);
+    }
+
+    @ApiOperation(value="通过车牌号取消排队")
+    @PostMapping("/cancelQueue")
+    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue){
+        return qmsTruckFeign.cancelQueue(mapValue);
+    }
 }

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

@@ -1,8 +1,1146 @@
 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;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author luobang
  * @create 2021-09-17 14:11
  */
+
+@RestController
+@RequestMapping("${api.version}/tms")
 public class TMSController {
-}
+    @Autowired
+    private TmsTruckFeign tmsTruckFeign;
+    @Autowired
+    private TmsTrainFeign tmsTrainFeign;
+    @Autowired
+    TmsshipFeign tmsshipFeign;
+
+    /*======================================船运==========================================*/
+    /**
+     * 驳船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getBargeOperationList")
+    @ApiOperation(value = "展示驳船")
+    public RESTfulResult getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getBargeOperationList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("selectBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "通过id查询驳船")
+    RESTfulResult selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.selectBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("getBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "查询驳船")
+    RESTfulResult getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.getBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("deleteBargeOperation/{bargeOperationId}")
+    @ApiOperation(value = "逻辑删除驳船")
+    RESTfulResult deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        return tmsshipFeign.deleteBargeOperation(bargeOperationId);
+    }
+
+    @PostMapping("updateBargeOperation")
+    @ApiOperation(value = "修改驳船")
+    RESTfulResult updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation) {
+        return tmsshipFeign.updateBargeOperation(tmsshipBargeOperation);
+    }
+
+    @PostMapping("addBargeOperation")
+    @ApiOperation(value = "新增驳船")
+    RESTfulResult addBargeOperation(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addBargeOperation(map);
+    }
+
+    @PostMapping("addTmsShipEntryWharyResult")
+    @ApiOperation(value = "新增抵港")
+    RESTfulResult addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal) {
+        return tmsshipFeign.addTmsShipEntryWharyResult(mapVal);
+    }
+
+    @PostMapping("addTmsShipOutWharyResult")
+    @ApiOperation(value = "新增离港")
+    RESTfulResult addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal) {
+        return tmsshipFeign.addTmsShipOutWharyResult(mapVal);
+    }
+
+    /**
+     * 装船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadShipList")
+    @ApiOperation(value = "展示装船")
+    public RESTfulResult getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getLoadShipList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getLoadShip/{resultId}")
+    @ApiOperation(value = "查询装船")
+    RESTfulResult getLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getLoadShip(resultId);
+    }
+
+    @PostMapping("selectLoadShip/{resultId}")
+    @ApiOperation(value = "通过id查询装船")
+    RESTfulResult selectLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectLoadShip(resultId);
+    }
+
+    @PostMapping("deleteLoadShip/{resultId}")
+    @ApiOperation(value = "逻辑删除装船")
+    RESTfulResult deleteLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteLoadShip(resultId);
+    }
+
+    @PostMapping("updateLoadShip")
+    @ApiOperation(value = "修改装船")
+    RESTfulResult updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult) {
+        return tmsshipFeign.updateLoadShip(tmsshipLoadShipResult);
+    }
+
+    @PostMapping("addLoadShip")
+    @ApiOperation(value = "新增装船")
+    RESTfulResult addLoadShip(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addLoadShip(map);
+    }
+
+    /**
+     * 位置作业
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getShipLocationList")
+    @ApiOperation(value = "展示位置作业")
+    public RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipLocationList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getShipLocation/{locationId}")
+    @ApiOperation(value = "查询位置作业")
+    RESTfulResult getShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.getShipLocation(locationId);
+    }
+
+    @PostMapping("selectShipLocation/{locationId}")
+    @ApiOperation(value = "通过id查询位置作业")
+    RESTfulResult selectShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.selectShipLocation(locationId);
+    }
+
+    @PostMapping("deleteShipLocation/{locationId}")
+    @ApiOperation(value = "逻辑删除位置作业")
+    RESTfulResult deleteShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        return tmsshipFeign.deleteShipLocation(locationId);
+    }
+
+    @PostMapping("updateShipLocation")
+    @ApiOperation(value = "修改位置作业")
+    RESTfulResult updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation) {
+        return tmsshipFeign.updateShipLocation(tmsshipShipLocation);
+    }
+
+    @PostMapping("addShipLocation")
+    @ApiOperation(value = "新增位置作业")
+    RESTfulResult addShipLocation(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addShipLocation(map);
+    }
+
+    /**
+     * 水路货物运单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("listAllOrders")
+    @ApiOperation(value = "展示水路货物运单")
+    public RESTfulResult listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.listAllOrders(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 展示船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getCapacityList")
+    @ApiOperation(value = "展示船只信息")
+    public RESTfulResult getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 卸船作业
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getUnLoadShipList")
+    @ApiOperation(value = "展示卸船作业信息列表")
+    public RESTfulResult getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getUnLoadShipList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getUnloadShip/{resultId}")
+    @ApiOperation(value = "查询卸船作业")
+    RESTfulResult getUnloadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getUnloadShip(resultId);
+    }
+
+    @PostMapping("selectUnLoadShip/{resultId}")
+    @ApiOperation(value = "通过id查询卸船作业")
+    RESTfulResult selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectUnLoadShip(resultId);
+    }
+
+    @PostMapping("deleteUnLoadShip/{resultId}")
+    @ApiOperation(value = "逻辑删除卸船作业")
+    RESTfulResult deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteUnLoadShip(resultId);
+    }
+
+    @PostMapping("updateUnLoadShip")
+    @ApiOperation(value = "修改卸船作业")
+    RESTfulResult updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult) {
+        return tmsshipFeign.updateUnLoadShip(tmsshipUnloadShipResult);
+    }
+
+    @PostMapping("addUnLoadShip")
+    @ApiOperation(value = "新增卸船作业")
+    RESTfulResult addUnLoadShip(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addUnLoadShip(map);
+    }
+
+    /**
+     * 水分质检
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getWaterQualityResultList")
+    @ApiOperation(value = "展示水分质检信息列表")
+    public RESTfulResult getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getWaterQualityResultList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getWaterQuality/{resultId}")
+    @ApiOperation(value = "查询水分质检")
+    RESTfulResult getWaterQuality(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.getWaterQuality(resultId);
+    }
+
+    @PostMapping("selectWaterQualityResult/{resultId}")
+    @ApiOperation(value = "通过id查询水分质检")
+    RESTfulResult selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.selectWaterQualityResult(resultId);
+    }
+
+    @PostMapping("deleteWaterQualityResult/{resultId}")
+    @ApiOperation(value = "逻辑删除水分质检")
+    RESTfulResult deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
+        return tmsshipFeign.deleteWaterQualityResult(resultId);
+    }
+
+    @PostMapping("updateWaterQualityResult")
+    @ApiOperation(value = "修改水分质检")
+    RESTfulResult updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult) {
+        return tmsshipFeign.updateWaterQualityResult(tmsshipWaterQualityResult);
+    }
+
+    @PostMapping("addWaterQualityResult")
+    @ApiOperation(value = "新增水分质检")
+    RESTfulResult addWaterQualityResult(@RequestBody Map<String, Object> map) {
+        return tmsshipFeign.addWaterQualityResult(map);
+    }
+
+    /**
+     * 船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getCapacities")
+    @ApiOperation(value = "展示船只信息列表")
+    public RESTfulResult getCapacities(BigDecimal instructionsId,
+                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getCapacities(instructionsId, mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getInstructionsCapacity/{instructionsCapacityId}")
+    @ApiOperation(value = "查询船只信息")
+    RESTfulResult getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
+        return tmsshipFeign.getInstructionsCapacity(instructionsCapacityId);
+    }
+
+    @PostMapping("deleteInstructionsCapacity/{instructionsCapacityId}")
+    @ApiOperation(value = "逻辑删除船只信息")
+    RESTfulResult deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
+        return tmsshipFeign.deleteInstructionsCapacity(instructionsCapacityId);
+    }
+
+    @PostMapping("updateInstructionsCapacity")
+    @ApiOperation(value = "修改船只信息")
+    RESTfulResult updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
+        return tmsshipFeign.updateInstructionsCapacity(omsshipInstructionsCapacity);
+    }
+
+    @PostMapping("addInstructionsCapacity")
+    @ApiOperation(value = "新增船只信息")
+    RESTfulResult addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity) {
+        return tmsshipFeign.addInstructionsCapacity(omsshipInstructionsCapacity);
+    }
+
+    /**
+     * 装船指令
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getShipMentInstructionsList")
+    @ApiOperation(value = "展示装船指令列表")
+    public RESTfulResult getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsshipFeign.getShipMentInstructionsList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @PostMapping("getShipmentInstructions/{instructionsId}")
+    @ApiOperation(value = "查询装船指令")
+    RESTfulResult getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId) {
+        return tmsshipFeign.getShipmentInstructions(instructionsId);
+    }
+
+    @PostMapping("deleteByPrimaryKey/{instructionsId}")
+    @ApiOperation(value = "逻辑删除装船指令")
+    RESTfulResult deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId) {
+        return tmsshipFeign.deleteByPrimaryKey(instructionsId);
+    }
+
+    @PostMapping("updateIssueStatus/{shipmentInstructionsId}")
+    @ApiOperation(value = "修改状态")
+    RESTfulResult updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId) {
+        return tmsshipFeign.updateIssueStatus(shipmentInstructionsId);
+    }
+
+    @PostMapping("updateShipmentInstructions")
+    @ApiOperation(value = "修改装船指令")
+    RESTfulResult updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
+        return tmsshipFeign.updateShipmentInstructions(omsshipShipmentInstructions);
+    }
+
+    @PostMapping("addShipmentInstructions")
+    @ApiOperation(value = "新增装船指令")
+    RESTfulResult addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions) {
+        return tmsshipFeign.addShipmentInstructions(omsshipShipmentInstructions);
+    }
+    /*======================================火运==========================================*/
+
+    //************************************TmstrainLoadingResultController********************
+    @ApiOperation(value="查询装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(58)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainWagonLoad")
+    public RESTfulResult getTmstrainWagonLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="新增车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
+    })
+    @PostMapping(value = "/insertTmstrainLoadingResult")
+    public RESTfulResult insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map){
+        return tmsTrainFeign.insertTmstrainLoadingResult(map);
+    }
+
+
+    @ApiOperation(value="通过主键查询车皮装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getTmstrainLoadingResultByResultId/{resultId}")
+    public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId){
+        return tmsTrainFeign.getTmstrainLoadingResultByResultId(resultId);
+    }
+
+    @ApiOperation(value="通过主键修改车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainLoadingResult", value = "修改车皮装车map", required = false, dataType = "TmstrainWagonLoadResult")
+    })
+    @PostMapping(value = "/upadteTmstrainLoadingResultByResultId")
+    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsTrainFeign.upadteTmstrainLoadingResultByResultId(map);
+    }
+
+    @ApiOperation(value="通过主键删除车皮装车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteTmstrainLoadingResultByResultId")
+    public RESTfulResult deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId){
+        return tmsTrainFeign.deleteTmstrainLoadingResultByResultId(resultId);
+    }
+
+    //********************下拉框**********************
+
+    @ApiOperation(value="获取发站地点名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getSendStationName")
+    public RESTfulResult getSendStationName(){
+        return tmsTrainFeign.getSendStationName();
+    }
+
+    @ApiOperation(value="获取到站地点名称")
+    @GetMapping(value = "/getArrivalStationName")
+    public RESTfulResult getArrivalStationName(){
+        return tmsTrainFeign.getArrivalStationName();
+    }
+
+    @ApiOperation(value="获取批次ID")
+    @GetMapping(value = "/getBatchId")
+    public RESTfulResult getBatchId(){
+        return tmsTrainFeign.getBatchId();
+    }
+
+    @ApiOperation(value="获取装车车皮号")
+    @GetMapping(value = "/getWagonNo")
+    public RESTfulResult getWagonNo(){
+        return tmsTrainFeign.getWagonNo();
+    }
+
+
+
+    @ApiOperation(value="查询卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(60)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainWagonUnLoad")
+    public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize){
+        return tmsTrainFeign.getTmstrainWagonUnLoad(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过主键删除车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unloadingId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/deleteTmstrainWagonUnLoadResultByUnLoadingId")
+    public RESTfulResult deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId){
+        return tmsTrainFeign.deleteTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+    }
+
+    @ApiOperation(value="新增车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
+    })
+    @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
+    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult){
+        return tmsTrainFeign.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
+    }
+
+    @ApiOperation(value="通过主键修改车皮卸车作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
+    })
+    @PostMapping(value = "/upadteTmstrainWagonUnLoadResultByUnLoadingId")
+    public RESTfulResult upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult){
+        return tmsTrainFeign.upadteTmstrainWagonUnLoadResultByUnLoadingId(tmstrainWagonUnloadResult);
+    }
+
+    @ApiOperation(value="查看火运实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(65)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/getTmstrainresult")
+    public RESTfulResult getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize){
+        return tmsTrainFeign.getTmstrainresult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过主键查询车皮卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unloadingId", value = "车皮卸车主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
+    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId) {
+        return tmsTrainFeign.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+    }
+
+        //下拉框
+    @ApiOperation(value="获取卸车地点名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getUnloadingPointName")
+    public RESTfulResult getUnloadingPointName(){
+        return tmsTrainFeign.getUnloadingPointName();
+    }
+
+    @ApiOperation(value="获取卸车路径名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/getUnloadingRouteName")
+    public RESTfulResult getUnloadingRouteName(){
+        return tmsTrainFeign.getUnloadingRouteName();
+    }
+
+        /*======================================汽运==========================================*/
+
+    @ApiOperation(value="查询运输预约")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(79)", 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("/getAllPurPlan")
+    public RESTfulResult getAllPurPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer status) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsTruckFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status);
+    }
+
+    /*
+    不知道谁写的
+     */
+    @PostMapping("/getAllPurPlan/{apiId}")
+    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+                                            @RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsTruckFeign.getDetailListByCon(apiId, mapValue, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getPurPlanById/{planId}")
+    public RESTfulResult getWagonPleaseById(@PathVariable("planId") Integer planId) {
+        return tmsTruckFeign.getWagonPleaseById(planId);
+    }
+
+    @ApiOperation(value = "新增运输计划 状态：0")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
+    })
+    @PostMapping("/addPurPlan")
+    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map) {
+        return tmsTruckFeign.addPurPlan(map);
+    }
+
+    @ApiOperation(value = "下发运输计划 状态：1")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendPurPlan/{planId}")
+    public RESTfulResult sendPurPlan(@PathVariable("planId") Integer planId) {
+        return tmsTruckFeign.sendPurPlan(planId);
+    }
+
+    @ApiOperation(value = "接收运输计划 状态：2")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/receptionPurPlan/{planId}")
+    public RESTfulResult receptionPurPlan(@PathVariable("planId") Integer planId) {
+        return tmsTruckFeign.receptionPurPlan(planId);
+    }
+
+    @ApiOperation(value = "逻辑删除运输计划 状态：3")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deletePurPlan/{planId}")
+    public RESTfulResult deletePurPlan(@PathVariable("planId") Integer planId) {
+        return tmsTruckFeign.deletePurPlan(planId);
+    }
+
+    //**************************************************************************************
+    @ApiOperation(value = "查询要分派的计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(82)", 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("/getDecomposedPlan")
+    public RESTfulResult getDecomposedPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer planId,
+                                           Integer status) {
+        return tmsTruckFeign.getDecomposedPlan(mapValue, apiId, pageNum, pageSize, planId, status);
+    }
+
+
+    //********************************************omsTruckOrderController*****************************
+
+    @ApiOperation(value = "查询所有运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(86)", 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("/getAllTruckOrder")
+    public RESTfulResult getAllTruckOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer orderStatus,
+                                          Integer planId,
+                                          Integer orderType) {
+        return tmsTruckFeign.getAllTruckOrder(mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType);
+    }
+
+    @ApiOperation(value = "不适用表头返回数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/getAllTruckOrderReturnListMap")
+    public RESTfulResult getAllTruckOrder(Integer orderStatus, Integer planId, Integer orderType) {
+        return tmsTruckFeign.getAllTruckOrder(orderStatus, planId, orderType);
+    }
+
+    @ApiOperation(value = "查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacity")
+    public RESTfulResult getAllCapacity(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer carrierId
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return tmsTruckFeign.getAllCapacity(mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+    @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addPurOrder")
+    public RESTfulResult addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTruckFeign.addPurOrder(mapValue);
+    }
+    // == null ? new HashMap<>() : mapValue
+
+
+    @ApiOperation(value = "修改分派计划")
+    @PostMapping("/updateOrder")
+    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map) {
+        return tmsTruckFeign.updateOrder(map);
+    }
+
+
+    @ApiOperation(value = "派单")
+    @PostMapping("/dispatchOrder/{orderId}")
+    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId) {
+        return tmsTruckFeign.dispatchOrder(orderId);
+    }
+
+    @ApiOperation(value = "逻辑删除运单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/deleteOrder")
+    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     Integer planId) {
+        return tmsTruckFeign.deleteOrder(map, planId);
+    }
+
+    @ApiOperation(value = "司机接收、拒绝接单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/driverReceiveOrRefuse/{orderId}")
+    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
+        return tmsTruckFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
+    }
+
+
+    @ApiOperation(value="司机接单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               @PathVariable Integer orderReceiveStatus,
+                                               Integer orderType,
+                                               Integer orderStatus
+    ){
+        return tmsTruckFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
+                                                    pageSize, orderReceiveStatus, orderType, orderStatus);
+    }
+
+
+    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/sendMesToDriver")
+    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
+        return tmsTruckFeign.sendMesToDriver(capacityNumber, orderStatus);
+    }
+
+    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "capacityNumber", value = "车牌号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getRefuseOrderByCapacityNum")
+    public RESTfulResult sendMesToDriver(String capacityNumber){
+        return tmsTruckFeign.sendMesToDriver(capacityNumber);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getOrderMesByOrderNum/{orderId}")
+    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.getOrderMesByOrderNum(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectPlaceAndTime/{orderId}")
+    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.selectPlaceAndTime(orderId);
+    }
+
+    @ApiOperation(value="通过运输订单ID查询运单信息")
+    @PostMapping("/selectOrderByOrderId/{orderId}")
+    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.selectOrderByOrderId(orderId);
+    }
+
+    @ApiOperation(value="查看运输派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              @PathVariable Integer orderReceiveStatus,
+                                              Integer orderType,
+                                              Integer orderStatus){
+        return tmsTruckFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                                            orderReceiveStatus, orderType, orderStatus);
+    }
+
+    //******************************************TmstruckLoadResultController***********************************
+
+    @ApiOperation(value="查询所有装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllLoadResult")
+    public RESTfulResult getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer status ){
+        return tmsTruckFeign.getAllLoadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, status);
+    }
+
+    @ApiOperation(value="新增汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLoadResult")
+    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        return  tmsTruckFeign.addLoadResult(mapValue);
+    }
+
+    @ApiOperation(value="修改汽车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
+    })
+    @PostMapping("/updateLoadResult")
+    public RESTfulResult updateLoadResult(@RequestBody Map<String, Object> map){
+        return tmsTruckFeign.updateLoadResult(map);
+    }
+
+    @ApiOperation(value="通过ID查询装车实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLoadResultById/{resultId}")
+    public RESTfulResult getLoadResultById(@PathVariable("resultId") Integer resultId){
+        return tmsTruckFeign.getLoadResultById(resultId);
+    }
+
+    @ApiOperation(value="逻辑删除车装车实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmstruckLoadResult", value = "装车作业实绩对象", required = false, dataType = "TmstruckLoadResult"),
+    })
+    @PostMapping("/deleteLoadResult/{resultId}")
+    public RESTfulResult deleteLoadResult(@PathVariable("resultId")Integer resultId){
+        return tmsTruckFeign.deleteLoadResult(resultId);
+    }
+
+    //***************************************TmstruckEnfactoryResultController***************************
+
+    @ApiOperation(value="查询所有的进厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(99)", 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("/getAllEnFactoryResult")
+    public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return tmsTruckFeign.getAllEnFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addEnFactoryResult")
+    public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        return tmsTruckFeign.addEnFactoryResult(mapValue);
+    }
+
+    @ApiOperation(value="PDA扫描更新进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateEnactoryResult")
+    public RESTfulResult updateEnactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        return tmsTruckFeign.updateEnactoryResult(mapValue);
+    }
+
+    //***************************************TmstruckWeightResultController***************************
+    @ApiOperation(value="查询计毛实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(102)", 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("/getAllJiMaoResult")
+    public RESTfulResult getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize){
+        return tmsTruckFeign.getAllJiMaoResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="查询计皮实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(104)", 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("/getAllJiPiResult")
+    public RESTfulResult getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize) {
+        return tmsTruckFeign.getAllJiPiResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    @ApiOperation(value="采集新增计毛实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addJiMaoResult")
+    public RESTfulResult addJiMaoResult(@RequestBody Map<String, Object> mapValue){
+        return tmsTruckFeign.addJiMaoResult(mapValue);
+    }
+
+    @ApiOperation(value="采集新增计皮实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "采集的数据", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addJiPiResult")
+    public RESTfulResult addJiPiResult(@RequestBody Map<String, Object> mapValue){
+        return tmsTruckFeign.addJiPiResult(mapValue);
+    }
+
+    //****************************************TmstruckUnloadResultController*******************************
+
+    @ApiOperation(value="查询卸货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(103)", 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("/getUnloadResult")
+    public RESTfulResult getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize
+    ){
+        return tmsTruckFeign.getUnloadResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="更新卸货实绩 实际上是更新实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addUnloadResult")
+    public RESTfulResult addUnloadResult(@RequestBody Map<String, Object> mapValue){
+        return tmsTruckFeign.addUnloadResult(mapValue);
+    }
+
+    //****************************************TmstruckReceiptResultController*******************************
+
+
+    @ApiOperation(value="查询收货实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(107)", 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("/getReceiveResult")
+    public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize
+    ){
+        return tmsTruckFeign.getReceiveResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+
+    //****************************************TmstruckLeaveFactoryResultController*******************************
+
+
+    @ApiOperation(value="查询出厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(110)", 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("/getLeaveFactoryResult")
+    public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize
+    ){
+        return tmsTruckFeign.getLeaveFactoryResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="PAD扫描汽车出厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLeaveFactoryResult")
+    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        return tmsTruckFeign.addLeaveFactoryResult(mapValue);
+    }
+
+    //****************************************TmstruckMeasureCommissionController*******************************
+
+    @ApiOperation(value="查询计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllMeasureCommission/{type}")
+    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type){
+        return tmsTruckFeign.getAllMeasureCommission(type);
+    }
+
+    //****************************************TmstruckQualityResultController*******************************
+
+    @ApiOperation(value="查询所有的质检作业")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(111)", 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("/getQualityResult")
+    public RESTfulResult getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize
+    ){
+        return tmsTruckFeign.getQualityResult(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value="通过ID获取质检实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQualityResultById/{resultId}")
+    public RESTfulResult getQualityResultById(@PathVariable("resultId") Integer resultId){
+        return tmsTruckFeign.getQualityResultById(resultId);
+    }
+
+    @ApiOperation(value="修改质检实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "质检作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/updateQualityResult")
+    public RESTfulResult updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        return tmsTruckFeign.updateQualityResult(mapValue);
+    }
+
+
+
+}

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

@@ -0,0 +1,139 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.WMSHFeign;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/12 9:54
+ * @Version:V2.0
+ */
+public class WMSHController extends BaseRESTfulController {
+
+    @Autowired
+    WMSHFeign wmshFeign;
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getUnloadPortStockList")
+    @ApiOperation(value = "展示下游港口港存库库存列表")
+    public RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getUnloadPortStockList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 展示万州港港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadPortStockList")
+    @ApiOperation(value = "展示万州港港存库库存列表")
+    public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getInBoundResult")
+    @ApiOperation(value = "查询所有港存库入库实绩")
+    public RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getInBoundResult(mapValue, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 查询所有港存库出库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getOutBoundResult")
+    @ApiOperation(value = "查询所有港存库入库实绩")
+    public RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getOutBoundResult(mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("getResultById/{resultId}")
+    @ApiOperation(value = "通过实绩Id查询实绩")
+    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId) {
+        return wmshFeign.getResultById(resultId);
+    }
+
+    @PostMapping("deleteWareHosingResult/{resultId}")
+    @ApiOperation(value = "逻辑删除港存库入库实绩")
+    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId) {
+        return wmshFeign.deleteWareHosingResult(resultId);
+    }
+
+    @PostMapping("updateWareHosingResult")
+    @ApiOperation(value = "修改港存库入库实绩")
+    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.updateWareHosingResult(wmshInboundResult);
+    }
+
+    @PostMapping("addWarehousingResult")
+    @ApiOperation(value = "添加港存库入库实绩")
+    RESTfulResult addWarehousingResult(@RequestBody Map<String, Object> wmshInboundResult) {
+        return wmshFeign.addWarehousingResult(wmshInboundResult);
+    }
+
+    @PostMapping("addResult")
+    @ApiOperation(value = "添加港存库出库实绩")
+    RESTfulResult addResult(@RequestBody Map<String, Object> map) {
+        return wmshFeign.addResult(map);
+    }
+}

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

@@ -0,0 +1,452 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-AMS-API-DEV", url = "${openfeign.AmsFeign.url}")
+public interface AmsFeign {
+
+    /**
+     * 展示违约规则
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/getBreachList")
+    RESTfulResult getBreachList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("apiId") Integer apiId);
+
+    /**
+     * 新增违约规则
+     *
+     * @param amsContractBreach
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/addContractBreach")
+    RESTfulResult addContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+
+    /**
+     * 逻辑删除违约规则
+     *
+     * @param breachId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/deleteContractBreach/{breachId}")
+    RESTfulResult deleteContractBreach(@PathVariable("breachId") BigDecimal breachId);
+
+    /**
+     * 通过违约id查询
+     *
+     * @param breachId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/selectBreachToUpdate/{breachId}")
+    RESTfulResult selectBreachToUpdate(@PathVariable("breachId") BigDecimal breachId);
+
+    /**
+     * 修改违约规则
+     *
+     * @param amsContractBreach
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractbreach/updateContractBreach")
+    RESTfulResult updateContractBreach(@RequestBody Map<String, Object> amsContractBreach);
+
+    /**
+     * 展示港口装卸单价列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/getLoadUnloadPriceList")
+    RESTfulResult getLoadUnloadPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId);
+
+    /**
+     * 新增港口装卸单价
+     *
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/addLoadUnloadPrice")
+    RESTfulResult addLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+
+    /**
+     * 逻辑删除港口装卸单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/deleteLoadUnloadPrice/{priceId}")
+    RESTfulResult deleteLoadUnloadPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/selectLoadUnloadPriceToUpdate/{priceId}")
+    RESTfulResult selectLoadUnloadPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改港口装卸单价
+     *
+     * @param amsContractOtherPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontractotherprices/updateLoadUnloadPrice")
+    RESTfulResult updateLoadUnloadPrice(@RequestBody Map<String, Object> amsContractOtherPrice);
+
+
+    /**
+     * 展示火运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/getTrainPriceList")
+    RESTfulResult getTrainPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam Integer apiId);
+
+    /**
+     * 新增火运单价
+     *
+     * @param amsContractTrainPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/addTrainPrice")
+    RESTfulResult addTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+
+    /**
+     * 逻辑删除火运单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/deleteTrainPrice/{priceId}")
+    RESTfulResult deleteTrainPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/selectTrainPriceToUpdate/{priceId}")
+    RESTfulResult selectTrainPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改火运单价
+     *
+     * @param amsContractTrainPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttrainprices/updateTrainPrice")
+    RESTfulResult updateTrainPrice(@RequestBody Map<String, Object> amsContractTrainPrice);
+
+
+    /**
+     * 展示水运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getShipPriceList")
+    RESTfulResult getShipPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
+
+    /**
+     * 新增水运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addShipPrice")
+    RESTfulResult addShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 逻辑删除运费单价
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteShipPrice/{priceId}")
+    RESTfulResult deleteShipPrice(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 修改水运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateShipPrice")
+    RESTfulResult updateShipPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 通过单价id查询
+     *
+     * @param priceId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/selectPriceToUpdate/{priceId}")
+    RESTfulResult selectPriceToUpdate(@PathVariable("priceId") BigDecimal priceId);
+
+    /**
+     * 展示汽运单价
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getTruckPriceList")
+    RESTfulResult getTruckPriceList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam Integer apiId);
+
+    /**
+     * 新增汽运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportPrice")
+    RESTfulResult addAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 修改汽运单价
+     *
+     * @param amsContractTransportPrice
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportPrice")
+    RESTfulResult updateAmsContractTransportPrice(@RequestBody Map<String, Object> amsContractTransportPrice);
+
+    /**
+     * 油价联动导致运价变动，批量修改运价
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
+    RESTfulResult batchUpdateTransportPriceByOilPrice();
+
+    /**
+     * 展示采购订单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amspurchaseorders/getPurchaseOrderList")
+    RESTfulResult getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @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);
+}

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

@@ -0,0 +1,259 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSSHIP-API-DEV", url = "${openfeign.BmsshipFeign.url}")
+public interface BmsshipFeign {
+
+    /**
+     * 展示港口装卸费
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getPortHandlingFeeList")
+    RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId);
+
+    /**
+     * 展示批次信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBatch")
+    RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
+                           @RequestParam Integer pageNum,
+                           @RequestParam Integer pageSize,
+                           @RequestParam Integer apiId);
+
+    /**
+     * 生成港口装卸费
+     *
+     * @param portHandlingFee
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addPortHandlingFee")
+    RESTfulResult addPortHandlingFee(@RequestBody Map<String, Object> portHandlingFee) throws Exception;
+
+    /**
+     * 修改港口装卸费信息
+     *
+     * @param portHandlingFee
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/updatePortHandlingFee")
+    RESTfulResult updatePortHandlingFee(@RequestBody Map<String, Object> portHandlingFee);
+
+    /**
+     * 查询修改港口装卸费数据渲染表单
+     *
+     * @param feeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getFeeToUpdate/{feeId}")
+    RESTfulResult getFeeToUpdate(@PathVariable("feeId") BigDecimal feeId);
+
+    /**
+     * 逻辑删除港口装卸费
+     *
+     * @param feeId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFee/{feeId}")
+    RESTfulResult deletePortHandlingFee(@PathVariable("feeId") String feeId);
+
+    /**
+     * 展示水运详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getDetailsOrderList")
+    RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId);
+
+    /**
+     * 展示未生成账单的详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getUncomplateDetailsOrderList")
+    RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize,
+                                                @RequestParam Integer apiId);
+
+    /**
+     * 生成水运计费详单
+     *
+     * @param resultId
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/addDetailsOrder/{resultId}")
+    RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception;
+
+
+    /**
+     * 展示水运费和水分质检费账单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementList")
+    RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
+
+    /**
+     * 展示途损费账单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getLossStatementList")
+    RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+
+    /**
+     * 展示水分质检实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getWaterResult")
+    RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer apiId);
+
+    /**
+     * 生成水运费账单
+     *
+     * @param mapList
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addStatement")
+    RESTfulResult addStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
+
+    /**
+     * 生成水分质检账单
+     *
+     * @param mapList
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addWaterStatement")
+    RESTfulResult addWaterStatement(@RequestBody List<Map<String, Object>> mapList) throws Exception;
+
+    /**
+     * 生成途损账单
+     *
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addLossStatement")
+    RESTfulResult addLossStatement(@RequestBody Map<String, Object> map) throws Exception;
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param batchId
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementDetailsOrderList")
+    RESTfulResult getStatementDetailsOrderList(@RequestParam BigDecimal batchId,
+                                               @RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId);
+
+    /**
+     * 展示详单下的船运实绩
+     *
+     * @param batchId
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getShipResult")
+    RESTfulResult getShipResult(@RequestParam BigDecimal batchId,
+                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize,
+                                @RequestParam Integer apiId);
+
+    /**
+     * 查询水运费计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getShipFeesFormula")
+    RESTfulResult getShipFeesFormula();
+
+    /**
+     * 查询途损费计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getLossFeesFormula")
+    RESTfulResult getLossFeesFormula();
+
+    /**
+     * 查询水分质检计算公式
+     *
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmsship/bmsshipformulas/getWaterFeesFormula")
+    RESTfulResult getWaterFeesFormula();
+}

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

@@ -0,0 +1,127 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:BmsshipFeign
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSTRAIN-API-DEV", url = "${openfeign.BmstrainFeign.url}")
+public interface BmstrainFeign {
+
+    /**
+     * 展示火运详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainDetailsOrderList")
+    RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+
+    /**
+     * 展示未转账单的火运详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getUncomplateTrainDetailsList")
+    RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize,
+                                                @RequestParam Integer apiId);
+
+    /**
+     * 展示火运实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainResultList")
+    RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId);
+
+    /**
+     * 生成火运详单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/addTrainDetails")
+    RESTfulResult addTrainDetails(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示火运账单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getTrainStatementList")
+    RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 展示火运实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @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);
+
+    /**
+     * 展示账单下的详单
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
+    RESTfulResult getComplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId);
+
+    /**
+     * 生成火运费账单
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/addTrainStatement")
+    RESTfulResult addTrainStatement(@RequestBody Map<String, Object> map);
+
+}

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

@@ -0,0 +1,59 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSTRUCK-API-DEV", url = "${openfeign.BmstruckFeign.url}")
+public interface BmstruckFeign {
+
+    /**
+     * 展示汽运详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckDetailsOrderList")
+    RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+
+    /**
+     * 展示汽运实绩信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckResultList")
+    RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam BigDecimal orderId);
+
+    /**
+     * 新增汽运详单
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
+    RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+}

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.1.241:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

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

@@ -0,0 +1,140 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 17:19
+ */
+
+@FeignClient(name = "dil-trick-queue-dev", url = "${openfeign.QmsTruckFeign.url}")
+public interface QmsTruckFeign {
+
+    /*
+    QmsQueueResultController /  QmsQueueListController
+     */
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addQueueResult")
+    public RESTfulResult addQueueResult(String orderNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/addQueueList")
+    public RESTfulResult addQueueList(@RequestBody(required = false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
+    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize
+    );
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
+    public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
+    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("gridId") Integer gridId
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/changeQueue")
+    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
+    public RESTfulResult getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCancel")
+    public RESTfulResult queueCancel(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
+    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancelByResultId/{resultId}")
+    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateQueueCancel")
+    public RESTfulResult updateQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueCutInLine")
+    public RESTfulResult queueCutInLine(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueInsert")
+    public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/queueEndByPDA")
+    public RESTfulResult queueEnd(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
+    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/capacityMonitor")
+    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/listMonitor")
+    public RESTfulResult listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+                                     @RequestParam("apiId") Integer apiId,
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize
+    );
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueStatusList")
+    public RESTfulResult getQueueStatusList();
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getOrderReceive/{capacityNumber}")
+    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/cancelQueue")
+    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue);
+}

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

@@ -0,0 +1,109 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+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.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/1 16:19
+ */
+
+@FeignClient(name = "dil-tms-train-dev", url = "${openfeign.TmsTrainFeign.url}6")
+public interface TmsTrainFeign {
+
+/*
+    TmstrainLoadingResultController
+ */
+
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoad")
+    public RESTfulResult getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
+    public RESTfulResult insertTmstrainLoadingResult(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/getTmstrainLoadingResultByResultId/{resultId}")
+    public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/upadteTmstrainLoadingResultByResultId")
+    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/deleteTmstrainLoadingResultByResultId")
+    public RESTfulResult deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId);
+
+    //下拉框
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getSendStationName")
+    public RESTfulResult getSendStationName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getArrivalStationName")
+    public RESTfulResult getArrivalStationName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getBatchId")
+    public RESTfulResult getBatchId();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo")
+    public RESTfulResult getWagonNo();
+
+
+    /*
+    TmstrainWagonUnloadResultController
+     */
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoad")
+    public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
+    public RESTfulResult deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/insertTmstrainWagonUnLoadResult")
+    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/upadteTmstrainWagonUnLoadResultByUnLoadingId")
+    public RESTfulResult upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) Map<String, Object> tmstrainWagonUnloadResult);
+
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainresult")
+    public RESTfulResult getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize);
+
+
+    @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
+    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId);
+
+
+        //下拉框
+    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingPointName")
+    public RESTfulResult getUnloadingPointName();
+
+
+    @GetMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/getUnloadingRouteName")
+    public RESTfulResult getUnloadingRouteName();
+}

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

@@ -0,0 +1,291 @@
+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;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/9/28 9:30
+ */
+
+@FeignClient(name = "dil-tms-truck-dev", url = "${openfeign.TmsTruckFeign.url}")
+public interface TmsTruckFeign {
+
+    /*
+        AmstruckPurplanController中所有接口
+     */
+    @PostMapping("api/v1/truckTms/amstruckpurplans/getAllPurPlan")
+    RESTfulResult getAllPurPlan(@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/truckTms/amstruckpurplans/getAllPurPlan/{apiId}")
+    public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
+                                            @RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("pageNum")Integer pageNum,
+                                            @RequestParam("pageSize")Integer pageSize,
+                                            @RequestParam("con")String con);
+
+    @PostMapping ("api/v1/truckTms/amstruckpurplans/getPurPlanById/{planId}")
+    public RESTfulResult getWagonPleaseById(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/addPurPlan")
+    public RESTfulResult addPurPlan(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/sendPurPlan/{planId}")
+    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/receptionPurPlan/{planId}")
+    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId);
+
+
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/deletePurPlan/{planId}")
+    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId);
+
+    @PostMapping("api/v1/truckTms/amstruckpurplans/getDecomposedPlan")
+    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("planId") Integer planId,
+                                           @RequestParam("status") Integer status);
+
+
+    /*
+    OmstruckOrderController
+     */
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrder")
+    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam("orderStatus") Integer orderStatus,
+                                          @RequestParam("planId") Integer planId,
+                                          @RequestParam("orderType") Integer orderType);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllTruckOrderReturnListMap")
+    public RESTfulResult getAllTruckOrder(
+            @RequestParam("orderStatus") Integer orderStatus,
+            @RequestParam("planId") Integer planId,
+            @RequestParam("orderType") Integer orderType);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getAllCapacity")
+    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("carrierId") Integer carrierId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/addPurOrder")
+    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/updateOrder")
+    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/dispatchOrder/{orderId}")
+    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/deleteOrder")
+    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
+                                     @RequestParam("planId") Integer planId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/driverReceiveOrRefuse/{orderId}")
+    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
+                                               @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
+    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
+                                               @RequestParam("orderType") Integer orderType,
+                                               @RequestParam("orderStatus") Integer orderStatus);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/sendMesToDriver")
+    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
+                                         @RequestParam("orderStatus") Integer orderStatus);
+
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getRefuseOrderByCapacityNum")
+    public RESTfulResult sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber);
+
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getOrderMesByOrderNum/{orderId}")
+    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/selectPlaceAndTime/{orderId}")
+    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/selectOrderByOrderId/{orderId}")
+    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
+
+    @PostMapping("api/v1/truckTms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
+                                              @RequestParam("orderType") Integer orderType,
+                                              @RequestParam("orderStatus") Integer orderStatus);
+
+    /*
+    TmstruckLoadResultController
+     */
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
+    public RESTfulResult getAllLoadResult(@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/truckTms/tmstruckloadresults/addLoadResult")
+    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadResult")
+    public RESTfulResult updateLoadResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getLoadResultById/{resultId}")
+    public RESTfulResult getLoadResultById(@PathVariable("resultId") Integer resultId);
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/deleteLoadResult/{resultId}")
+    public RESTfulResult deleteLoadResult(@PathVariable("resultId")Integer resultId);
+    /*
+        TmstruckEnfactoryResultController
+     */
+
+    @ApiOperation(value="查询所有的进厂实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(99)", 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("api/v1/truckTms/tmstruckenfactoryresults/getAllEnFactoryResult")
+    public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize
+    );
+
+
+    @ApiOperation(value="通过采集系统传来的数据新增进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/addEnFactoryResult")
+    public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    @ApiOperation(value="PDA扫描更新进厂作业实绩")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+    })
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/updateEnactoryResult")
+    public RESTfulResult updateEnactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    /*
+        TmstruckWeightResultController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiMaoResult")
+    public RESTfulResult getAllJiMaoResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/getAllJiPiResult")
+    public RESTfulResult getAllJiPiResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiMaoResult")
+    public RESTfulResult addJiMaoResult(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/truckTms/tmstruckweightresults/addJiPiResult")
+    public RESTfulResult addJiPiResult(@RequestBody Map<String, Object> mapValue);
+
+
+    /*
+     TmstruckUnloadResultController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/getUnloadResult")
+    public RESTfulResult getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping("api/v1/truckTms/tmstruckunloadresult/addUnloadResult")
+    public RESTfulResult addUnloadResult(@RequestBody Map<String, Object> mapValue);
+
+
+    /*
+    TmstruckReceiptResultController
+     */
+
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiveResult")
+    public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
+
+    /*
+    TmstruckLeaveFactoryResultController
+     */
+
+
+    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/getLeaveFactoryResult")
+    public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               @RequestParam("apiId") Integer apiId,
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize);
+
+    @PostMapping("api/v1/truckTms/tmstruckleavefactoryresults/addLeaveFactoryResult")
+    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue);
+
+
+    /*
+    TmstruckMeasureCommissionController
+     */
+
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/getAllMeasureCommission/{type}")
+    public RESTfulResult getAllMeasureCommission(@PathVariable("type") Integer type);
+
+
+    /*
+    TmstruckQualityResultController
+     */
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResult")
+    public RESTfulResult getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/getQualityResultById/{resultId}")
+    public RESTfulResult getQualityResultById(@PathVariable("resultId") Integer resultId);
+
+
+    @PostMapping("api/v1/truckTms/tmstruckqualityresults/updateQualityResult")
+    public RESTfulResult updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue);
+}
+
+

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

@@ -0,0 +1,479 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-SHIPTMS-API-DEV", url = "${openfeign.TmsshipFeign.url}")
+public interface TmsshipFeign {
+
+    /**
+     * 展示驳船
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperationList")
+    RESTfulResult getBargeOperationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 查询驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/getBargeOperation/{bargeOperationId}")
+    RESTfulResult getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 查询驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/selectBargeOperation/{bargeOperationId}")
+    RESTfulResult selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 删除驳船作业信息
+     *
+     * @param bargeOperationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/deleteBargeOperation/{bargeOperationId}")
+    RESTfulResult deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId);
+
+    /**
+     * 修改驳船作业信息
+     *
+     * @param tmsshipBargeOperation
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/updateBargeOperation")
+    RESTfulResult updateBargeOperation(@RequestBody Map<String, Object> tmsshipBargeOperation);
+
+    /**
+     * 新增驳船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipbargeoperations/addBargeOperation")
+    RESTfulResult addBargeOperation(@RequestBody Map<String, Object> map);
+
+    /**
+     * 新增抵达实绩
+     *
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipentrywharyresults/addTmsShipEntryWharyResult")
+    RESTfulResult addTmsShipEntryWharyResult(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 新增离港实绩
+     *
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipoutwharyresults/addTmsShipOutWharyResult")
+    RESTfulResult addTmsShipOutWharyResult(@RequestBody Map<String, Object> mapVal);
+
+    /**
+     * 展示装船作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShipList")
+    RESTfulResult getLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                  @RequestParam Integer pageNum,
+                                  @RequestParam Integer pageSize,
+                                  @RequestParam Integer apiId);
+
+    /**
+     * 查询装船作业表单
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/getLoadShip/{resultId}")
+    RESTfulResult getLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询装船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/selectLoadShip/{resultId}")
+    RESTfulResult selectLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除装船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/deleteLoadShip/{resultId}")
+    RESTfulResult deleteLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改装船作业信息
+     *
+     * @param tmsshipLoadShipResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateLoadShip")
+    RESTfulResult updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
+
+    /**
+     * 新增装船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/addLoadShip")
+    RESTfulResult addLoadShip(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示位置作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
+    RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId);
+
+    /**
+     * 查询位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocation/{locationId}")
+    RESTfulResult getShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 查询位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/selectShipLocation/{locationId}")
+    RESTfulResult selectShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 删除位置作业信息
+     *
+     * @param locationId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/deleteShipLocation/{locationId}")
+    RESTfulResult deleteShipLocation(@PathVariable("locationId") BigDecimal locationId);
+
+    /**
+     * 修改位置作业信息
+     *
+     * @param tmsshipShipLocation
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/updateShipLocation")
+    RESTfulResult updateShipLocation(@RequestBody Map<String, Object> tmsshipShipLocation);
+
+    /**
+     * 新增位置作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/addShipLocation")
+    RESTfulResult addShipLocation(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示水路货物运单列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/listAllOrders")
+    RESTfulResult listAllOrders(@RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize,
+                                @RequestParam Integer apiId);
+
+    /**
+     * 展示船只信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getCapacityList")
+    RESTfulResult getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                  @RequestParam Integer pageNum,
+                                  @RequestParam Integer pageSize,
+                                  @RequestParam Integer apiId);
+
+    /**
+     * 展示卸船作业信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnLoadShipList")
+    RESTfulResult getUnLoadShipList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam Integer apiId);
+
+    /**
+     * 查询卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/getUnloadShip/{resultId}")
+    RESTfulResult getUnloadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/selectUnLoadShip/{resultId}")
+    RESTfulResult selectUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除卸船作业信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/deleteUnLoadShip/{resultId}")
+    RESTfulResult deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改卸船作业信息
+     *
+     * @param tmsshipUnloadShipResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/updateUnLoadShip")
+    RESTfulResult updateUnLoadShip(@RequestBody Map<String, Object> tmsshipUnloadShipResult);
+
+    /**
+     * 新增卸船作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipunloadshipresults/addUnLoadShip")
+    RESTfulResult addUnLoadShip(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示水分质检信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQualityResultList")
+    RESTfulResult getWaterQualityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId);
+
+    /**
+     * 查询水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/getWaterQuality/{resultId}")
+    RESTfulResult getWaterQuality(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 查询水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/selectWaterQualityResult/{resultId}")
+    RESTfulResult selectWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 删除水分质检信息
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/deleteWaterQualityResult/{resultId}")
+    RESTfulResult deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId);
+
+    /**
+     * 修改水分质检作业信息
+     *
+     * @param tmsshipWaterQualityResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/updateWaterQualityResult")
+    RESTfulResult updateWaterQualityResult(@RequestBody Map<String, Object> tmsshipWaterQualityResult);
+
+    /**
+     * 新增水分质检作业
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshipwaterqualityresults/addWaterQualityResult")
+    RESTfulResult addWaterQualityResult(@RequestBody Map<String, Object> map);
+
+    /**
+     * 展示船只信息列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getCapacities")
+    RESTfulResult getCapacities(@RequestParam BigDecimal instructionsId,
+                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                @RequestParam Integer pageNum,
+                                @RequestParam Integer pageSize,
+                                @RequestParam Integer apiId);
+
+    /**
+     * 新增船只
+     *
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/addInstructionsCapacity")
+    RESTfulResult addInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+
+    /**
+     * 查询船只
+     *
+     * @param instructionsCapacityId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/getInstructionsCapacity/{instructionsCapacityId}")
+    RESTfulResult getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+
+    /**
+     * 逻辑删除船只
+     *
+     * @param instructionsCapacityId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/deleteInstructionsCapacity/{instructionsCapacityId}")
+    RESTfulResult deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId);
+
+    /**
+     * 修改船只信息
+     *
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipinstructionscapacitys/updateInstructionsCapacity")
+    RESTfulResult updateInstructionsCapacity(@RequestBody Map<String, Object> omsshipInstructionsCapacity);
+
+    /**
+     * 展示装船指令
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipMentInstructionsList")
+    RESTfulResult getShipMentInstructionsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId);
+
+    /**
+     * 查询装船指令
+     *
+     * @param instructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/getShipmentInstructions/{instructionsId}")
+    RESTfulResult getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId);
+
+    /**
+     * 查询装船指令
+     *
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateIssueStatus/{shipmentInstructionsId}")
+    RESTfulResult updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId);
+
+    /**
+     * 删除装船指令
+     *
+     * @param instructionsId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/deleteByPrimaryKey/{instructionsId}")
+    RESTfulResult deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId);
+
+    /**
+     * 修改装船指令
+     *
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/updateShipmentInstructions")
+    RESTfulResult updateShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+
+    /**
+     * 新增装船指令
+     *
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/omsshipshipmentinstructions/addShipmentInstructions")
+    RESTfulResult addShipmentInstructions(@RequestBody Map<String, Object> omsshipShipmentInstructions);
+}

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

@@ -0,0 +1,125 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/12 9:54
+ * @Version:V2.0
+ */
+@FeignClient(value = "dil-wmsh-api", url = "${openfeign.WMSHFeign.url}")
+public interface WMSHFeign {
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getUnloadPortStockList")
+    RESTfulResult getUnloadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    /**
+     * 展示万州港港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockList")
+    RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
+
+    /**
+     * 查询所有港存库入库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getInBoundResult")
+    RESTfulResult getInBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer apiId,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize);
+
+    /**
+     * 新增港存库入库实绩
+     *
+     * @param wmshInboundResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/addWarehousingResult")
+    RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
+
+    /**
+     * 通过实绩Id查询实绩
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/getResultById/{resultId}")
+    RESTfulResult getResultById(@PathVariable("resultId") Integer resultId);
+
+    /**
+     * 逻辑删除港存库入库实绩
+     *
+     * @param resultId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/deleteWareHosingResult/{resultId}")
+    RESTfulResult deleteWareHosingResult(@PathVariable("resultId") Integer resultId);
+
+    /**
+     * 修改港存库入库实绩
+     *
+     * @param wmshInboundResult
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshinboundresults/updateWareHosingResult")
+    RESTfulResult updateWareHosingResult(@RequestBody Map<String, Object> wmshInboundResult);
+
+    /**
+     * 查询所有港存库出库实绩
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/getOutBoundResult")
+    RESTfulResult getOutBoundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                               @RequestParam Integer apiId,
+                               @RequestParam Integer pageNum,
+                               @RequestParam Integer pageSize);
+
+    /**
+     * 添加港存库出库实绩
+     *
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
+    RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
+}

src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
-api.version: api/v1/
+api.version: api/v1
 spring:
   profiles:
     include: ${SPRING_PROFILES:dev}
@@ -18,6 +18,29 @@ eureka:
     service-url:
       defaultZone: http://root:root@discovery.steerinfo.com/eureka/
 
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:localhost:8079}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:localhost:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:localhost:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:localhost:8087}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+  TmsShipFeign:
+    url: ${TMSSHIPFEIGN_URL:localhost:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:localhost:8084}
+
+
 genxml:
   pth: com/a
 cache: