Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -456,8 +456,8 @@ public class AMScontroller{
      */
     @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
-        return amsFeign.batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -475,6 +475,18 @@ public class AMScontroller{
         return amsFeign.getDeliveryAddress();
     }
 
+    @GetMapping("getCargoName")
+    @ApiOperation(value = "获取货物类型")
+    public Map<String, Object> getCargoName(){
+        return amsFeign.getCargoName();
+    }
+
+    @GetMapping("getOilTypeName")
+    @ApiOperation(value = "获取油品名称")
+    public Map<String, Object> getOilTypeName(){
+        return amsFeign.getOilTypeName();
+    }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);

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

@@ -228,14 +228,14 @@ public class WMSController extends BaseRESTfulController {
 
     //删除倒垛单
     @PostMapping("/deleteByResultId/{resultId}")
-    public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
+    public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
         return resTfulResult;
     }
 
     //下发倒垛单
     @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
@@ -273,6 +273,17 @@ public class WMSController extends BaseRESTfulController {
                                                  Integer DistrubtionStatus) {
         return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList2")
+    public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
 
     @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
@@ -772,4 +783,28 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
 
+    //    获取物资类型
+    @PostMapping(value = "/getMaterialTypeList")
+    public Map<String,Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                                  @RequestParam("stackingId") BigDecimal stackingId,
+                                                  @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("apiId") Integer apiId){
+        return wmsFeign.getMaterialTypeList(warehouseid,stackingId,gradtionNumber,pageNum,pageSize,apiId);
+    }
+
+//    创建倒垛单
+    @PostMapping(value = "/createRestackMakeResult")
+    public Map<String,Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                      @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+                                                      @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+                                                      @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+                                                      @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                      @RequestParam("resultRemark")String resultRemark,
+                                                      @RequestBody(required = false) List<Map<String,Object>> mps){
+        return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
+    }
+
+
 }

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

@@ -367,7 +367,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map);
     /**
      * 获取线路编号
      * @param
@@ -398,6 +398,27 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
+    /**
+     * 获取货物类型
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取货物类型")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCargoName")
+    Map<String, Object> getCargoName();
+    /**
+     * 获取油品名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取油品名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getOilTypeName")
+    Map<String, Object> getOilTypeName();
+
     /**
      * 新增(固定派单/公开抢单)
      * @param mapVal

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

@@ -235,7 +235,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
-    Map<String,Object> deleteByResultId(@PathVariable Integer resultId);
+    Map<String,Object> deleteByResultId(@PathVariable String resultId);
 
     /**
      * 下发倒垛单pc端
@@ -243,7 +243,7 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
-    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId);
+    Map<String,Object> dispatchDistrubtionStatus(@PathVariable String resultId);
 
     /**
      * 下拉框获取层次
@@ -279,12 +279,19 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-    Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
+    Map<String,Object> selectRestackList (@RequestBody(required = false) Map<String,Object> map,
                                                     @RequestParam Integer apiId,
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
                                                     @RequestParam Integer DistrubtionStatus
     );
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList2")
+    Map<String,Object> selectRestackList2(@RequestBody(required = false) Map<String,Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer DistrubtionStatus
+    );
     /**
      *  修改倒垛单
      * @param mapval
@@ -630,5 +637,22 @@ public interface WMSFeign {
     //抢单
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                            @RequestParam("stackingId") BigDecimal stackingId,
+                                            @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                            @RequestParam(name = "pageNum") Integer pageNum,
+                                            @RequestParam(name = "pageSize") Integer pageSize,
+                                            @RequestParam("apiId") Integer apiId);
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+    Map<String, Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                @RequestParam("beforeLevel")BigDecimal  beforeLevel,
+                                                @RequestParam(name = "afterStackingId",defaultValue = "20")BigDecimal afterStackingId,
+                                                @RequestParam("afterWarehouseId")BigDecimal afterWarehouseId,
+                                                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
 }
 

src/main/resources/bootstrap.yml

@@ -25,7 +25,6 @@ eureka:
 genxml:
   pth: com/a
 cache:
-
   level: 2
 redis:
   host: 10.10.50.28