倒垛

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.awt.image.Kernel;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -772,4 +773,25 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
 
+
+    @PostMapping("/createRestackMakeResult")
+    public  RESTfulResult 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);
+    }
+    //PDA根据仓库id查找倒垛单
+    @GetMapping("/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid){
+        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+    }
+    @GetMapping("/wmsprestackmaketyperesults/getRestackMakeTypeResult")
+    public RESTfulResult getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context){
+        return wmsFeign.getRestackMakeTypeResult(restackMake,context);
+    }
+
 }

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

@@ -630,5 +630,18 @@ public interface WMSFeign {
     //抢单
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
+
+    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+    public  RESTfulResult 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);
+    @GetMapping("/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    public  RESTfulResult selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid);
+    @GetMapping("/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
+    public RESTfulResult 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:192.168.1.118:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign: