diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java index b61843ca..1ae95a90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java @@ -108,6 +108,9 @@ public class InvPreInProductsController { if (StrUtil.isEmpty(filterInvProductRequest.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } + filterInvProductRequest.setInvStorageCode(null); + filterInvProductRequest.setInvWarehouseCode(null); + List invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(invProductDetailEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index b38853f0..b6bec184 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -193,7 +193,8 @@ public class InvProductsTrService { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); if (orderEntity.isPreCheck()) { - insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 +// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 + invPreInProductDetailService.insertInvProducts(invProductDetailEntities); } } if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) {