From 4240cf25c0d08b55f0c5853226dfdf58c759a499 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 3 Jan 2025 14:24:49 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Bom=E7=9A=84=E6=97=B6=E5=80=99=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8D=95=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=A1=AE=E8=AE=A4=E9=AA=8C=E6=94=B6=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=AD=90=E8=A1=A8=E7=9A=84=E6=96=B0=E5=A2=9E=E5=92=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95=E5=8E=BB=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E8=AE=BE=E5=A4=87id=E5=92=8Csn=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AftersalesOutOrderServiceImpl.java | 4 ++-- .../mapper/system/SysSalesShippingInformDetailMapper.xml | 8 -------- .../src/main/resources/templates/erp/material/select.html | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java index 014d49d2..55fb5fc1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java @@ -780,13 +780,13 @@ public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService } private void confirmCheckUpdateSalesOrderChild(List shippingInformDetailList, SysSalesShippingInform sysSalesShippingInform) { - // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisReceivingNum + // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisCheckNum Map groupedDetails = shippingInformDetailList.stream() .collect(Collectors.toMap( SysSalesShippingInformDetail::getShippingInformDetailId, Function.identity(), (existing, replacement) -> { - existing.setThisReceivingNum(existing.getThisReceivingNum() + replacement.getThisReceivingNum()); + existing.setThisReceivingNum(existing.getThisCheckNum() + replacement.getThisCheckNum()); return existing; }, LinkedHashMap::new // 保持插入顺序 diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml index 1aef07ac..c98d6f70 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml @@ -97,8 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" has_complete_num, this_receiving_num, has_receiving_num, - sn_code, - shipping_device_id, shared_stock_allocated_num, fixed_stock_allocated_num, create_time, @@ -130,8 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{hasCompleteNum}, #{thisReceivingNum}, #{hasReceivingNum}, - #{snCode}, - #{shippingDeviceId}, #{sharedStockAllocatedNum}, #{fixedStockAllocatedNum}, #{createTime}, @@ -167,8 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" has_complete_num = #{hasCompleteNum}, this_receiving_num = #{thisReceivingNum}, has_receiving_num = #{hasReceivingNum}, - sn_code = #{snCode}, - shipping_device_id = #{shippingDeviceId}, shared_stock_allocated_num = #{sharedStockAllocatedNum}, fixed_stock_allocated_num = #{fixedStockAllocatedNum}, create_time = #{createTime}, @@ -207,8 +201,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" has_complete_num = #{hasCompleteNum}, this_receiving_num = #{thisReceivingNum}, has_receiving_num = #{hasReceivingNum}, - sn_code = #{snCode}, - shipping_device_id = #{shippingDeviceId}, shared_stock_allocated_num = #{sharedStockAllocatedNum}, fixed_stock_allocated_num = #{fixedStockAllocatedNum}, create_time = #{createTime}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/select.html b/ruoyi-admin/src/main/resources/templates/erp/material/select.html index 326683d8..39defb56 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/select.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/select.html @@ -42,7 +42,7 @@ var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; var useStatusDatas = [[${@dict.getType('useStatus')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; - var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]]; + var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "erp/material";