Explorar o código

修改倒垛添加调试

zouzhd %!s(int64=3) %!d(string=hai) anos
pai
achega
37ce908bc9

+ 24 - 1
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -95,6 +95,23 @@ public class WMSController extends BaseRESTfulController {
 
     }
 
+    //通过成品仓库网格ID查询实时库存数据
+    @PostMapping("/selectGridMaterialListByGridId")
+    @ApiOperation(value = "通过成品仓库网格ID展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "155", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String,Object> selectGridMaterialListByGridId(BigDecimal gridId) {
+        return wmsFeign.selectGridMaterialListByGridId(gridId);
+
+    }
+
+    //修改物资钢材表的质量是否合格字段和逻辑删除
+    @PostMapping(value = "/updateRmsMaterialSteelDemotion")
+    public Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map){
+        return wmsFeign.updateRmsMaterialSteelDemotion(map);
+    }
+
     //钢材异地库出库扫描
     @PostMapping("/OutScanResultTag")
     public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
@@ -177,6 +194,12 @@ public class WMSController extends BaseRESTfulController {
         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)List <Map<String,Object>> mapval){
+        return wmsFeign.addRestackMakeResult(mapval);
+    }
+
     //删除倒垛单
     @PostMapping("/deleteByResultId/{resultId}")
     public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
@@ -226,7 +249,7 @@ public class WMSController extends BaseRESTfulController {
     }
 
     //修改倒垛单
-    @PostMapping("/addRestackMakeResult")
+    @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
         Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
         return resTfulResult;

+ 18 - 1
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +84,22 @@ public interface WMSFeign {
                                               @RequestParam Integer pageSize,
                                               @RequestParam String con);
 
+    /**
+     *  通过成品仓库网格ID查询实时库存数据
+     * @param gridId
+     * @return
+     */
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId",method = RequestMethod.POST)
+    Map<String,Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
+
+    /**
+     *  修改物资钢材表的质量是否合格字段和逻辑删除
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/updateRmsMaterialSteelDemotion")
+    Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map);
+
     /**
      * 钢材异地库出库扫描
      * @param map
@@ -182,7 +199,7 @@ 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(required = false) List<Map<String,Object>> mapval);
 
     /**
      *   删除倒垛单

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

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