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

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

@@ -411,13 +411,14 @@ public class AMScontroller{
     @PostMapping("/getAmsContractTransportPrice1")
     @ApiOperation(value = "查询汽运单价信息")
     public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer apiId) {
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             Integer deleted) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
     }
 
     /**
@@ -1409,11 +1410,11 @@ public class AMScontroller{
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String index) {
+                                                         String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,index);
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,con);
     }
 
     /*

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

@@ -835,9 +835,9 @@ public class RMScontroller {
 
     @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
-    @PostMapping(value = "/updateOilPrice", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.updateOilPrice(map);
+    @PostMapping(value = "/updateOilPrice/{id}")
+    public Map<String, Object> updateOilPrice(@PathVariable("id") Integer id) {
+        return rmsFeign.updateOilPrice(id);
     }
 
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")

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

@@ -33,7 +33,7 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
@@ -805,11 +805,21 @@ public class WMSController extends BaseRESTfulController {
                                                       @RequestBody(required = false) List<Map<String,Object>> mps){
         return wmsFeign.createRestackMakeResult(keeperId,beforeLevel,afterStackingId,afterWarehouseId,afterBeforeStackingId,resultRemark,mps);
     }
+    //PDA根据仓库id查找倒垛单
+    @GetMapping(value = "selectRestackByWarehouseIds")
+    public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
+        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+    }
     //修改实时库存,针对倒垛
     @PostMapping(value = "/updateWmspGridMaterialForRestack")
     public Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> mapValue) {
         return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
     }
 
-
+    //    根据倒垛单ID获得物资类型
+    @GetMapping(value = "getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,
+                                                        @RequestParam("context")String context){
+        return wmsFeign.getRestackMakeTypeResult(restackMake,context);
+    }
 }

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

@@ -332,9 +332,12 @@ public interface AmsFeign {
     })
     @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);
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("deleted") Integer deleted
+
+    );
     /**
      *销售合同新增汽运单价
      */
@@ -1360,7 +1363,7 @@ public interface AmsFeign {
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
                                                   @RequestParam("apiId") Integer apiId,
-                                                  @RequestParam("index") String index);
+                                                  @RequestParam("con") String con);
 
     @ApiOperation(value="查询销售订单物资信息")
     @ApiImplicitParams({

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

@@ -441,8 +441,8 @@ public interface RmsFeign {
     Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
 
     //更新油价
-    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
-    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice/{id}")
+    Map<String, Object> updateOilPrice(@PathVariable("id") Integer id);
 
     //根据id获取油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")

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

@@ -714,11 +714,17 @@ public interface WMSFeign {
                                                 @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);
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
 
-    @PostMapping("/api/v1/wms/wmspgridmaterials/updateWmspGridMaterialForRestack")
-    Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> map);
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    Map<String, Object> selectRestackByWarehouseIds(@RequestParam(name="warehouseid") String warehouseid);
+
+    @GetMapping(value = "/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
+    Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,
+                                                 @RequestParam("context")String context);
 
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/updateWmspGridMaterialForRestack")
+    Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> map);
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -144,6 +144,7 @@
         FROM (
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
+                        RC.CARRIER_ID         "carrierId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"