Merge branch 'develop' into release

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/OrderListBo.java

@@ -1,9 +1,10 @@
 package org.dromara.bulk.domain.bo;
 
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
 
@@ -124,43 +125,50 @@ public class OrderListBo {
     /**
      * 烧花,0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isBurnFlowers = 0;
 
     /**
      * 快返,0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isFirstOrder = 0;
 
     /**
      * 加急，0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isUrgent = 0;
 
     /**
      * 补货，0否，1是
      */
-    @Size(max = 1,message = "超出范围，0否，1是")
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isBuhuo = 0;
 
     /**

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-customerManagement/src/main/java/org/dromara/customerManagement/controller/CustomerController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 客户管理接口
@@ -68,4 +69,8 @@ public class CustomerController extends BaseController {
     public void exportCustomerExcel(HttpServletResponse response) {
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),customerService.selectList()),"客户管理列表.xlsx","excel/客户导出模板",response);
     }
+    @GetMapping("/getcompanyname")
+    public List<String> selectCompanyNameList() {
+        return customerService.selectCompanyNameList();
+    }
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/Customer.java

@@ -58,4 +58,8 @@ public class Customer extends TenantEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/bo/CustomerBo.java

@@ -65,4 +65,8 @@ public class CustomerBo extends BaseEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CompanyVo.java

@@ -0,0 +1,9 @@
+package org.dromara.customerManagement.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class CompanyVo {
+    private String username;
+    private String factoryName;
+}

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CustomerVo.java

@@ -60,4 +60,8 @@ public class CustomerVo extends BaseEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/mapper/CustomerMapper.java

@@ -3,8 +3,12 @@ package org.dromara.customerManagement.mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.customerManagement.domain.Customer;
+import org.dromara.customerManagement.domain.vo.CompanyVo;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 
+import java.util.List;
+
 @Mapper
 public interface CustomerMapper extends BaseMapperPlus<Customer, CustomerVo> {
+    List<CompanyVo> selectCompanyNameList();
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/CustomerService.java

@@ -42,4 +42,6 @@ public interface CustomerService {
     int deleteCustomerById(Long customerId);
 
     List<Customer> selectList();
+
+    List<String> selectCompanyNameList();
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/impl/CustomerServiceImpl.java

@@ -9,11 +9,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.customerManagement.domain.Customer;
 import org.dromara.customerManagement.domain.bo.CustomerBo;
+import org.dromara.customerManagement.domain.vo.CompanyVo;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 import org.dromara.customerManagement.mapper.CustomerMapper;
 import org.dromara.customerManagement.service.CustomerService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -73,4 +75,13 @@ public class CustomerServiceImpl implements CustomerService {
     public List<Customer> selectList() {
         return customerMapper.selectList();
     }
+
+    @Override
+    public List<String> selectCompanyNameList() {
+        List<String> companyNameList = new ArrayList<>();
+        for (CompanyVo companyVo : customerMapper.selectCompanyNameList()){
+            companyNameList.add(companyVo.getUsername()+"-"+companyVo.getFactoryName());
+        }
+        return companyNameList;
+    }
 }

ruoyi-modules/ruoyi-customerManagement/src/main/resources/mapper/CustomerMapper.xml

@@ -3,5 +3,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.customerManagement.mapper.CustomerMapper">
-
+    <select id="selectCompanyNameList" resultType="org.dromara.customerManagement.domain.vo.CompanyVo">
+        SELECT username, factory_name FROM fa_kuyou_user
+    </select>
 </mapper>

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SelfGetAddressController.java

@@ -2,16 +2,53 @@ package org.dromara.dataManagement.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.dromara.dataManagement.service.SelfGetAddressSerivce;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+import org.dromara.dataManagement.service.SelfGetAddressService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
+/**
+ * 自取地址管理接口
+ */
 @SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/getAddress")
-public class SelfGetAddressController {
-
-    private final SelfGetAddressSerivce selfGetAddressSerivce;
+public class SelfGetAddressController extends BaseController {
+    private final SelfGetAddressService selfGetAddressService;
+    @GetMapping("/PageList")
+    public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery){
+        return selfGetAddressService.selectPageSelfGetAddressList(selfGetAddressBo,pageQuery);
+    }
+    @PostMapping()
+    public R<Void> insertSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
+        return toAjax(selfGetAddressService.insertSelfGetAddress(selfGetAddressBo));
+    }
+    @PutMapping()
+    public R<Void> updateSelfGetAddress(@Validated @RequestBody SelfGetAddressBo selfGetAddressBo){
+        return toAjax(selfGetAddressService.updateSelfGetAddress(selfGetAddressBo));
+    }
+    @DeleteMapping("/{selfGetAddressIds}")
+    public R<Void> deleteSelfGetAddressByIds(@PathVariable Long[] selfGetAddressIds){
+        return toAjax(selfGetAddressService.deleteSelfGetAddressByIds(selfGetAddressIds));
+    }
+    @GetMapping("/exportExcel")
+    public void exportSelfGetAddressExcel(HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectList()),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
+    }
+    @GetMapping("/exportExcelByIds")
+    public void exportSelfGetAddressExcelByIds(@RequestParam("ids") Long[] selfGetAddressIds, HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),selfGetAddressService.selectSelfGetAddressByIds(selfGetAddressIds)),"自取地址列表.xlsx","excel/自取地址导出模板.xlsx",response);
+    }
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/SelfGetAddress.java

