Subject: [PATCH] fix: 开启和修复整单盘点功能
fix: 开启和修复整单盘点功能
---
Index: src/main/java/com/glxp/api/controller/inv/InvProductController.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java	(revision 98f36fdc9d8f66e8be805a0cb7eca247e98a1bdd)
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java	(revision 580556ec86033e4258841cd0fd774dc401da1eff)
@@ -297,7 +297,8 @@
         if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        List<InvProductResponse> list = invProductService.filterList(filterInvProductRequest);
+        filterInvProductRequest.setFilterNoInv(4);
+        List<InvProductResponse> list  = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
Index: src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java
--- a/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java	(revision 98f36fdc9d8f66e8be805a0cb7eca247e98a1bdd)
+++ b/src/main/java/com/glxp/api/entity/inv/InvCountOrderDetailEntity.java	(revision 1cb296104c26643aff70c0a8a0841de326ae0029)
@@ -94,6 +94,9 @@
     @ApiModelProperty(value = "账面数量")
     private Integer invNum;
 
+    @TableField(exist = false)
+    private Integer reCount;
+
     /**
      * 盘盈数量
      */
Index: src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java
--- a/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java	(revision 98f36fdc9d8f66e8be805a0cb7eca247e98a1bdd)
+++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderDetailService.java	(revision 1cb296104c26643aff70c0a8a0841de326ae0029)
@@ -86,7 +86,8 @@
         if (CollUtil.isNotEmpty(countOrderDetailList)) {
             for (InvCountOrderDetailEntity invCountOrderDetailEntity : countOrderDetailList) {
                 invCountOrderDetailEntity.setOrderIdFk(orderId);
-                invCountOrderDetailEntity.setCountNum(0);
+                invCountOrderDetailEntity.setId(null);
+                invCountOrderDetailEntity.setCountNum(invCountOrderDetailEntity.getInvNum());
             }
             invCountOrderDetailDao.insertBatch(countOrderDetailList);
         }
Index: src/main/resources/mybatis/mapper/inv/invProductDao.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml	(revision 1cb296104c26643aff70c0a8a0841de326ae0029)
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml	(revision 580556ec86033e4258841cd0fd774dc401da1eff)
@@ -103,6 +103,9 @@
             <if test="filterNoInv != null and filterNoInv == 3">
                 AND ip.reCount <![CDATA[ < ]]> 0
             </if>
+            <if test="filterNoInv != null and filterNoInv == 4">
+                AND (ip.reCount <![CDATA[ > ]]> 0 OR ip.reCount <![CDATA[ < ]]> 0)
+            </if>
             <if test="attributeType != '' and attributeType != null">
                 AND basic_udirel.attributeType = #{attributeType}
             </if>