Ams销售合同整合

pom.xml

@@ -98,6 +98,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
+            <version>3.5.6</version>
         </dependency>
 
 

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

@@ -389,16 +389,16 @@ public class AMScontroller{
      * @param apiId
      * @return
      */
-    @PostMapping("/amscontracttransportprices")
+    @PostMapping("/getAmsContractTransportPrice1")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.amscontracttransportprices(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId);
     }
 
     /**
@@ -406,32 +406,39 @@ public class AMScontroller{
      * @param mapVal
      * @return
      */
-    @PostMapping("addAmsContractTransportUnitPrice")
+    @PostMapping("addAmsContractTransportUnitPrice1")
     @ApiOperation(value = "新增汽运单价")
-    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody Map<String, Object> mapVal) {
-        return amsFeign.addAmsContractTransportUnitPrice(mapVal);
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
     }
-    @PostMapping("deleteAmsContractTransportPrice")
+    @PostMapping("deleteAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id删除汽运单价")
-    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId) {
-        return amsFeign.deleteAmsContractTransportPrice(priceId);
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {
+        return amsFeign.deleteAmsContractTransportPrice1(priceId);
     }
 
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping("updateAmsContractTransportUnitPrice")
+    @PostMapping("updateAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id修改汽运单价")
-    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.updateAmsContractTransportUnitPrice(mapVal);
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.updateAmsContractTransportPrice1(mapVal);
+    }
+    /**
+     *通过主键渲染信息
+     */
+    @PostMapping(value = "/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId){
+        return amsFeign.getAmsContractTransportPriceByPriceId1(priceId);
     }
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping("batchUpdateTransportPriceByOilPrice")
+    @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.batchUpdateTransportPriceByOilPrice(mapVal);
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1();
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -468,6 +475,18 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderInfo(mapValue, pageNum, pageSize, apiId);
     }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReported")
