修改倒垛

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,6 +805,16 @@ 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);
+    }
 
+//    根据倒垛单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/WMSFeign.java

@@ -654,5 +654,12 @@ public interface WMSFeign {
                                                 @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
                                                 @RequestParam("resultRemark")String resultRemark,
                                                 @RequestBody(required = false) List<Map<String,Object>> mps);
+
+    @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);
 }
 

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign: