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

pom.xml

@@ -118,6 +118,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
+                        <table></table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -94,7 +94,7 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("/selectGridMaterialList")
     @ApiOperation(value = "展示实时库存数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "167", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
                                                       Integer pageNum,
@@ -163,6 +163,20 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
         return resTfulResult;
     }
+    //获取扫描实绩
+    //钢材异地库扫描入库
+    @PostMapping("/getScanResult")
+    public Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.getScanResult(map);
+        return resTfulResult;
+    }
+
+    //更新状态
+    @PostMapping("/updateStatus")
+    public Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.updateStatus(map);
+        return resTfulResult;
+    }
 
     //展示在途库存数据
     @ApiImplicitParams({
@@ -200,14 +214,14 @@ public class WMSController extends BaseRESTfulController {
                                                             Integer pageSize,
                                                             Integer apiId,
                                                             Integer warehouseid,
-                                                            Integer gradtionNumber,
-                                                            Integer stackingId) {
+                                                            Integer stackingId,
+                                                            Integer gradtionNumber) {
         return wmsFeign.getWmspRestackMakeResultList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
     }
 
-    //添加倒垛单实绩
+
     @PostMapping(value = "/addRestackMakeResult")
-    public Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapval){
+    public Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval){
         return wmsFeign.addRestackMakeResult(mapval);
     }
 
@@ -256,7 +270,7 @@ public class WMSController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList(apiId, pageNum, pageSize, DistrubtionStatus);
+        return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
 
 //    //修改倒垛单
@@ -300,6 +314,18 @@ public class WMSController extends BaseRESTfulController {
         Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
         return resTfulResult;
     }
+   @ApiImplicitParams({
+           @ApiImplicitParam(value = "395",name = "apiId")
+   })
+    @PostMapping(value = "/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId
+
+    ){
+        return  wmsFeign.getRestackInfoByResultId(mapVal==null?new HashMap<>():mapVal, pageNum, pageSize, apiId);
+    }
 
     //PDA根据仓库id查找倒垛单
     @PostMapping("/selectRestackByWarehouseId")
@@ -343,6 +369,35 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
+    @PostMapping("/selectScanResultByIboundResultId")
+    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+    })
+    public RESTfulResult selectScanResultByIboundResultId( Map<String, Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer inboundId) {
+
+        return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
+    }
+   //根据物资信息获取原来垛位信息
+   @PostMapping("/selectInfoByMaterialCode")
+   public Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal) {
+        if (mal == null) {
+            mal = new HashMap<>();
+        }
+       return  wmsFeign.selectInfoByMaterialCode(mal);
+   }
+   //根据仓库查询未接收的垛位
+   @PostMapping("/selectStackingInfoByWarehouseId")
+   public Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal) {
+       if (mal == null) {
+           mal = new HashMap<>();
+       }
+       return  wmsFeign.selectStackingInfoByWarehouseId(mal);
+   }
 
     @PostMapping("/getWmsIvboundResult")
     @ApiOperation(value = "展示倒库实绩信息")
@@ -647,19 +702,24 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.selectMaterialSteelIdByReusltId(map);
     }
 
-
-    @PostMapping("/selectScanResultByIboundResultId")
-    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
-    })
-    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
-                                                          Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize) {
-        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+    //下发指令给行车工
+    @PostMapping("/updateInstruction")
+    public Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map) {
+        return wmsFeign.updateInstruction(map);
     }
 
+//    @PostMapping("/selectScanResultByIboundResultId")
+//    @ApiOperation(value = "根据入库实绩id获得扫描实绩数据")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
+//    })
+//    public RESTfulResult selectScanResultByIboundResultId(Map<String, Object> mapValue,
+//                                                          Integer apiId,
+//                                                          Integer pageNum,
+//                                                          Integer pageSize) {
+//        return wmsFeign.selectScanResultByIboundResultId(mapValue, apiId, pageNum, pageSize);
+//    }
+
     @PostMapping("/getIvboundMakeResultList")
     @ApiOperation(value = "展示倒库列表")
     @ApiImplicitParams({
@@ -715,5 +775,9 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> updateIvboundMakeResult(@RequestBody Map<String,Object> mapValue) {
         return wmsFeign.updateIvboundMakeResult(mapValue);
     }
-
+    //下发给行车工
+    @PostMapping("/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map){
+        return wmsFeign.IssueToCrane(map);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.feign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -206,8 +207,9 @@ public interface WMSFeign {
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize,
                                                     @RequestParam Integer warehouseid,
-                                                    @RequestParam Integer gradtionNumber,
-                                                    @RequestParam Integer stackingId);
+                                                    @RequestParam Integer stackingId,
+                                                    @RequestParam Integer gradtionNumber
+                                                   );
 
     /**
      *    添加倒垛单实绩
@@ -215,7 +217,12 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    Map<String,Object> addRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapval);
+    Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval);
+
+
+    @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
+     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
+
 
 
     /**
@@ -268,7 +275,7 @@ public interface WMSFeign {
      * @return
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-   Map<String,Object> selectRestackList(@RequestBody(required = false)
+   Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
@@ -303,6 +310,17 @@ public interface WMSFeign {
      */
   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
   Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getRestackInfoByResultId")
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam Integer apiId
+
+    );
     /**
      * PDA根据实绩id查找物资信息
      * @param map
@@ -324,6 +342,12 @@ public interface WMSFeign {
      */
    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
+
+
+
+
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
+    Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
     /**
      * 库管员下发倒垛单
      * @param mapList
@@ -339,12 +363,30 @@ public interface WMSFeign {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult",method = RequestMethod.POST)
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize);
 
+
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer inboundId);
+    //根据物资信息查找暂存的垛位
+    @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
+    Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
+
+    //根据仓库id查询未接收的垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
+    Map<String,Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String,Object> mal);
+
+    //更新垛位
+    @PostMapping("/api/v1/wms/inboundScanResult/updateStatus")
+    Map<String,Object> updateStatus(@RequestBody(required = false) Map<String,Object> mal);
     /**
      * 展示倒库实绩
      * @param mapValue
@@ -360,6 +402,8 @@ public interface WMSFeign {
                                       @RequestParam Integer pageSize);
 
 
+
+
     /**
      * 展示倒库物资实绩
      * @param mapValue
@@ -432,14 +476,14 @@ public interface WMSFeign {
      * 展示退库已下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReIssuedResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult",method = RequestMethod.POST)
     Map<String,Object>  getIssuedResult();
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getReTagResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult",method = RequestMethod.POST)
     Map<String,Object>  getReTagResult();
 
     /**
@@ -469,7 +513,7 @@ public interface WMSFeign {
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/insertReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult",method = RequestMethod.POST)
     String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
@@ -554,5 +598,10 @@ public interface WMSFeign {
     @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
     Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
 
+
+    //下发给行车工
+    @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
+    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
+
 }