From 3e53cb0f4ba17b7a2a9ccddae59eaa9c023b64cb Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 30 Jun 2022 17:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=85=A5=E5=BA=93=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E4=B8=B4=E5=BA=8A=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inventory/InvPreInProductsController.java    | 2 ++
 .../java/com/glxp/sale/admin/entity/inout/OrderEntity.java  | 2 +-
 .../com/glxp/sale/admin/thread/InvProductsTrService.java    | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

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<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest);
         PageInfo<InvProductDetailEntity> 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<InvProductDetailEntity> invProductDetailEntities = new ArrayList<>();
         invProductDetailEntities.add(invProductDetailEntity);