@@ -1,4 +1,68 @@
 package org.dromara.dataManagement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 自取地址管理基类
+ */
+@Data
+@TableName("fa_kuyou_address")
 public class SelfGetAddress {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/bo/SelfGetAddressBo.java

@@ -1,4 +1,66 @@
 package org.dromara.dataManagement.domain.bo;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+
+@Data
+@AutoMapper(target = SelfGetAddress.class, reverseConvertGenerate = false)
 public class SelfGetAddressBo {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SelfGetAddressVo.java

@@ -1,4 +1,72 @@
 package org.dromara.dataManagement.domain.vo;
 
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+
+@Data
+@AutoMapper(target = SelfGetAddress.class)
 public class SelfGetAddressVo {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 管理员id
+     */
+    private int adminId;
+    /**
+     * 地址简称
+     */
+    private String nickname;
+    /**
+     * 联系人
+     */
+    @NotBlank(message = "联系人不能为空")
+    private String connectName;
+    /**
+     * 联系电话
+     */
+    @NotBlank(message = "联系电话不能为空")
+    private String connectPhone;
+    /**
+     * 手机号码
+     */
+    @NotBlank(message = "手机号码不能为空")
+    private String connectMobile;
+    /**
+     * 省
+     */
+    private int province;
+    /**
+     * 市
+     */
+    private int city;
+    /**
+     * 区
+     */
+    private int area;
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空")
+    private String detailAddress;
+    /**
+     * 邮政编码
+     */
+    @NotBlank(message = "邮政编码不能为空")
+    private String postCode;
+    /**
+     * 默认地址:0=否,1=是
+     */
+    private String isDefault;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
 }

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/SelfGetAddressService.java

@@ -0,0 +1,23 @@
+package org.dromara.dataManagement.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+
+import java.util.List;
+
+public interface SelfGetAddressService {
+    TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery);
+
+    int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
+
+    int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo);
+
+    int deleteSelfGetAddressByIds(Long[] selfGetAddressIds);
+
+    List<SelfGetAddress> selectList();
+
+    List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds);
+}

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/service/impl/SelfGetAddressServiceImpl.java

