Browse Source

新增倒垛扫描判断倒垛单是否稽核完成接口

Administrator 3 năm trước cách đây
mục cha
commit
f30837113e

+ 13 - 4
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -119,7 +119,7 @@ public Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = fa
     Map<String,Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
     return resTfulResult;
 }
-//展示实时库存数据
+//展示在途库存数据
 @ApiImplicitParams({
         @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
 })
@@ -170,19 +170,19 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         return resTfulResult;
     }
   //下拉框获取层次
-    @PostMapping("/selectGardationNumber")
+    @GetMapping("/selectGardationNumber")
     public Map<String,Object> selectGardationNumber(Integer warehouseid, Integer stackingId){
         Map<String,Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid,stackingId);
         return resTfulResult;
     }
     //下拉框获取仓库名称
-    @PostMapping("/selectWarehouse")
+    @GetMapping("/selectWarehouse")
     public Map<String,Object> selectWarehouse(){
         Map<String,Object> resTfulResult = wmsFeign.selectWarehouse();
         return resTfulResult;
     }
     //下拉框获取仓库名称
-    @PostMapping("/selectStackingId")
+    @GetMapping("/selectStackingId")
     public Map<String,Object> selectStackingId(Integer warehouseid){
         Map<String,Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
         return resTfulResult;
@@ -543,5 +543,14 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     public Map<String,Object> insertIvboundScanResult(@RequestBody(required = false)Map<String,Object>map){
         return wmsFeign.insertIvboundScanResult(map);
     }
+/**
+ *  根据实绩id查找物资唯一编码是否已经稽核完成
+ */
+@PostMapping("/selectMaterialSteelIdByReusltId")
+@Transactional
+public Map<String,Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false)Map<String,Object>map){
+    return wmsFeign.selectMaterialSteelIdByReusltId(map);
+}
+
 
 }

+ 8 - 2
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -284,14 +284,14 @@ public interface WMSFeign {
      * @param mal
      * @return
      */
-   @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/ScanTagResult")
+   @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
    Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
     /**
      * 库管员下发倒垛单
      * @param mapList
      * @return
      */
-  @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/Issue")
+  @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
   Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
     /**
      * 展示退库实绩
@@ -484,5 +484,11 @@ public interface WMSFeign {
      */
     @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult",method = RequestMethod.POST)
     Map<String, Object> insertIvboundScanResult(@RequestBody  Map<String, Object> map);
+    /**
+     * 根据实绩id查找物资是否稽核完成
+     *
+     */
+    @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
+    Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
 }
 

+ 1 - 0
src/main/java/com/steerinfo/dil/feign/WMSHFeign.java

@@ -122,4 +122,5 @@ public interface WMSHFeign {
      */
     @PostMapping(value = "/api/v1/wmsh/wmshoutboundresults/addResult")
     RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map);
+
 }

+ 2 - 2
src/main/resources/bootstrap.yml

@@ -40,7 +40,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:localhost:8084}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8086}
+    url: ${WMSFEIGN_URL:localhost:8093}
   QMSFeign:
     url: ${QMSFEIGN_URL:localhost:8082}
 
@@ -74,4 +74,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8080
+  port: 8099