[fix]

生产管理 生产订单
修改生成委外计划service方法，去除合并委外计划详情语句；
修改委外订单审批通过service方法，添加审批状态和使用状态更新；

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceOrderServiceImpl.java

@@ -311,9 +311,7 @@ public class OutsourceOrderServiceImpl implements IOutsourceOrderService
     public int updateAuditOutsourceOrder(OutsourceOrderVO outsourceOrderVO)
     {
         OutsourceOrderVO orderVO = outsourceOrderMapper.selectOutsourceOrderByOutsourceOrderId(outsourceOrderVO.getOutsourceOrderId());
-        orderVO.setUpdateTime(DateUtils.getNowDate());
         String loginName = ShiroUtils.getLoginName();
-        orderVO.setUpdateBy(loginName);
         String planCodes = orderVO.getOutsourcePlanCode();
         List<OutsourcePlan> outsourcePlans = outsourcePlanService.selectOutsourcePlanByCodes(planCodes);
         if(StringUtils.isEmpty(outsourcePlans)){
@@ -325,6 +323,10 @@ public class OutsourceOrderServiceImpl implements IOutsourceOrderService
             plan.setUpdateTime(DateUtils.getNowDate());
             outsourcePlanMapper.updateOutsourcePlan(plan);
         }
+        orderVO.setUpdateBy(loginName);
+        orderVO.setUpdateTime(DateUtils.getNowDate());
+        orderVO.setAuditStatus(outsourceOrderVO.getAuditStatus());
+        orderVO.setUseStatus(outsourceOrderVO.getUseStatus());
         int rows = outsourceOrderMapper.updateOutsourceOrder(orderVO);
         return rows;
     }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java

@@ -763,22 +763,22 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
             throw new BusinessException("委外计划物料集合为空！添加失败");
         }
         // 合并相同料号的数据，计划数相加
-        Map<String, OutsourcePlanDetail> aggregated = new HashMap<>();
+//        Map<String, OutsourcePlanDetail> aggregated = new HashMap<>();
-        for (OutsourcePlanDetail detail : planDetails) {
+//        for (OutsourcePlanDetail detail : planDetails) {
-            aggregated.merge(detail.getMaterialNo(),
+//            aggregated.merge(detail.getMaterialNo(),
-                    new OutsourcePlanDetail(),
+//                    new OutsourcePlanDetail(),
-                    (existing, replacement) -> {
+//                    (existing, replacement) -> {
-                        existing.setPlannedOutsourceAmount(existing.getPlannedOutsourceAmount() + replacement.getPlannedOutsourceAmount());
+//                        existing.setPlannedOutsourceAmount(existing.getPlannedOutsourceAmount() + replacement.getPlannedOutsourceAmount());
-                        return existing;
+//                        return existing;
-                    });
+//                    });
-        }
+//        }
-        // 将Map转回List
+//        // 将Map转回List
-        List<OutsourcePlanDetail> mergedPlanDetails = new ArrayList<>(aggregated.values());
+//        List<OutsourcePlanDetail> mergedPlanDetails = new ArrayList<>(aggregated.values());
         int materialAmount = 0;
         int processAmount = 0;
         int materialSum = 0;
         Set<String> uniqueProcessNos = new HashSet<>(); // 用于存储唯一的 processNo
-        for (OutsourcePlanDetail detail:mergedPlanDetails) {
+        for (OutsourcePlanDetail detail:planDetails) {
             detail.setOutsourcePlanCode(outsourcePlanCode);
             detail.setCreateBy(ShiroUtils.getLoginName());
             detail.setCreateTime(DateUtils.getNowDate());