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";