diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 449a051..2e8c85f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -35,10 +35,7 @@ import com.glxp.sale.admin.res.inout.WarehouseUserResponse; import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; -import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; -import com.glxp.sale.admin.service.basic.BussinessTypeService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; @@ -111,6 +108,8 @@ public class WareHouseController { @Resource UdiInfoUtils udiInfoUtils; + @Resource + private CustomService customService; @@ -1098,7 +1097,7 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } //计算实际数量 - int reCount= udiInfoUtils.getActCount(warehouseEntity); + int reCount= customService.getActCount(warehouseEntity); warehouseEntity.setReCount(reCount); boolean b = codesTempService.update(warehouseEntity); if (warehouseEntity.getMySupId() != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java index b8d80ce..13e9603 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvProductDetailRequest.java @@ -27,9 +27,17 @@ public class FilterInvProductDetailRequest extends ListPageRequest { private String orderIdFk; + private String invStorageCode; private String invWarehouseCode; private String invSpaceCode; private List invCodes; + //更新时间 + private String updateTime; + /** + * 产品ID集合 + */ + private List productIdList; + }