[fix] 工程管理 售后管理

修复添加Bom的时候物料不显示单位的问题
修复售后出库确认验收空指针异常问题
售后维护设备出库子表的新增和修改方法去掉多余的设备id和sn号字段

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<SysSalesShippingInformDetail> shippingInformDetailList, SysSalesShippingInform sysSalesShippingInform) {
-        // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisReceivingNum
+        // 根据 shipping_inform_detail_id 分组，并合计每组的 getThisCheckNum
         Map<Long, SysSalesShippingInformDetail> 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 // 保持插入顺序

ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml

@@ -97,8 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num,</if>
             <if test="thisReceivingNum != null">this_receiving_num,</if>
             <if test="hasReceivingNum != null">has_receiving_num,</if>
-            <if test="snCode != null">sn_code,</if>
-            <if test="shippingDeviceId != null">shipping_device_id,</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num,</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num,</if>
             <if test="createTime != null">create_time,</if>
@@ -130,8 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">#{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">#{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">#{hasReceivingNum},</if>
-            <if test="snCode != null">#{snCode},</if>
-            <if test="shippingDeviceId != null">#{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">#{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">#{fixedStockAllocatedNum},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -167,8 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
-            <if test="snCode != null">sn_code = #{snCode},</if>
-            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num = #{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num = #{fixedStockAllocatedNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -207,8 +201,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hasCompleteNum != null">has_complete_num = #{hasCompleteNum},</if>
             <if test="thisReceivingNum != null">this_receiving_num = #{thisReceivingNum},</if>
             <if test="hasReceivingNum != null">has_receiving_num = #{hasReceivingNum},</if>
-            <if test="snCode != null">sn_code = #{snCode},</if>
-            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
             <if test="sharedStockAllocatedNum != null">shared_stock_allocated_num = #{sharedStockAllocatedNum},</if>
             <if test="fixedStockAllocatedNum != null">fixed_stock_allocated_num = #{fixedStockAllocatedNum},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

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