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

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

@@ -44,6 +44,18 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
+    @PostMapping("getWmsReservedResult")
+    @ApiOperation(value = "展示预留入库实绩信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String  con) {
+        return wmsFeign.getWmsReservedResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
+    }
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
     @ApiImplicitParams({
@@ -890,6 +902,11 @@ public class WMSController extends BaseRESTfulController {
                                                  @RequestParam(value = "apiId") Integer apiId) {
         return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
     }
-
+//    根据对应的入库实绩id修改入库状态为预留
+    @PostMapping("/changeReserved")
+    @ApiOperation(value = "根据对应的入库实绩id修改入库状态为预留")
+    public int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return wmsFeign.changeReserved(mapList);
+    }
 }
 

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

@@ -35,6 +35,21 @@ public interface WMSFeign {
                                             @RequestParam Integer pageSize,
                                             @RequestParam String con);
 
+    /**
+     * 展示预留入库实绩信息
+     *
+     * @param mapValue
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReservedResult", method = RequestMethod.POST)
+    Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
     /**
      * 展示出库实绩
      *
@@ -766,4 +781,6 @@ public interface WMSFeign {
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
 
+    @PostMapping("/api/v1/wms/inboundResult/changeReserved")
+    int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList);
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8012}
+    url: ${WMSFEIGN_URL:localhost:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign: