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

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

@@ -1189,9 +1189,8 @@ public class AMScontroller{
                                                       Integer pageSize,
                                                       Integer apiId,
                                                       Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      String con) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId, con);
+                                                      @RequestParam String carrierSsoId) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1364,12 +1363,11 @@ public class AMScontroller{
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         Integer issueStatus,
-                                         String con){
+                                         Integer issueStatus){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
     }
 
     @PostMapping("getSaleOrderInfoes")

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

@@ -143,11 +143,22 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
+                                                      Integer warehouseId,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,con);
 
     }
+//    查询仓库中超过库龄预警的物资
+    @PostMapping("/getGridMaterialAgeList")
+    @ApiOperation(value = "查询仓库中超过库龄预警的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer warehouseId) {
+        return wmsFeign.getGridMaterialAgeList(mapVal==null?new HashMap<>():mapVal,warehouseId);
 
+    }
 
     //通过成品仓库网格ID查询实时库存数据
     @PostMapping("/selectGridMaterialListByGridId")

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

@@ -1202,8 +1202,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      @RequestParam String con) ;
+                                                      @RequestParam String carrierSsoId) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
     Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1323,8 +1322,7 @@ public interface AmsFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam Integer issueStatus,
-                                 @RequestParam String con);
+                                 @RequestParam Integer issueStatus);
 
 
     @ApiOperation(value="查询未上报的销售订单信息")

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

@@ -151,8 +151,21 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
+                                               @RequestParam Integer warehouseId,
                                                @RequestParam String con);
 
+    /**
+     * 展示实时库存数据
+     *
+     * @param
+     * @param
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/getGridMaterialAgeList", method = RequestMethod.POST)
+    Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer warehouseId);
+
     /**
      * 通过成品仓库网格ID查询实时库存数据
      *