@@ -0,0 +1,57 @@
+package org.dromara.dataManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.SelfGetAddress;
+import org.dromara.dataManagement.domain.bo.SelfGetAddressBo;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+import org.dromara.dataManagement.mapper.SelfGetAddressMapper;
+import org.dromara.dataManagement.service.SelfGetAddressService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class SelfGetAddressServiceImpl implements SelfGetAddressService {
+    private final SelfGetAddressMapper selfGetAddressMapper;
+    @Override
+    public TableDataInfo<SelfGetAddressVo> selectPageSelfGetAddressList(SelfGetAddressBo selfGetAddressBo, PageQuery pageQuery) {
+        QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectName()),"ConnectName",selfGetAddressBo.getConnectName());
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectPhone()),"ConnectPhone",selfGetAddressBo.getConnectPhone());
+        qw.like(StringUtils.isNotBlank(selfGetAddressBo.getConnectMobile()),"ConnectMobile",selfGetAddressBo.getConnectMobile());
+        Page<SelfGetAddressVo>page= selfGetAddressMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
+        SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
+        return selfGetAddressMapper.insert(selfGetAddress);
+    }
+    @Override
+    public int updateSelfGetAddress(SelfGetAddressBo selfGetAddressBo) {
+        SelfGetAddress selfGetAddress= MapstructUtils.convert(selfGetAddressBo, SelfGetAddress.class);
+        QueryWrapper<SelfGetAddress> qw=new QueryWrapper<>();
+        qw.eq("id",selfGetAddressBo.getId());
+        return selfGetAddressMapper.updateById(selfGetAddress);
+    }
+    @Override
+    public int deleteSelfGetAddressByIds(Long[] selfGetAddressIds) {
+        return selfGetAddressMapper.deleteByIds(Arrays.asList(selfGetAddressIds));
+    }
+    @Override
+    public List<SelfGetAddress> selectList() {
+        return selfGetAddressMapper.selectList();
+    }
+    @Override
+    public List<SelfGetAddress> selectSelfGetAddressByIds(Long[] selfGetAddressIds) {
+        return MapstructUtils.convert(selfGetAddressMapper.selectVoByIds(Arrays.asList(selfGetAddressIds)), SelfGetAddress.class);
+    }
+}

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/controller/ProductionPlanController.java

@@ -1,17 +1,31 @@
 package org.dromara.productionManagement.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
+import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.service.ProductionPlanService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 生产计划管理接口
  */
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/productionPlan")
 public class ProductionPlanController extends BaseController {
+
     private final ProductionPlanService productionPlanService;
+
+    @GetMapping("/PageList")
+    public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@Validated ProductionPlanBo productionPlanBo, PageQuery pageQuery){
+        return productionPlanService.selectVoPage(productionPlanBo, pageQuery);
+    }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ProductionPlanBo.java

@@ -1,6 +1,7 @@
 package org.dromara.productionManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
@@ -24,7 +25,7 @@ public class ProductionPlanBo{
     /**
      * 订单编号
      */
-    private String scNo = null;
+    private String scNo;
 
     /**
      * 生产计划单号
@@ -199,6 +200,7 @@ public class ProductionPlanBo{
     /**
      * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
      */
+    @NotNull(message = "工艺状态不能为空")
     private int craftStatus;
 
     /**
@@ -290,4 +292,9 @@ public class ProductionPlanBo{
      *
      */
     private int shFactoryId;
+
+    /**
+     * 成衣厂
+     */
+    private String garmentFactory;
 }

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/mapper/ProductionPlanMapper.java

@@ -1,6 +1,11 @@
 package org.dromara.productionManagement.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.productionManagement.domain.ProductionPlan;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
@@ -11,9 +16,10 @@ import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 @Mapper
 public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
     /**
-     * 根据id查询订单编号
-     * @param id id
-     * @return 订单编号
+     * 查询生产计划
+     * @param page 分页对象
+     * @param wrapper 查询条件
+     * @return 结果
      */
-    String selectOrderNumberById(Long id);
+    Page<ProductionPlanVo> selectProductionPlanVo(IPage<ProductionPlanVo> page, @Param(Constants.WRAPPER) QueryWrapper<ProductionPlan> wrapper);
 }

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

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

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

@@ -1,6 +1,14 @@
 package org.dromara.productionManagement.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+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.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 +21,14 @@ import org.springframework.stereotype.Service;
 public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private final ProductionPlanMapper productionPlanMapper;
