diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index 066a5a43c1..402c11b259 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -351,9 +351,9 @@ public class WmsInventoryRest { //------------------------------ 行政类审批查询库存 --------------------------------------- @ApiOperation("行政类审批查询库存") @PostMapping("/oaInventoryList") - public ResultBean> oaInventoryList(@RequestParam("orgPath") String orgPath, @RequestParam("warehouseTypeValue") String warehouseTypeValue) { + public ResultBean> oaInventoryList(@RequestParam("orgPath") String orgPath) { ResultBean> rb = ResultBean.fireFail(); - List list = wmsInventoryService.oaInventoryList(orgPath, warehouseTypeValue); + List list = wmsInventoryService.oaInventoryList(orgPath,"固定资产库"); return rb.success().setData(list); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 72e47f5f6e..c2d1649b8a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -1370,8 +1370,11 @@ public class WmsInventoryService extends MybatisBaseService extra = new HashMap<>(); + if (StringUtils.isNotBlank(d.getGoodsSpuName())) { + extra.put("goodsSpuName", d.getGoodsSpuName()); + } if (null != d.getCount()) { extra.put("count", d.getCount().toString()); } @@ -1387,14 +1390,6 @@ public class WmsInventoryService extends MybatisBaseService