fix:修复映射错误导致报错

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderMapper.java → ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/NewBulkOrderMapper.java

@@ -1,21 +1,20 @@
 package org.dromara.bulk.mapper;
 
-import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.bulk.domain.BulkOrderList;
-import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.UserOrder;
 import org.dromara.bulk.domain.UserOrderTemplate;
+import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
 import org.dromara.productionManagement.domain.ProductionPlan;
-import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Mapper(componentModel = "spring")
-public interface BulkOrderMapper {
+public interface NewBulkOrderMapper {
 
     // BulkOrderList映射
     @Mapping(target = "sysNo", ignore = true)
@@ -63,9 +62,9 @@ public interface BulkOrderMapper {
                                           Long orderId, Long planId, TemplateBo templateBo);
 
     // 集合映射方法
-    List<UserOrderTemplate> toTemplateList(@Context NewBulkOrderBo newBulkOrderBo,
-                                           @Context OrderListBo orderList,
-                                           @Context Long orderId,
-                                           @Context Long planId,
-                                           List<TemplateBo> templateList);
+    ArrayList<UserOrderTemplate> toTemplateList(NewBulkOrderBo newBulkOrderBo,
+                                                OrderListBo orderList,
+                                                Long orderId,
+                                                Long planId,
+                                                List<TemplateBo> templateList);
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -1,29 +1,22 @@
 package org.dromara.bulk.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.UserOrder;
 import org.dromara.bulk.domain.UserOrderTemplate;
-import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.bo.OrderListBo;
-import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
-import org.dromara.bulk.mapper.BulkOrderMapper;
+import org.dromara.bulk.mapper.NewBulkOrderMapper;
 import org.dromara.bulk.mapper.UserOrderMapper;
 import org.dromara.bulk.mapper.UserOrderTemplateMapper;
 import org.dromara.bulk.service.BulkOrderManagementService;
-import org.dromara.commodityManagement.domain.bo.TemplateBo;
 import org.dromara.common.core.utils.OrderNumberGenerator;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.domain.ProductionPlan;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,7 +30,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
-    private final BulkOrderMapper bulkOrderMapper;
+    private final NewBulkOrderMapper newBulkOrderMapper;
 
     /**
      * 新增生产订单
@@ -57,14 +50,14 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
 
                 // 使用Mapper转换
-                BulkOrderList bulkOrderList = bulkOrderMapper.toBulkOrderList(orderList);
+                BulkOrderList bulkOrderList = newBulkOrderMapper.toBulkOrderList(orderList);
                 bulkOrderList.setSysNo(sysNo);
                 bulkOrderList.setScNo(purchaseCode);
                 bulkOrderList.setGoodsId(9L); // 保留必要的手动设置
                 bulkOrderListMapper.insert(bulkOrderList);
 
                 // 生产计划映射
-                ProductionPlan productionPlan = bulkOrderMapper.toProductionPlan(
+                ProductionPlan productionPlan = newBulkOrderMapper.toProductionPlan(
                     newBulkOrderBo,
                     orderList,
                     sysNo,
@@ -75,7 +68,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 productionPlanMapper.insert(productionPlan);
 
                 // 用户订单映射
-                UserOrder userOrder = bulkOrderMapper.toUserOrder(
+                UserOrder userOrder = newBulkOrderMapper.toUserOrder(
                     newBulkOrderBo,
                     orderList,
                     orderNumber,
@@ -86,7 +79,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
 
                 // 处理模板
                 if (orderList.getTemplateList() != null) {
-                    List<UserOrderTemplate> templates = bulkOrderMapper.toTemplateList(
+                    List<UserOrderTemplate> templates = newBulkOrderMapper.toTemplateList(
                         newBulkOrderBo,
                         orderList,
                         productionPlan.getId(),