From 1cb296104c26643aff70c0a8a0841de326ae0029 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 18 Dec 2024 10:01:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E5=90=AF=E5=92=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=95=B4=E5=8D=95=E7=9B=98=E7=82=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/controller/inv/InvProductController.java | 3 ++-
 .../com/glxp/api/entity/inv/InvCountOrderDetailEntity.java     | 3 +++
 .../com/glxp/api/service/inv/InvCountOrderDetailService.java   | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
index b445e92c5..3307881b1 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -297,7 +297,8 @@ public class InvProductController extends BaseController {
         if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        List<InvProductResponse> list = invProductService.filterList(filterInvProductRequest);
+        filterInvProductRequest.setFilterNoInv(1);
+        List<InvProductResponse> list  = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java
index f33c0cd6d..d6049ef52 100644
--- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java
@@ -94,6 +94,9 @@ public class InvCountOrderDetailEntity implements Serializable {
     @ApiModelProperty(value = "账面数量")
     private Integer invNum;
 
+    @TableField(exist = false)
+    private Integer reCount;
+
     /**
      * 盘盈数量
      */
diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java
index 47efbb9a3..db117991a 100644
--- a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java
+++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java
@@ -86,7 +86,8 @@ public class InvCountOrderDetailService extends ServiceImpl<InvCountOrderDetailM
         if (CollUtil.isNotEmpty(countOrderDetailList)) {
             for (InvCountOrderDetailEntity invCountOrderDetailEntity : countOrderDetailList) {
                 invCountOrderDetailEntity.setOrderIdFk(orderId);
-                invCountOrderDetailEntity.setCountNum(0);
+                invCountOrderDetailEntity.setId(null);
+                invCountOrderDetailEntity.setCountNum(invCountOrderDetailEntity.getInvNum());
             }
             invCountOrderDetailDao.insertBatch(countOrderDetailList);
         }