修改wms

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

@@ -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({
@@ -376,6 +390,14 @@ public class WMSController extends BaseRESTfulController {
         }
        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 = "展示倒库实绩信息")

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

@@ -342,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
@@ -374,6 +380,13 @@ public interface WMSFeign {
     @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
@@ -389,6 +402,8 @@ public interface WMSFeign {
                                       @RequestParam Integer pageSize);
 
 
+
+
     /**
      * 展示倒库物资实绩
      * @param mapValue

src/main/resources/bootstrap.yml

@@ -79,5 +79,5 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8081
+  port: 8080