diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java index d9bebdf..a1164ae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java @@ -108,6 +108,8 @@ 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/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index a207fe9..eb50e87 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -48,7 +48,7 @@ public class OrderEntity { private boolean outChangeEnable; private String originUllageSupNo; private Date updateTime; - private boolean preCheck; + private boolean preCheck; //出入库是必须校验预验收库 //审核时间 private Date auditTime; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index b76f842..ed53f35 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -195,9 +195,10 @@ public class InvProductsTrService { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 3); } else { invProductDetailEntities = buildInvProductDetail(orderId, erpOrderEntity, orderEntity, 2); - + //todo 为什么要插入库存 if (orderEntity.isPreCheck()) { - insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 +// insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存 + invPreInProductDetailService.insertInvProducts(invProductDetailEntities); } } if (invProductDetailEntities != null && invProductDetailEntities.size() > 0) { @@ -919,6 +920,7 @@ public class InvProductsTrService { } } + public void insetInvSingle(boolean isPre, InvProductDetailEntity invProductDetailEntity) { List invProductDetailEntities = new ArrayList<>(); invProductDetailEntities.add(invProductDetailEntity);