+
+    @Override
+    public TableDataInfo<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery) {
+        QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
+        qw.eq("p.craft_status",productionPlanBo.getCraftStatus());
+        qw.eq(null != productionPlanBo.getUserId(),"p.user_id", productionPlanBo.getUserId());
+        qw.eq(StringUtils.isNotBlank(productionPlanBo.getGarmentFactory()),"gi.garment_factory", productionPlanBo.getGarmentFactory());
+        Page<ProductionPlanVo> page = productionPlanMapper.selectProductionPlanVo(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/resources/mapper/ProductionPlanMapper.xml

@@ -1,9 +1,71 @@
-<?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">
+<?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.productionManagement.mapper.ProductionPlanMapper">
-    <select id="selectOrderNumberById" resultType="java.lang.String">
-        SELECT order_num FROM fa_kuyou_plan WHERE id = #{id}
+
+    <resultMap id="ProductionPlanVoResult" type="org.dromara.productionManagement.domain.vo.ProductionPlanVo">
+        <!-- 基础字段映射 -->
+        <id     property="id"           column="id"          />
+        <result property="sysNo"        column="sys_no"      />
+        <result property="scNo"         column="sc_no"       />
+        <!-- 其他字段映射... -->
+
+        <!-- 关联用户订单 -->
+        <association property="userOrder" javaType="org.dromara.bulk.domain.vo.UserOrderVo">
+            <id     property="id"           column="uo_id"       />
+            <result property="orderNumber"  column="uo_order_num"/>
+            <!-- 其他用户订单字段... -->
+        </association>
+
+        <!-- 关联客户信息 -->
+        <association property="customer" javaType="org.dromara.customerManagement.domain.vo.CustomerVo">
+            <id     property="id"           column="c_id"        />
+            <result property="factoryName"  column="c_factory_name"/>
+            <!-- 其他客户字段... -->
+        </association>
+
+        <!-- 关联商品信息 -->
+        <association property="goodsInfo" javaType="org.dromara.bulk.domain.vo.BulkOrderListVo">
+            <id     property="id"           column="gi_id"       />
+            <result property="goodsName"    column="gi_goods_name"/>
+            <!-- 其他商品字段... -->
+        </association>
+
+        <!-- 关联底布信息 -->
+        <association property="diBu" javaType="org.dromara.commodityManagement.domain.vo.DiBuVo">
+            <id     property="id"           column="d_id"        />
+            <result property="name"         column="d_name"      />
+            <!-- 其他底布字段... -->
+        </association>
+
+        <!-- 关联版图列表 -->
+        <collection property="templateList" ofType="org.dromara.bulk.domain.vo.UserOrderTemplateVo">
+            <id     property="id"           column="tpl_id"      />
+            <result property="name"         column="tpl_name"    />
+            <!-- 其他版图字段... -->
+        </collection>
+    </resultMap>
+
+    <select id="selectProductionPlanVo" resultMap="ProductionPlanVoResult">
+        SELECT
+            p.*,
+            uo.id as uo_id,
+            uo.order_num as uo_order_num,
+            c.id as c_id,
+            c.factory_name as c_factory_name,
+            gi.id as gi_id,
+            gi.goods_name as gi_goods_name,
+            d.id as d_id,
+            d.name as d_name,
+            tpl.id as tpl_id,
+            tpl.name as tpl_name
+        FROM
+            fa_kuyou_plan p
+        LEFT JOIN fa_kuyou_user_order uo ON p.order_num = uo.order_num
+        LEFT JOIN fa_kuyou_user c ON uo.user_id = c.id
+        LEFT JOIN fa_kuyou_plan_info gi ON p.id = gi.plan_id
+        LEFT JOIN fa_kuyou_dibu d ON gi.base_cloth = d.name
+        LEFT JOIN fa_kuyou_user_order_template tpl ON p.id = tpl.plan_id
+        ${ew.getCustomSqlSegment()}
     </select>
+
 </mapper>