+    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
+    }
     @PostMapping("getAmsSaleOrderApproved")
     @ApiOperation(value = "查询汽运单价信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -481,14 +500,14 @@ public class AMScontroller{
     }
     @PostMapping("getSaleOrderDetail")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderDetail(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("uploadSaleOrder/{saleOrderId}")
     Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
@@ -506,8 +525,8 @@ public class AMScontroller{
     Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.updateAmsSaleOrder(mapVal);
     }
-    @PostMapping("deleteAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("deleteAmsSaleOrderBySaleOrderId")
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("getSaleOrderUpdateLog")
@@ -521,6 +540,10 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(mapValue, pageNum, pageSize, apiId);
     }
+
+    @GetMapping(value = "getSalePlanName")
+    @ApiOperation(value="获取销售计划名称")
+    public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
     @GetMapping("getShipperName")
     @ApiOperation(value = "得到发货单位下拉")
     public Map<String, Object> getShipperName(){
@@ -535,10 +558,15 @@ public class AMScontroller{
     Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
         return amsFeign.addAmsSaleOrderMaterial(map);
     }
-    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId) {
+    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId) {
         return amsFeign.getAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @PostMapping(value = "/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map){
+        return amsFeign.updateAmsSaleOrderMaterial(map);
+    }
     @PostMapping("deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
     Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
         return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
@@ -566,8 +594,8 @@ public class AMScontroller{
     Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
         return amsFeign.addAmsSalePlan(map);
     }
-    @PostMapping("getAmsSalePlanByPlanId/{planId}")
-    Map<String, Object> getAmsSalePlanByPlanId(BigDecimal planId) {
+    @PostMapping("getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
         return amsFeign.getAmsSalePlanByPlanId(planId);
     }
     @PostMapping("upadteAmsSalePlanByPlanId")
@@ -588,6 +616,79 @@ public class AMScontroller{
     public Map<String, Object> getAreaName(){
         return amsFeign.getAreaName();
     }
+
+
+    @PostMapping("getSalePlanMaterialInfo")
+    @ApiOperation(value="查询销售计划物资信息")
+    public Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSalePlanMaterialInfo(planId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping(value = "addAmsSalePlanMaterial")
+    @ApiOperation(value="新增销售计划物资信息")
+    public Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping(value = "deleteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.deleteAmsSalePlanMaterial(planMaterialId);
+    }
+
+    @PostMapping(value = "/getAmsSalePlanMaterialByPlanMaterialId")
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.getAmsSalePlanMaterialByPlanMaterialId(planMaterialId);
+    }
+
+    @PostMapping(value = "/upadteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.upadteAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping("/getTruckNoDetail")
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoDetail(saleOrderMaterialId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="新增车序号物资信息")
+    @PostMapping(value = "/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSaleTrucknoMaterial(map);
+    }
+
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @PostMapping(value = "/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.deleteAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @PostMapping(value = "/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.getAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @PostMapping(value = "/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateAmsSaleTrucknoMaterial(map);
+    }
     //************************************内转物流***************************************************
     @PostMapping("getAmsContractTransportPriceForConverted")
     @ApiOperation(value = "内转物流查询汽运单价信息")

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

@@ -1,4 +1,7 @@
 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;
@@ -6,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -317,34 +321,34 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
     })
-    @PostMapping(value = "/api/v1/saleContract/amscontracttransportprices/getAmsContractTransportPrice")
-    Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPrice1")
+    Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
     /**
      *销售合同新增汽运单价
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportUnitPrice")
-    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/addAmsContractTransportPrice1")
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
 
     /**
      *通过主键id删除汽运单价
      * @param priceId
      * @return
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteAmsContractTransportPrice")
-    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/deleteAmsContractTransportPrice1")
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId);
     /**
      *通过主键渲染信息
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getAmsContractTransportPriceByPriceId/{priceId}")
-    Map<String, Object> getAmsContractTransportPriceByPriceId(@PathVariable("priceId") BigDecimal priceId);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId);
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportUnitPrice")
-    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/updateAmsContractTransportPrice1")
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 油价联动导致运价变动，批量修改运价
      * @param
@@ -353,8 +357,8 @@ public interface AmsFeign {
     @ApiOperation(value="油价联动导致运价变动，批量修改运价")
     @ApiImplicitParams({
     })
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
     /**
      * 获取线路编号
      * @param
@@ -363,7 +367,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取线路编号")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineNo")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getLineNo")
     Map<String, Object> getLineNo();
     /**
      * 获取线路编号
@@ -373,7 +377,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取运力编号")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityNumber")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCapacityNumber")
     Map<String, Object> getCapacityNumber();
     /**
      * 获取收货地址
@@ -383,7 +387,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取收货地址")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getDeliveryAddress")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
     /**
      * 新增(固定派单/公开抢单)
@@ -397,14 +401,14 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
-     * 获取收货地址
+     * 获取承运商名
      * @param
      * @return
      */
-    @ApiOperation(value="获取收货地址")
+    @ApiOperation(value="获取承运商名")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amsdispatchsaleorders/getCarrierName")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCarrierName")
     Map<String, Object> getCarrierName();
 
     /**
@@ -474,7 +478,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderDetail")
-    Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer apiId);
@@ -531,7 +535,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteAmsSaleOrderBySaleOrderId")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId);
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
     @ApiOperation(value="根据销售订单号查询销售订单修改日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
@@ -541,6 +545,17 @@ public interface AmsFeign {
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId);
+    /**
+     * 获取销售计划名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取销售计划名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getSalePlanName")
+    Map<String, Object> getSalePlanName();
+
     /**
      * 获取发货单位
      */
@@ -578,8 +593,21 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId);
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    /**
+     * 通过主键修改销售订单物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
+
     /**
      * 通过主键删除销售订单物资信息
      * @param saleOrderMaterialId
@@ -590,7 +618,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
-    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId);
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
 
     /**
      * 通过主键获取收货地址
@@ -602,7 +630,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress/{saleOrderMaterialId}")
-    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId);
+    Map<String, Object> getAddress(@RequestParam BigDecimal saleOrderMaterialId);
 
 
     /**
@@ -656,8 +684,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "销售计划主键", required = false, dataType = "BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId/{planId}")
-    Map<String, Object> getAmsSalePlanByPlanId(@PathVariable("planId") BigDecimal planId);
+    @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
     /**
      * 通过主键修改销售计划
      * @param map
@@ -682,11 +710,11 @@ public interface AmsFeign {
     Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
 
     /**
-     * 获取规格型号
+     * 获取物资编码
      * @param
      * @return
      */
-    @ApiOperation(value="获取规格型号")
+    @ApiOperation(value="获取物资编码")
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleplans/getMaterialName")
@@ -703,6 +731,138 @@ public interface AmsFeign {
     @GetMapping(value = "/api/v1/ams/amssaleplans/getAreaName")
     Map<String, Object> getAreaName();
 
+    /**
+     * 查询销售计划物资信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(169)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaleplanmaterials/getSalePlanMaterialInfo")
+    Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 新增销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息对象", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/addAmsSalePlanMaterial")
+    Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/deleteAmsSalePlanMaterial")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键查询销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planMaterialId", value = "销售计划物资表主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/getAmsSalePlanMaterialByPlanMaterialId")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键修改销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/upadteAmsSalePlanMaterial")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 查询销售订单车序号详细信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(170)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaletrucknomaterials/getTruckNoDetail")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    /**
+     * 新增车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "新增车序号物资对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "trucknoMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键渲染车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键修改车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "车序号物资信息对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     /*
        AmstruckPurplanController中所有接口
     */

src/main/resources/bootstrap.yml

@@ -27,7 +27,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:192.168.4.105:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:localhost:8078}
   BmstrainFeign: