fix:修复依赖关系和同名报错

ruoyi-modules/ruoyi-bulkOrder/pom.xml

@@ -115,10 +115,6 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-customerManagement</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
-        </dependency>
 
     </dependencies>
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/BulkOrderPlan.java

@@ -0,0 +1,297 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+
+@TableName("fa_kuyou_plan")
+public class BulkOrderPlan {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 系统单号
+     */
+    private String sysNo;
+
+    /**
+     * 订单编号
+     */
+    private String scNo;
+
+    /**
+     * 生产计划单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 单据日期
+     */
+    private Date purchaseTime;
+
+    /**
+     * 交货时间
+     */
+    private Date deliveryTime;
+
+    /**
+     * 车间
+     */
+    private int workshopId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品单位
+     */
+    private int goodsUnit;
+
+    /**
+     * 基本单位
+     */
+    private int defaultUnit;
+
+    /**
+     * 数量
+     */
+    private double number;
+
+    /**
+     * 份数
+     */
+    private double fenNumber;
+
+    /**
+     * 基本数量
+     */
+    @TableField("basic_nmber")
+    private double basicNumber;
+
+    /**
+     * 基本份数
+     */
+    @TableField("basic_fen_nmber")
+    private double basicFenNumber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    @TableField("gongyi_price")
+    private double craftPrice;
+
+    /**
+     * 单价
+     */
+    @TableField("unit_price")
+    private double price;
+
+    /**
+     * 金额
+     */
+    private double allMoney;
+
+    /**
+     * 审核状态:0=未审核,1=已审核
+     */
+    private String examineStatus;
+
+    /**
+     * 审核时间
+     */
+    private Date examineTime;
+
+    /**
+     * 状态:0=未完成,1=已完成
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 制单人
+     */
+    private Long preparationId;
+
+    /**
+     * 审核人
+     */
+    private Long examineId;
+
+    /**
+     * 最后操作人
+     */
+    private Long operationId;
+
+    /**
+     * mrp状态
+     */
+    private String mrpStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 烧花,0否，1是
+     */
+    private int isBurnFlowers = 0;
+
+    /**
+     * 定位,0否，1是
+     */
+    private int isLocation = 0;
+
+    /**
+     * 快返,0否，1是
+     */
+    private int isQuickReturn = 0;
+
+    /**
+     * 作废0否，1是
+     */
+    private int isToVoid = 0;
+
+    /**
+     * 复色，0否，1是
+     */
+    private int isMulticolor = 0;
+
+    /**
+     * 首单，0否，1是
+     */
+    private int isFirstOrder = 0;
+
+    /**
+     * 首次加工，0否，1是
+     */
+    private int isFirstProcessing = 0;
+
+    /**
+     * 紧急，0否，1是
+     */
+    private int isUrgent = 0;
+
+    /**
+     * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
+     */
+    private int craftStatus = 1;
+
+    /**
+     * 销货单id
+     */
+    private Long goodsSalesId = 0L;
+
+    /**
+     * 宽幅
+     */
+    private String width;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 订单号
+     */
+    private String orderNum;
+
+    /**
+     * 分页以及数量展示
+     */
+    private String pageList;
+
+    /**
+     * 打印状态
+     */
+    private int printStatus = 0;
+
+    /**
+     * 发货数量
+     */
+    private double shipNum;
+
+    /**
+     * 已收款
+     */
+    private double paidForAmount;
+
+    /**
+     * 尾款
+     */
+    private double overAmount;
+
+    /**
+     * 备注
+     */
+    private String billRemark;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+
+    /**
+     * 发货时间
+     */
+    private Date shippingTime;
+
+    /**
+     *用户id
+     */
+    private Long userId;
+
+    /**
+     * 是否补货，0否，1是
+     */
+    private int isBuhuo = 0;
+
+    /**
+     * 是否系统单，0否，1是
+     */
+    private String isSys = "0";
+
+    /**
+     *
+     */
+    private Date zhuanyinTime;
+
+    /**
+     *
+     */
+    private int outFactoryId;
+
+    /**
+     *
+     */
+    private int shFactoryId;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/UserOrderTemplate.java

@@ -59,4 +59,19 @@ public class UserOrderTemplate {
      * 版图图片
      */
     private String image;
+
+    /**
+     * 真实数量
+     */
+    private int realAmount;
+
+    /**
+     * 烧花价格
+     */
+    private double shaohuaPrice;
+
+    /**
+     * 烧花总价
+     */
+    private double shaohuaTotalPrice;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/BulkOrderPlanBo.java

@@ -0,0 +1,293 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.BulkOrderPlan;
+
+import java.util.Date;
+
+@Data
+
+@AutoMapper(target = BulkOrderPlan.class, reverseConvertGenerate = false)
+public class BulkOrderPlanBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 系统单号
+     */
+    private String sysNo;
+
+    /**
+     * 订单编号
+     */
+    private String scNo = null;
+
+    /**
+     * 生产计划单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 单据日期
+     */
+    private Date purchaseTime;
+
+    /**
+     * 交货时间
+     */
+    private Date deliveryTime;
+
+    /**
+     * 车间
+     */
+    private int workshopId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品单位
+     */
+    private int goodsUnit;
+
+    /**
+     * 基本单位
+     */
+    private int defaultUnit;
+
+    /**
+     * 数量
+     */
+    private double number;
+
+    /**
+     * 份数
+     */
+    private double fenNumber;
+
+    /**
+     * 基本数量
+     */
+    private double basicNumber;
+
+    /**
+     * 基本份数
+     */
+    private double basicFenNumber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    private double craftPrice;
+
+    /**
+     * 单价
+     */
+    private double price;
+
+    /**
+     * 金额
+     */
+    private double allMoney;
+
+    /**
+     * 审核状态:0=未审核,1=已审核
+     */
+    private String examineStatus;
+
+    /**
+     * 审核时间
+     */
+    private Date examineTime;
+
+    /**
+     * 状态:0=未完成,1=已完成
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 制单人
+     */
+    private Long preparationId;
+
+    /**
+     * 审核人
+     */
+    private Long examineId;
+
+    /**
+     * 最后操作人
+     */
+    private Long operationId;
+
+    /**
+     * mrp状态
+     */
+    private String mrpStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 烧花,0否，1是
+     */
+    private int isBurnFlowers;
+
+    /**
+     * 定位,0否，1是
+     */
+    private int isLocation;
+
+    /**
+     * 快返,0否，1是
+     */
+    private int isQuickReturn;
+
+    /**
+     * 作废0否，1是
+     */
+    private int isToVoid;
+
+    /**
+     * 复色，0否，1是
+     */
+    private int isMulticolor;
+
+    /**
+     * 首单，0否，1是
+     */
+    private int isFirstOrder;
+
+    /**
+     * 首次加工，0否，1是
+     */
+    private int isFirstProcessing;
+
+    /**
+     * 紧急，0否，1是
+     */
+    private int isUrgent;
+
+    /**
+     * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
+     */
+    private int craftStatus;
+
+    /**
+     * 销货单id
+     */
+    private Long goodsSalesId;
+
+    /**
+     * 宽幅
+     */
+    private String width;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 订单号
+     */
+    private String orderNum;
+
+    /**
+     * 分页以及数量展示
+     */
+    private String pageList;
+
+    /**
+     * 打印状态
+     */
+    private int printStatus;
+
+    /**
+     * 发货数量
+     */
+    private double shipNum;
+
+    /**
+     * 已收款
+     */
+    private double paidForAmount;
+
+    /**
+     * 尾款
+     */
+    private double overAmount;
+
+    /**
+     * 备注
+     */
+    private String billRemark;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+
+    /**
+     * 发货时间
+     */
+    private Date shippingTime;
+
+    /**
+     *用户id
+     */
+    private Long userId;
+
+    /**
+     * 是否补货，0否，1是
+     */
+    private int isBuhuo;
+
+    /**
+     * 是否系统单，0否，1是
+     */
+    private String isSys;
+
+    /**
+     *
+     */
+    private Date zhuanyinTime;
+
+    /**
+     *
+     */
+    private int outFactoryId;
+
+    /**
+     *
+     */
+    private int shFactoryId;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/UserOrderTemplateBo.java

@@ -57,4 +57,19 @@ public class UserOrderTemplateBo {
      * 版图图片
      */
     private String image;
+
+    /**
+     * 真实数量
+     */
+    private int realAmount;
+
+    /**
+     * 烧花价格
+     */
+    private double shaohuaPrice;
+
+    /**
+     * 烧花总价
+     */
+    private double shaohuaTotalPrice;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/BulkOrderPlanVo.java

@@ -0,0 +1,321 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.BulkOrderPlan;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.customerManagement.domain.vo.CustomerVo;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+
+@AutoMapper(target = BulkOrderPlan.class)
+public class BulkOrderPlanVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 系统单号
+     */
+    private String sysNo;
+
+    /**
+     * 订单编号
+     */
+    private String scNo;
+
+    /**
+     * 生产计划单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 单据日期
+     */
+    private Date purchaseTime;
+
+    /**
+     * 交货时间
+     */
+    private Date deliveryTime;
+
+    /**
+     * 车间
+     */
+    private int workshopId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品单位
+     */
+    private int goodsUnit;
+
+    /**
+     * 基本单位
+     */
+    private int defaultUnit;
+
+    /**
+     * 数量
+     */
+    private double number;
+
+    /**
+     * 份数
+     */
+    private double fenNumber;
+
+    /**
+     * 基本数量
+     */
+    private double basicNumber;
+
+    /**
+     * 基本份数
+     */
+    private double basicFenNumber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    private double craftPrice;
+
+    /**
+     * 单价
+     */
+    private double price;
+
+    /**
+     * 金额
+     */
+    private double allMoney;
+
+    /**
+     * 审核状态:0=未审核,1=已审核
+     */
+    private String examineStatus;
+
+    /**
+     * 审核时间
+     */
+    private Date examineTime;
+
+    /**
+     * 状态:0=未完成,1=已完成
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 制单人
+     */
+    private Long preparationId;
+
+    /**
+     * 审核人
+     */
+    private Long examineId;
+
+    /**
+     * 最后操作人
+     */
+    private Long operationId;
+
+    /**
+     * mrp状态
+     */
+    private String mrpStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 烧花,0否，1是
+     */
+    private int isBurnFlowers = 0;
+
+    /**
+     * 定位,0否，1是
+     */
+    private int isLocation = 0;
+
+    /**
+     * 快返,0否，1是
+     */
+    private int isQuickReturn = 0;
+
+    /**
+     * 作废0否，1是
+     */
+    private int isToVoid = 0;
+
+    /**
+     * 复色，0否，1是
+     */
+    private int isMulticolor = 0;
+
+    /**
+     * 首单，0否，1是
+     */
+    private int isFirstOrder = 0;
+
+    /**
+     * 首次加工，0否，1是
+     */
+    private int isFirstProcessing = 0;
+
+    /**
+     * 紧急，0否，1是
+     */
+    private int isUrgent = 0;
+
+    /**
+     * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
+     */
+    private int craftStatus = 1;
+
+    /**
+     * 销货单id
+     */
+    private Long goodsSalesId;
+
+    /**
+     * 宽幅
+     */
+    private String width;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 订单号
+     */
+    private String orderNum;
+
+    /**
+     * 分页以及数量展示
+     */
+    private String pageList;
+
+    /**
+     * 打印状态
+     */
+    private int printStatus = 0;
+
+    /**
+     * 发货数量
+     */
+    private double shipNum;
+
+    /**
+     * 已收款
+     */
+    private double paidForAmount;
+
+    /**
+     * 尾款
+     */
+    private double overAmount;
+
+    /**
+     * 备注
+     */
+    private String billRemark;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+
+    /**
+     * 发货时间
+     */
+    private Date shippingTime;
+
+    /**
+     *用户id
+     */
+    private Long userId;
+
+    /**
+     * 是否补货，0否，1是
+     */
+    private int isBuhuo = 0;
+
+    /**
+     * 是否系统单，0否，1是
+     */
+    private String isSys = "0";
+
+    /**
+     *
+     */
+    private Date zhuanyinTime;
+
+    /**
+     *
+     */
+    private int outFactoryId;
+
+    /**
+     * 烧花工厂Id
+     */
+    private int shFactoryId;
+
+    /**
+     * 用户订单VO对象
+     */
+    UserOrderVo userOrder;
+
+    /**
+     * 客户信息VO对象
+     */
+    CustomerVo customer;
+
+    /**
+     * 商品信息VO对象
+     */
+    BulkOrderListVo goodsInfo;
+
+    /**
+     * 底布VO对象
+     */
+    DiBuVo diBu;
+
+    /**
+     * 版图列表
+     */
+    List<UserOrderTemplateVo> templateList;
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/UserOrderTemplateVo.java

@@ -57,4 +57,19 @@ public class UserOrderTemplateVo {
      * 版图图片
      */
     private String image;
+
+    /**
+     * 真实数量
+     */
+    private int realAmount;
+
+    /**
+     * 烧花价格
+     */
+    private double shaohuaPrice;
+
+    /**
+     * 烧花总价
+     */
+    private double shaohuaTotalPrice;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderPlanMapper.java

@@ -0,0 +1,20 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.BulkOrderPlan;
+import org.dromara.bulk.domain.vo.BulkOrderPlanVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+
+/**
+ * 生产计划 Mapper
+ */
+@Mapper
+public interface BulkOrderPlanMapper extends BaseMapperPlus<BulkOrderPlan, BulkOrderPlanVo> {
+    /**
+     * 根据id查询订单编号
+     * @param id id
+     * @return 订单编号
+     */
+    String selectOrderNumberById(Long id);
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapstruct/NewBulkOrderMapstruct.java

@@ -1,12 +1,12 @@
 package org.dromara.bulk.mapstruct;
 
 import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.BulkOrderPlan;
 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.Mapper;
 import org.mapstruct.Mapping;
 
@@ -62,11 +62,11 @@ public interface NewBulkOrderMapstruct {
     @Mapping(target = "examineStatus", constant = "0")
     @Mapping(target = "status", constant = "0")
     @Mapping(target = "mrpStatus", constant = "0")
-    ProductionPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
-                                    OrderListBo orderList,
-                                    String sysNo,
-                                    String purchaseCode,
-                                    String orderNumber);
+    BulkOrderPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
+                                   OrderListBo orderList,
+                                   String sysNo,
+                                   String purchaseCode,
+                                   String orderNumber);
 
     /**
      * 用户订单映射

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

@@ -6,15 +6,11 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
-import org.dromara.bulk.mapper.BulkOrderListMapper;
-import org.dromara.bulk.mapper.FlowerPatternMapper;
-import org.dromara.bulk.mapper.UserOrderMapper;
-import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.bulk.mapper.*;
 import org.dromara.bulk.service.BulkOrderListService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 @RequiredArgsConstructor
 public class BulkOrderListServiceImpl implements BulkOrderListService {
 
-    private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderPlanMapper bulkOrderPlanMapper;
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
@@ -69,11 +65,11 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
             if (null == planId){
                 return 0;
             }
-            String orderNumber = productionPlanMapper.selectOrderNumberById(planId);
+            String orderNumber = bulkOrderPlanMapper.selectOrderNumberById(planId);
             Long userOrderId = userOrderMapper.selectIdByOrderNumber(orderNumber);
 
             bulkOrderListMapper.deleteById(bulkOrderListId);
-            productionPlanMapper.deleteById(planId);
+            bulkOrderPlanMapper.deleteById(planId);
             userOrderMapper.deleteById(userOrderId);
             flowerPatternMapper.deleteByUserOrderId(userOrderId);
             userOrderTemplateMapper.deleteByPlanId(planId);

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

@@ -12,8 +12,6 @@ import org.dromara.bulk.service.BulkOrderManagementService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.productionManagement.domain.ProductionPlan;
-import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.stereotype.Service;
@@ -28,7 +26,7 @@ import java.util.List;
 @RequiredArgsConstructor
 public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
 
-    private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderPlanMapper bulkOrderPlanMapper;
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
@@ -66,15 +64,15 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                 userOrderMapper.insert(userOrder);
 
                 // 生产计划映射
-                ProductionPlan productionPlan = newBulkOrderMapstruct.toProductionPlan(
+                BulkOrderPlan bulkOrderPlan = newBulkOrderMapstruct.toProductionPlan(
                     newBulkOrderBo,
                     orderList,
                     sysNo,
                     purchaseCode,
                     orderNumber
                 );
-                productionPlan.setCreateTime(newBulkOrderBo.getCreateTime());
-                productionPlanMapper.insert(productionPlan);
+                bulkOrderPlan.setCreateTime(newBulkOrderBo.getCreateTime());
+                bulkOrderPlanMapper.insert(bulkOrderPlan);
 
                 // 订单列表映射
                 BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(
@@ -83,7 +81,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                     sysNo,
                     purchaseCode,
                     userOrder.getId(),
-                    productionPlan.getId());
+                    bulkOrderPlan.getId());
                 bulkOrderList.setGoodsTypeExtend2Attr(JsonUtils.toJsonString(orderList.getMaterial()));
                 bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
 
@@ -97,7 +95,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                     List<UserOrderTemplate> templates = newBulkOrderMapstruct.toTemplateList(
                         newBulkOrderBo,
                         orderList,
-                        productionPlan.getId(),
+                        bulkOrderPlan.getId(),
                         userOrder.getId(),
                         orderList.getTemplateList()
                     );

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/BulkOrderPlanMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.bulk.mapper.BulkOrderPlanMapper">
+    <select id="selectOrderNumberById" resultType="java.lang.String">
+        SELECT order_num FROM fa_kuyou_plan WHERE id = #{id}
+    </select>
+</mapper>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/pom.xml

@@ -97,6 +97,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-tenant</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-bulkOrder</artifactId>
+        </dependency>
 
     </dependencies>
 

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/ProductionPlanVo.java

@@ -2,9 +2,15 @@ package org.dromara.productionManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.bulk.domain.vo.UserOrderTemplateVo;
+import org.dromara.bulk.domain.vo.UserOrderVo;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.customerManagement.domain.vo.CustomerVo;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 
@@ -287,7 +293,32 @@ public class ProductionPlanVo{
     private int outFactoryId;
 
     /**
-     *
+     * 烧花工厂Id
      */
     private int shFactoryId;
+
+    /**
+     * 用户订单VO对象
+     */
+    UserOrderVo userOrder;
+
+    /**
+     * 客户信息VO对象
+     */
+    CustomerVo customer;
+
+    /**
+     * 商品信息VO对象
+     */
+    BulkOrderListVo goodsInfo;
+
+    /**
+     * 底布VO对象
+     */
+    DiBuVo diBu;
+
+    /**
+     * 版图列表
+     */
+    List<UserOrderTemplateVo> templateList;
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/ProductionPlanService.java

@@ -1,7 +1,14 @@
 package org.dromara.productionManagement.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
+import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
+
 /**
  * 生产计划服务层
  */
 public interface ProductionPlanService {
+
+    Page<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery);
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ProductionPlanServiceImpl.java

@@ -1,6 +1,13 @@
 package org.dromara.productionManagement.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.UserOrderMapper;
+import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
+import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.productionManagement.service.ProductionPlanService;
 import org.springframework.stereotype.Service;
@@ -13,4 +20,12 @@ import org.springframework.stereotype.Service;
 public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderListMapper bulkOrderListMapper;
+    private final UserOrderMapper userOrderMapper;
+    private final UserOrderTemplateMapper userOrderTemplateMapper;
+
+    @Override
+    public Page<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery) {
+        return null;
+    }
 }