From a234c887963d44ee03849c71760d2e669f52b0d4 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 31 Mar 2025 21:21:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E9=87=87=E9=9B=86=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/collect/IoCollectOrderController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 5832d9dcd..48c96d7ba 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -420,8 +420,8 @@ public class IoCollectOrderController extends BaseController { isAllTag = false; String cpmctymc = collectOrderBizResponse.getCpmctymc(); Integer count = collectOrderBizResponse.getCount(); - Integer autoResCount = IntUtil.value(collectOrderBizResponse.getAutoResCount()); - msg = msg +" "+ cpmctymc + ":未采集数量" + (count - autoResCount) + ";"; + Integer shouldcount = IntUtil.value(collectOrderBizResponse.getShouldCount()); + msg = msg +" "+ cpmctymc + ":未采集数量" + (count - shouldcount) + ";"; } } } From 5a93342a6181810f3f4404a66df05da1d09b1fbe Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 31 Mar 2025 21:21:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=87=87=E9=9B=86=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...整单盘点功能_fix__开启和修复整单盘点功能.patch | 75 ------------------- 1 file changed, 75 deletions(-) delete mode 100644 fix__开启和修复整单盘点功能_fix__开启和修复整单盘点功能.patch diff --git a/fix__开启和修复整单盘点功能_fix__开启和修复整单盘点功能.patch b/fix__开启和修复整单盘点功能_fix__开启和修复整单盘点功能.patch deleted file mode 100644 index 82f1eb86c..000000000 --- a/fix__开启和修复整单盘点功能_fix__开启和修复整单盘点功能.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 list = invProductService.filterList(filterInvProductRequest); -+ filterInvProductRequest.setFilterNoInv(4); -+ List list = invProductService.filterListProduct(filterInvProductRequest); - PageInfo 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 @@ - - AND ip.reCount 0 - -+ -+ AND (ip.reCount ]]> 0 OR ip.reCount 0) -+ - - AND basic_udirel.attributeType = #{attributeType} -