Merge branch 'develop' into release

pom.xml

@@ -374,6 +374,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
 
             <!--  工作流模块  -->
             <dependency>

ruoyi-admin/pom.xml

@@ -108,6 +108,12 @@
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!--  工作流模块  -->
         <dependency>
             <groupId>org.dromara</groupId>

ruoyi-admin/src/main/resources/application-dev.yml

@@ -126,7 +126,7 @@ spring.data:
     # 数据库索引
     database: 0
     # redis 密码必须配置
-#    password: ruoyi123
+    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-modules/pom.xml

@@ -19,6 +19,7 @@
         <module>ruoyi-developmentManagement</module>
         <module>ruoyi-commodityManagement</module>
         <module>ruoyi-customerManagement</module>
+        <module>ruoyi-productionManagementOfBulkOrders</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

ruoyi-modules/ruoyi-bulkOrder/pom.xml

@@ -102,6 +102,18 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-websocket</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-commodityManagement</artifactId>
+        </dependency>
+        <dependency>
+            <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/controller/BulkOrderListController.java

@@ -1,6 +1,5 @@
 package org.dromara.bulk.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
@@ -12,31 +11,51 @@ import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+/**
+ * 大货订单列表 控制层
+ */
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/bulkOrder/bulkOrderList")
 public class BulkOrderListController extends BaseController {
     private final BulkOrderListService bulkOrderListService;
 
-    @SaIgnore
+    /**
+     * 分页查询大货订单列表
+     * @param bulkOrderListBo 大货订单列表BO对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
         return bulkOrderListService.selectPageBulkOrderList(bulkOrderListBo, pageQuery);
     }
 
-    @SaIgnore
+    /**
+     * 新增大货订单列表
+     * @param bulkOrderListBo 大货订单列表BO对象
+     * @return 新增行数
+     */
     @PostMapping()
     public R<Void> insertBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
         return toAjax(bulkOrderListService.insertBulkOrder(bulkOrderListBo));
     }
 
-    @SaIgnore
+    /**
+     * 修改大货订单列表
+     * @param bulkOrderListBo 大货订单列表BO对象
+     * @return 修改行数
+     */
     @PutMapping()
     public R<Void> updateBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
         return toAjax(bulkOrderListService.updateBulkOrder(bulkOrderListBo));
     }
 
-    @SaIgnore
+    /**
+     * 批量删除大货订单列表
+     * @param bulkOrderListIds 大货订单列表ID数组
+     * @return 删除行数
+     */
     @DeleteMapping("/{bulkOrderListIds}")
     public R<Void> deleteBulkOrderById(@PathVariable Long[] bulkOrderListIds) {
         return toAjax(bulkOrderListService.deleteBulkOrderById(bulkOrderListIds));

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderManagementController.java

@@ -0,0 +1,27 @@
+package org.dromara.bulk.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+import org.dromara.bulk.service.BulkOrderManagementService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 大货订单管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/daHuoDingDanGuanLi")
+class BulkOrderManagementController extends BaseController {
+    private final BulkOrderManagementService BulkOrderManagementService;
+
+    @PostMapping()
+    public R<Void> insertBulkOrder(@RequestBody NewBulkOrderBo newBulkOrderBo){
+        return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));
+    }
+}
+

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/GoodsController.java

@@ -1,6 +1,5 @@
 package org.dromara.bulk.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.GoodsBo;
 import org.dromara.bulk.domain.vo.GoodsVo;
@@ -12,34 +11,39 @@ import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 
+/**
+ * 商品管理 控制层
+ */
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/bulkOrder/goods")
 public class GoodsController extends BaseController {
     private final GoodsService goodsService;
 
-    @SaIgnore
     @GetMapping("/PageList")
     public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
         return goodsService.selectPageGoodsList(goodsBo, pageQuery);
     }
 
-    @SaIgnore
-    @PostMapping()
+//    @PostMapping()
     public R<Void> insertGoods(@Validated @RequestBody GoodsBo goodsBo) {
         return toAjax(goodsService.insertGoods(goodsBo));
     }
 
-    @SaIgnore
-    @PutMapping()
+//    @PutMapping()
     public R<Void> updateGoods(@Validated @RequestBody GoodsBo goodsBo) {
         return toAjax(goodsService.updateGoods(goodsBo));
     }
 
-    @SaIgnore
-    @DeleteMapping("/{goodsIds}")
+//    @DeleteMapping("/{goodsIds}")
     public R<Void> deleteGoodsById(@PathVariable Long[] goodsIds) {
         return toAjax(goodsService.deleteGoodsById(goodsIds));
     }
+
+    @GetMapping("/list")
+    public List<GoodsVo> selectGoodsList() {
+        return goodsService.selectGoodsList();
+    }
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/OrderRecordController.java

@@ -0,0 +1,33 @@
+package org.dromara.bulk.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.bulk.service.OrderRecordService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/OrderRecord")
+public class OrderRecordController {
+
+    private final OrderRecordService orderRecordService;
+
+    /**
+     * 查询客户下单记录列表
+     * @param orderRecordBo
+     * @param page
+     * @return
+     */
+    @SaIgnore
+    @GetMapping("PageList")
+    public TableDataInfo<OrderRecordVo> selectPageOrderRecordList(OrderRecordBo orderRecordBo, PageQuery page) {
+        return orderRecordService.selectPageOrderList(orderRecordBo,page);
+    }
+}

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

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
+import java.util.Date;
+
 /**
 * 大货订单列表基类
 */
@@ -67,7 +69,7 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 默认单位
     */
-    private Long defaultUnit;
+    private int defaultUnit;
 
     /**
     * 进价
@@ -225,16 +227,16 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 下单时间
     */
-    private String orderTime;
+    private Date orderTime;
 
     /**
     * 交货日期
     */
-    private String deliveryDate;
+    private Date deliveryDate;
     /**
     * 目标日期
     */
-    private String targetDate;
+    private Date targetDate;
     /**
     * 订单id
     */

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

@@ -6,6 +6,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
+/**
+ * 商品基类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_goods")
@@ -39,10 +42,4 @@ public class Goods extends TenantEntity {
      */
     @TableField("more_unit_id")
     private int unit_id;
-
-    /**
-     * 商品图片
-     */
-    @TableField("goods_image")
-    private String image;
 }

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

@@ -0,0 +1,65 @@
+package org.dromara.bulk.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrderRecord extends TenantEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+
+}

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

@@ -0,0 +1,77 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+
+/**
+ * 用户订单表基类
+ */
+@Data
+@TableName("fa_kuyou_user_order")
+@EqualsAndHashCode(callSuper = true)
+public class UserOrder extends TenantEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 订单编号
+     */
+    @TableField("order_num")
+    private String orderNumber;
+
+    /**
+     * 订单价格
+     */
+    private double orderPrice = 1.00;
+
+    /**
+     * 订单状态
+     * 0=待审核,1=已审核,2=待发货,3=待收货,4=已收货,5=退款中,6=退款完成,7=交易取消,8=交易完成
+     */
+    private int status = 0;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付状态
+     * 0=支付中,1=支付成功,2=支付失败
+     */
+    private int pay_Status = 0;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+}

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

@@ -0,0 +1,59 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("fa_kuyou_user_order_template")
+public class UserOrderTemplate {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 订单id
+     * 对应fa_kuyou_user_order表id
+     */
+    private Long orderId;
+
+    /**
+     * 生产计划id
+     * 对应fa_kuyou_plan表id
+     */
+    private Long planId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 份数
+     */
+    @TableField("fen_num")
+    private int number;
+
+    /**
+     * 米数
+     */
+    @TableField("mi_num")
+    private int miter;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 大货id
+     */
+    private Long itemId;
+
+    /**
+     * 版图图片
+     */
+    private String image;
+}

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

@@ -2,13 +2,16 @@ package org.dromara.bulk.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
-* 计划详情
+* 大货订单列表BO类
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -33,13 +36,13 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 用户id
     */
-    @NotBlank(message = "用户id不能为空")
+    @NotNull(message = "用户id不能为空")
     private Long userId;
 
     /**
     * 计划ID
     */
-    @NotBlank(message = "计划ID不能为空")
+    @NotNull(message = "计划ID不能为空")
     private Long planId;
 
     /**
@@ -70,18 +73,18 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 默认单位
     */
-    private Long defaultUnit;
+    private int defaultUnit;
 
     /**
     * 进价
     */
-    @NotBlank(message = "进价不能为空")
+    @NotNull(message = "进价不能为空")
     private double purchase;
 
     /**
     * 数量
     */
-    @NotBlank(message = "数量不能为空")
+    @NotNull(message = "数量不能为空")
     private double number;
 
     /**
@@ -110,7 +113,7 @@ public class BulkOrderListBo extends BaseEntity {
     private String remark;
 
     /**
-    * 面料id
+    * 面料id(大货编号)
     */
     private String goodsTypeExtend1Id;
 
@@ -150,7 +153,7 @@ public class BulkOrderListBo extends BaseEntity {
     private String goodsTypeExtend4Attr;
 
     /**
-    * 底布
+    * 底布名称
     */
     private String baseCloth;
 
@@ -217,21 +220,22 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 下单码数
     */
+    @NotBlank(message = "下单码数不能为空")
     private String numberOrdersPlaced;
 
     /**
     * 下单时间
     */
-    private String orderTime;
+    private Date orderTime;
 
     /**
     * 交货日期
     */
-    private String deliveryDate;
+    private Date deliveryDate;
     /**
     * 目标日期
     */
-    private String targetDate;
+    private Date targetDate;
     /**
     * 订单id
     */
@@ -243,7 +247,6 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 下单码数类型
     */
-    @NotBlank(message = "下单码数类型不能为空")
     private String numberOrdersPlacedType;
     /**
     * 发货数量
@@ -278,4 +281,9 @@ public class BulkOrderListBo extends BaseEntity {
      */
     private String shaohuaDabaoCount;
 
+    /**
+     * 商品图片
+     */
+    private String image;
+
 }

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

@@ -6,18 +6,36 @@ import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.Goods;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+/**
+ * 商品BO类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Goods.class, reverseConvertGenerate = false)
 public class GoodsBo extends BaseEntity {
 
+    /**
+     * 商品id
+     */
     private Long id;
 
+    /**
+     * 商品编码
+     */
     private String code;
 
+    /**
+     * 商品名称
+     */
     private String name;
 
+    /**
+     * 规格id
+     */
     private String specificationId;
 
+    /**
+     * 单位id
+     */
     private int unit_id;
 }

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

@@ -0,0 +1,43 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 创建新生产计划BO类
+ */
+
+@Data
+public class NewBulkOrderBo {
+
+    /**
+     * 用户id
+     */
+    private Long user_id;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 电话
+     */
+    private int phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 订单信息列表
+     */
+    private List<OrderListBo> orderLists;
+}

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

@@ -0,0 +1,139 @@
+package org.dromara.bulk.domain.bo;
+
+import lombok.Data;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
+import org.dromara.commodityManagement.domain.bo.OemBo;
+import org.dromara.commodityManagement.domain.bo.TemplateBo;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class OrderListBo {
+
+    /**
+     * 大货编号
+     */
+    private DaHuoNumberBo DaHuoNumberBo;
+
+    /**
+     * 成衣厂
+     */
+    private String garmentFactory;
+
+    /**
+     * 成衣厂联系人
+     */
+    private String garmentFactoryPeople;
+
+    /**
+     * 成衣厂电话
+     */
+    private String garmentFactoryTel;
+
+    /**
+     * 收货地址
+     */
+    private String receivingAddress;
+
+    /**
+     * 消耗天数
+     */
+    private String currentTimeConsumption;
+
+    /**
+     * 下单时间
+     */
+    private Date orderTime;
+
+    /**
+     * 目标日期
+     */
+    private Date targetDate;
+
+    /**
+     * 底布名称
+     */
+    private String baseCloth;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 品牌组
+     */
+    private String brandGroup;
+
+    /**
+     * 工艺类型
+     */
+    private CraftBo craft;
+
+    /**
+     * 版图列表
+     */
+    private List<TemplateBo> templateList;//未找到表
+
+    /**
+     * 烧花,0否，1是
+     */
+    private int isBurnFlowers = 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 isUrgent = 0;
+
+    /**
+     * 补货，0否，1是
+     */
+    private int isBuhuo = 0;
+
+    /**
+     * 系统单，0否，1是
+     */
+    private String isSys = "0";
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 花型号
+     */
+    private OemBo Oem;
+
+    /**
+     * 款式图
+     */
+    private String styleImage;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.bulk.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+
+import java.util.Date;
+
+@Data
+public class OrderRecordBo extends BaseEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+}

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

@@ -0,0 +1,73 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.UserOrder;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = UserOrder.class, reverseConvertGenerate = false)
+public class UserOrderBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+
+    /**
+     * 订单价格
+     */
+    private double orderPrice = 1.00;
+
+    /**
+     * 订单状态
+     * 0=待审核,1=已审核,2=待发货,3=待收货,4=已收货,5=退款中,6=退款完成,7=交易取消,8=交易完成
+     */
+    private int status = 0;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付状态
+     * 0=支付中,1=支付成功,2=支付失败
+     */
+    private int pay_Status = 0;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+}

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

@@ -0,0 +1,60 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.UserOrderTemplate;
+
+/**
+ * 用户订单版图BO类
+ */
+@Data
+@AutoMapper(target = UserOrderTemplate.class, reverseConvertGenerate = false)
+public class UserOrderTemplateBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 订单id
+     * 对应fa_kuyou_user_order表id
+     */
+    private Long orderId;
+
+    /**
+     * 生产计划id
+     * 对应fa_kuyou_plan表id
+     */
+    private Long planId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 份数
+     */
+    private int number;
+
+    /**
+     * 米数
+     */
+    private int miter;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 大货id
+     */
+    private Long itemId;
+
+    /**
+     * 版图图片
+     */
+    private String image;
+}

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

@@ -6,8 +6,10 @@ import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
-* 计划详情
+* 大货订单列表BO类
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -218,16 +220,16 @@ public class BulkOrderListVo extends BaseEntity {
     /**
     * 下单时间
     */
-    private String orderTime;
+    private Date orderTime;
 
     /**
     * 交货日期
     */
-    private String deliveryDate;
+    private Date deliveryDate;
     /**
     * 目标日期
     */
-    private String targetDate;
+    private Date targetDate;
     /**
     * 订单id
     */
@@ -273,4 +275,9 @@ public class BulkOrderListVo extends BaseEntity {
      */
     private String shaohuaDabaoCount;
 
+    /**
+     * 商品图片
+     */
+    private String image;
+
 }

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

@@ -6,6 +6,9 @@ import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.Goods;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
+/**
+ * 商品VO类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Goods.class)
@@ -35,9 +38,4 @@ public class GoodsVo extends BaseEntity {
      * 单位id
      */
     private int unit_id;
-
-    /**
-     * 图片
-     */
-    private String image;
 }

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

@@ -0,0 +1,66 @@
+package org.dromara.bulk.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.OrderRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = OrderRecord.class)
+public class OrderRecordVo extends BaseEntity {
+    /**
+     * 订单号
+     */
+    @TableField(value = "sc_no")
+    private String scNo;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 下单图片
+     */
+    private String goodsImage;
+
+    /**
+     * 订单状态
+     */
+    private int status;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 确认收货时间
+     */
+    private Date confirmDeliveryTime;
+}

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

@@ -0,0 +1,60 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.UserOrderTemplate;
+
+/**
+ * 用户订单版图VO类
+ */
+@Data
+@AutoMapper(target = UserOrderTemplate.class)
+public class UserOrderTemplateVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 订单id
+     * 对应fa_kuyou_user_order表id
+     */
+    private Long orderId;
+
+    /**
+     * 生产计划id
+     * 对应fa_kuyou_plan表id
+     */
+    private Long planId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 份数
+     */
+    private int number;
+
+    /**
+     * 米数
+     */
+    private int miter;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 大货id
+     */
+    private Long itemId;
+
+    /**
+     * 版图图片
+     */
+    private String image;
+}

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

@@ -0,0 +1,75 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.UserOrder;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = UserOrder.class)
+public class UserOrderVo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+
+    /**
+     * 订单价格
+     */
+    private double orderPrice = 1.00;
+
+    /**
+     * 订单状态
+     * 0=待审核,1=已审核,2=待发货,3=待收货,4=已收货,5=退款中,6=退款完成,7=交易取消,8=交易完成
+     */
+    private int status = 0;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付状态
+     * 0=支付中,1=支付成功,2=支付失败
+     */
+    private int pay_Status = 0;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+}

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

@@ -1,18 +1,33 @@
 package org.dromara.bulk.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
-* @author kgy
-* @description 针对表【fa_kuyou_plan_info(计划详情)】的数据库操作Mapper
-* @createDate 2025-03-13 15:57:15
-* @Entity org.dromara.bulk.domain.bulkOrderList
+ * 大货列表Mapper类
 */
 @Mapper
 public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkOrderListVo> {
+    /**
+     * 查询大货列表和商品图像
+     * @param page 分页对象
+     * @param wrapper 查询条件
+     * @return 分页对象
+     */
+    Page<BulkOrderListVo> selectVoPageWithGoodImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
+
+    /**
+     * 查询大货列表最近插入的ID
+     * @return ID
+     */
+    Long selectLastId();
 
 }
 

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

@@ -0,0 +1,17 @@
+package org.dromara.bulk.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.bulk.domain.OrderRecord;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface OrderRecordMapper extends BaseMapperPlus<OrderRecord, OrderRecordVo> {
+    Page<OrderRecordVo> selectVoPageWithUserId(IPage<OrderRecordVo> page, @Param(Constants.WRAPPER) QueryWrapper<OrderRecord> wrapper);
+}

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

@@ -0,0 +1,18 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.UserOrder;
+import org.dromara.bulk.domain.vo.UserOrderVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 用户订单Mapper
+ */
+@Mapper
+public interface UserOrderMapper extends BaseMapperPlus<UserOrder, UserOrderVo> {
+    /**
+     * 查询最后一条订单id
+     * @return 订单id
+     */
+    Long selectLastId();
+}

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

@@ -0,0 +1,13 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.UserOrderTemplate;
+import org.dromara.bulk.domain.vo.UserOrderTemplateVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 用户订单版图Mapper
+ */
+@Mapper
+public interface UserOrderTemplateMapper extends BaseMapperPlus<UserOrderTemplate, UserOrderTemplateVo> {
+}

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

@@ -0,0 +1,7 @@
+package org.dromara.bulk.service;
+
+import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+
+public interface BulkOrderManagementService {
+    int insertBulkOrder(NewBulkOrderBo newBulkOrderBo);
+}

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

@@ -0,0 +1,10 @@
+package org.dromara.bulk.service;
+
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface OrderRecordService {
+    TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page);
+}

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

@@ -17,20 +17,34 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 
 
+/**
+ * 大货订单列表服务层实现
+ */
 @Service
 @RequiredArgsConstructor
 public class BulkOrderListServiceImpl implements BulkOrderListService {
 
     private final BulkOrderListMapper bulkOrderListMapper;
 
+    /**
+     * 查询大货订单列表分页信息
+     * @param bulkOrderListBo 大货订单BO对象
+     * @param pageQuery 分页参数
+     * @return 大货订单列表分页信息
+     */
     @Override
     public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
         QueryWrapper<BulkOrderList> qw = new QueryWrapper<>();
         qw.like(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
-        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPage(pageQuery.build(), qw);
+        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPageWithGoodImage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 添加大货订单
+     * @param bulkOrderListBo 大货订单BO对象
+     * @return 添加行数
+     */
     @Override
     public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
         OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
@@ -39,11 +53,21 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
         return bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
+    /**
+     * 修改大货订单
+     * @param bulkOrderListBo 大货订单BO对象
+     * @return 更新行数
+     */
     @Override
     public int updateBulkOrder(BulkOrderListBo bulkOrderListBo) {
         return bulkOrderListMapper.updateById(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
+    /**
+     * 删除大货订单
+     * @param bulkOrderListIds 大货订单ID数组
+     * @return 删除行数
+     */
     @Override
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
         return bulkOrderListMapper.deleteByIds(Arrays.asList(bulkOrderListIds));

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

@@ -0,0 +1,173 @@
+package org.dromara.bulk.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.BulkOrderList;
+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.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.UserOrderMapper;
+import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.bulk.service.BulkOrderManagementService;
+import org.dromara.commodityManagement.domain.Template;
+import org.dromara.commodityManagement.domain.bo.TemplateBo;
+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.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 大货订单管理服务层实现
+ */
+@Service
+@RequiredArgsConstructor
+public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
+
+    private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderListMapper bulkOrderListMapper;
+    private final UserOrderMapper userOrderMapper;
+    private final UserOrderTemplateMapper userOrderTemplateMapper;
+
+    @Override
+    public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
+        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
+        for (OrderListBo orderList : newBulkOrderBo.getOrderLists()){
+            String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
+            String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
+            String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
+
+            productionPlanMapper.insert(initProductionPlanBo(orderList, sysNo, purchaseCode, orderNumber));
+
+            bulkOrderListMapper.insert(initBulkOrderListBo(orderList, sysNo, purchaseCode));
+
+            Long orderId = userOrderMapper.selectLastId();
+            Long planId = productionPlanMapper.selectLastId();
+
+            List<UserOrderTemplate> userOrderTemplate = initUserOrderTemplate(orderList, orderId, planId);
+            userOrderTemplateMapper.insert(userOrderTemplate);
+        }
+
+        return 0;
+    }
+
+    /**
+     * 初始化大货订单列表BO对象
+     * @param orderList 订单列表
+     * @param sysNo 系统单号
+     * @param purchaseCode 生产单号
+     * @return 构建完毕的BO对象
+     */
+    private BulkOrderList initBulkOrderListBo(OrderListBo orderList, String sysNo, String purchaseCode) {
+        BulkOrderList bulkOrderList = new BulkOrderList();
+        //设置系统单号
+        bulkOrderList.setSysNo(sysNo);
+        //设置生产单号
+        bulkOrderList.setScNo(purchaseCode);
+        //设置商品ID
+        bulkOrderList.setGoodsId(9L);
+        //设置商品编号
+        bulkOrderList.setGoodsCode("SP001");
+        //设置商品名称
+        bulkOrderList.setGoodsName("图片下单");
+        //设置单位ID
+        bulkOrderList.setUnitId(5);
+        //设置默认单位ID
+        bulkOrderList.setDefaultUnit(5);
+        //设置大货编号
+        bulkOrderList.setGoodsTypeExtend1Id(orderList.getDaHuoNumberBo().getName());
+        //设置成衣厂
+        bulkOrderList.setGarmentFactory(orderList.getGarmentFactory());
+        //设置成衣厂联系人
+        bulkOrderList.setGarmentFactoryPeople(orderList.getGarmentFactoryPeople());
+        //设置成衣厂电话
+        bulkOrderList.setGarmentFactoryTel(orderList.getGarmentFactoryTel());
+        //设置收货地址
+        bulkOrderList.setReceivingAddress(orderList.getReceivingAddress());
+        //设置当前消耗时间
+        bulkOrderList.setCurrentTimeConsumption(orderList.getCurrentTimeConsumption());
+        //设置下单时间
+        bulkOrderList.setOrderTime(orderList.getOrderTime());
+        //设置目标时间
+        bulkOrderList.setTargetDate(orderList.getTargetDate());
+        //设置底布
+        bulkOrderList.setBaseCloth(orderList.getBaseCloth());
+        //设置底布价格
+        bulkOrderList.setBaseClothPrice(orderList.getBaseClothPrice());
+        //设置品牌组
+        bulkOrderList.setBrandGroup(orderList.getBrandGroup());
+        //设置工艺类型并转换为JSON格式后存入
+        bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
+        //设置花型号类型并转换为JSON格式存入
+        bulkOrderList.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
+        return bulkOrderList;
+    }
+
+    /**
+     * 初始化生产计划BO对象
+     * @param orderList 订单列表
+     * @param sysNo 系统单号
+     * @param purchaseCode 生产单号
+     * @return 构建完毕的生产计划BO对象
+     */
+    private ProductionPlan initProductionPlanBo(OrderListBo orderList, String sysNo, String purchaseCode, String orderNumber) {
+        ProductionPlan productionPlan = new ProductionPlan();
+        //设置系统单号
+        productionPlan.setSysNo(sysNo);
+        //设置生产单号
+        productionPlan.setPurchaseCode(purchaseCode);
+        //设置订单单号
+        productionPlan.setOrderNum(orderNumber);
+        //设置用户id
+        productionPlan.setUserId(orderList.getUserId());
+        //设置是否烧花
+        productionPlan.setIsBurnFlowers(orderList.getIsBurnFlowers());
+        //设置是否快返
+        productionPlan.setIsQuickReturn(orderList.getIsQuickReturn());
+        //设置是否作废
+        productionPlan.setIsToVoid(orderList.getIsToVoid());
+        //设置是否多色
+        productionPlan.setIsMulticolor(orderList.getIsMulticolor());
+        //设置是否首单
+        productionPlan.setIsFirstOrder(orderList.getIsFirstOrder());
+        //设置是否紧急
+        productionPlan.setIsUrgent(orderList.getIsUrgent());
+        //设置是否补货
+        productionPlan.setIsBuhuo(orderList.getIsBuhuo());
+        //设置是否系统单
+        productionPlan.setIsSys(orderList.getIsSys());
+        //设置创建时间
+        productionPlan.setCreateTime(orderList.getCreateTime());
+        return productionPlan;
+    }
+
+    private List<UserOrderTemplate> initUserOrderTemplate(OrderListBo orderList, Long orderId, Long planId) {
+        ArrayList<UserOrderTemplate> userOrderTemplateList = new ArrayList<>();
+        for (TemplateBo templateBo : orderList.getTemplateList()) {
+            UserOrderTemplate userOrderTemplate = new UserOrderTemplate();
+            //设置用户id
+            userOrderTemplate.setUserId(orderList.getUserId());
+            //设置订单id 对应fa_kuyou_user_order表id
+            userOrderTemplate.setOrderId(orderId);
+            //设置生产计划id 对应fa_kuyou_production_plan表id
+            userOrderTemplate.setPlanId(planId);
+            //设置大货编号id
+            userOrderTemplate.setItemId(orderList.getDaHuoNumberBo().getId());
+            //设置份数
+            userOrderTemplate.setNumber(templateBo.getNumber());
+            //设置米数
+            userOrderTemplate.setMiter(templateBo.getMiter());
+            //设置版图名称
+            userOrderTemplate.setName(templateBo.getName());
+            //设置版图图片
+            userOrderTemplate.setImage(templateBo.getImage());
+            userOrderTemplateList.add(userOrderTemplate);
+        }
+        return userOrderTemplateList;
+    }
+}

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

@@ -8,39 +8,71 @@ import org.dromara.bulk.domain.bo.GoodsBo;
 import org.dromara.bulk.domain.vo.GoodsVo;
 import org.dromara.bulk.mapper.GoodsMapper;
 import org.dromara.bulk.service.GoodsService;
+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.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
+/**
+ * 商品管理服务层实现
+ */
 @Service
 @RequiredArgsConstructor
 public class GoodsServiceImpl implements GoodsService {
 
     private final GoodsMapper goodsMapper;
+
+    /**
+     * 分页查询商品列表
+     * @param goodsBo 商品BO对象
+     * @param pageQuery 分页查询条件
+     * @return 分页信息
+     */
     @Override
     public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
         QueryWrapper<Goods> qw = new QueryWrapper<>();
+        qw.like(null != goodsBo.getId(), "id", goodsBo.getId());
         Page<GoodsVo> page = goodsMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 新增商品
+     * @param goodsBo 商品BO对象
+     * @return 新增行数
+     */
     @Override
     public int insertGoods(GoodsBo goodsBo) {
-        return 0;
+        return goodsMapper.insert(MapstructUtils.convert(goodsBo, Goods.class));
     }
 
+    /**
+     * 修改商品
+     * @param goodsBo 商品BO对象
+     * @return 更新行数
+     */
     @Override
     public int updateGoods(GoodsBo goodsBo) {
-        return 0;
+        return goodsMapper.updateById(MapstructUtils.convert(goodsBo, Goods.class));
     }
 
+    /**
+     * 删除商品
+     * @param goodsIds 商品ID数组
+     * @return 删除行数
+     */
     @Override
     public int deleteGoodsById(Long[] goodsIds) {
-        return 0;
+        return goodsMapper.deleteByIds(Arrays.asList(goodsIds));
     }
 
+    /**
+     * 查询商品列表
+     * @return 商品VO列表
+     */
     @Override
     public List<GoodsVo> selectGoodsList() {
         return goodsMapper.selectVoList();

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

@@ -0,0 +1,42 @@
+package org.dromara.bulk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.OrderRecord;
+import org.dromara.bulk.domain.bo.OrderRecordBo;
+import org.dromara.bulk.domain.vo.OrderRecordVo;
+import org.dromara.bulk.mapper.OrderRecordMapper;
+import org.dromara.bulk.service.OrderRecordService;
+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.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service
+@RequiredArgsConstructor
+public class OrderRecordServiceImpl implements OrderRecordService {
+
+    private final OrderRecordMapper orderRecordMapper;
+
+    /**
+     * 查询客户下单记录列表
+     * @param orderRecordBo
+     * @param page
+     * @return
+     */
+    @Override
+    public TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page) {
+        QueryWrapper<OrderRecord> qw = new QueryWrapper<>();
+        Map<String, Object> params = orderRecordBo.getParams();
+        qw.like(StringUtils.isNotBlank(orderRecordBo.getScNo()),"pi.sc_no", orderRecordBo.getScNo());
+        qw.like(StringUtils.isNotBlank(orderRecordBo.getItemNumber()),"pi.item_number", orderRecordBo.getItemNumber());
+        qw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+            "uo.create_time", params.get("beginCreateTime"), params.get("endCreateTime"));
+        Page<OrderRecordVo> result = orderRecordMapper.selectVoPageWithUserId(page.build(),qw);
+        return TableDataInfo.build(result);
+    }
+}

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

@@ -3,4 +3,121 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.BulkOrderListMapper">
+    <resultMap id="BulkOrderListResultMap" type="org.dromara.bulk.domain.vo.BulkOrderListVo">
+        <id property="id" column="id"/>
+        <result property="sysNo" column="sys_no"/>
+        <result property="scNo" column="sc_no"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsCode" column="goods_code"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="goodsNote" column="goods_note"/>
+        <result property="unitId" column="unit_id"/>
+        <result property="purchase" column="purchase"/>
+        <result property="number" column="number"/>
+        <result property="fenNumber" column="fen_number"/>
+        <result property="basicNmber" column="basic_nmber"/>
+        <result property="basicFenNmber" column="basic_fen_nmber"/>
+        <result property="money" column="money"/>
+        <result property="remark" column="remark"/>
+        <result property="goodsTypeExtend1Id" column="goods_type_extend_1_id"/>
+        <result property="goodsTypeExtend1Attr" column="goods_type_extend_1_attr"/>
+        <result property="goodsTypeExtend2Id" column="goods_type_extend_2_id"/>
+        <result property="goodsTypeExtend2Attr" column="goods_type_extend_2_attr"/>
+        <result property="goodsTypeExtend3Id" column="goods_type_extend_3_id"/>
+        <result property="goodsTypeExtend3Attr" column="goods_type_extend_3_attr"/>
+        <result property="goodsTypeExtend4Id" column="goods_type_extend_4_id"/>
+        <result property="goodsTypeExtend4Attr" column="goods_type_extend_4_attr"/>
+        <result property="baseCloth" column="base_cloth"/>
+        <result property="baseClothPrice" column="base_cloth_price"/>
+        <result property="gongyiPrice" column="gongyi_price"/>
+        <result property="itemNumber" column="item_number"/>
+        <result property="weight" column="weight"/>
+        <result property="menfu" column="menfu"/>
+        <result property="machine" column="machine"/>
+        <result property="brandGroup" column="brand_group"/>
+        <result property="garmentFactory" column="garment_factory"/>
+        <result property="garmentFactoryPeople" column="garment_factory_people"/>
+        <result property="garmentFactoryTel" column="garment_factory_tel"/>
+        <result property="receivingAddress" column="receiving_address"/>
+        <result property="currentTimeConsumption" column="current_time_consumption"/>
+        <result property="numberOrdersPlaced" column="number_orders_placed"/>
+        <result property="orderTime" column="order_time"/>
+        <result property="deliveryDate" column="delivery_date"/>
+        <result property="targetDate" column="target_date"/>
+        <result property="userOrderId" column="user_order_id"/>
+        <result property="goodsSalesInfoId" column="goods_sales_info_id"/>
+        <result property="numberOrdersPlacedType" column="number_orders_placed_type"/>
+        <result property="shipNum" column="ship_num"/>
+        <result property="billRemark" column="bill_remark"/>
+        <result property="duizhangStatus" column="duizhang_status"/>
+        <result property="baibuType" column="baibu_type"/>
+        <result property="baibuPrice" column="baibu_price"/>
+        <result property="baibuUnit" column="baibu_unit"/>
+        <result property="shaohuaDabaoCount" column="shaohua_dabao_count"/>
+        <result property="image" column="goods_image"/>
+    </resultMap>
+    <select id="selectVoPageWithGoodImage" resultType="org.dromara.bulk.domain.vo.BulkOrderListVo">
+        SELECT
+            bo.id,
+            bo.sys_no,
+            bo.sc_no,
+            bo.goods_id,
+            bo.goods_code,
+            bo.goods_name,
+            bo.goods_note,
+            bo.unit_id,
+            bo.purchase,
+            bo.number,
+            bo.fen_number,
+            bo.basic_nmber,
+            bo.basic_fen_nmber,
+            bo.money,
+            bo.remark,
+            bo.goods_type_extend_1_id,
+            bo.goods_type_extend_1_attr,
+            bo.goods_type_extend_2_id,
+            bo.goods_type_extend_2_attr,
+            bo.goods_type_extend_3_id,
+            bo.goods_type_extend_3_attr,
+            bo.goods_type_extend_4_id,
+            bo.goods_type_extend_4_attr,
+            bo.base_cloth,
+            bo.base_cloth_price,
+            bo.gongyi_price,
+            bo.item_number,
+            bo.weight,
+            bo.menfu,
+            bo.machine,
+            bo.brand_group,
+            bo.garment_factory,
+            bo.garment_factory_people,
+            bo.garment_factory_tel,
+            bo.receiving_address,
+            bo.current_time_consumption,
+            bo.number_orders_placed,
+            bo.order_time,
+            bo.delivery_date,
+            bo.target_date,
+            bo.user_order_id,
+            bo.goods_sales_info_id,
+            bo.number_orders_placed_type,
+            bo.ship_num,
+            bo.bill_remark,
+            bo.duizhang_status,
+            bo.baibu_type,
+            bo.baibu_price,
+            go.goods_image
+            FROM
+            fa_kuyou_plan_info bo
+            LEFT JOIN
+            fa_kuyou_goods go ON go.id = bo.goods_id
+            ${ew.getCustomSqlSegment()}
+    </select>
+    <select id="selectLastId" resultType="java.lang.Long">
+        SELECT
+            id
+        FROM fa_kuyou_plan_info
+        ORDER BY id DESC
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -0,0 +1,23 @@
+<?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.OrderRecordMapper">
+    <select id="selectVoPageWithUserId" resultType="org.dromara.bulk.domain.vo.OrderRecordVo">
+        SELECT
+            uo.name,
+            uo.phone,
+            uo.address,
+            uo.create_time,
+            uo.status,
+            uo.note,
+            uoi.goods_image,
+            pi.sc_no,
+            pi.item_number
+        FROM
+            fa_kuyou_user_order uo
+            LEFT JOIN fa_kuyou_user_orderinfo uoi ON uoi.user_id = uo.id
+            LEFT JOIN fa_kuyou_plan_info pi ON pi.user_id = uo.user_id
+            ${ew.getCustomSqlSegment()}
+    </select>
+</mapper>

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

@@ -0,0 +1,13 @@
+<?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.UserOrderMapper">
+    <select id="selectLastId" resultType="java.lang.Long">
+        SELECT
+            id
+        FROM fa_kuyou_user_order
+        ORDER BY id DESC
+        LIMIT 1
+    </select>
+</mapper>

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

@@ -0,0 +1,6 @@
+<?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.UserOrderTemplateMapper">
+</mapper>

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Oem.java

@@ -12,7 +12,7 @@ public class Oem extends TenantEntity {
     /**
      * 花型号 ID
      */
-    private Long id;
+    private int id;
     /**
      * 花型号名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/OemBo.java

@@ -1,12 +1,11 @@
 package org.dromara.commodityManagement.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.tenant.core.TenantEntity;
+
 
 /**
  * 花型号对象
@@ -18,8 +17,7 @@ public class OemBo extends BaseEntity {
     /**
      * 花型号 ID
      */
-    @TableId("id")
-    private Long id;
+    private int id;
     /**
      * 花型号名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/TemplateBo.java

@@ -1,5 +1,6 @@
 package org.dromara.commodityManagement.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,6 +32,16 @@ public class TemplateBo extends BaseEntity {
      */
     private String image;
 
+    /**
+     * 份数
+     */
+    private int number;
+
+    /**
+     * 米数
+     */
+    private int miter;
+
     /**
      * 增删改标志
      * 1.为删除 2.为修改 3.为新增 0.为未变动

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/OemVo.java

@@ -1,6 +1,6 @@
 package org.dromara.commodityManagement.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,8 +17,7 @@ public class OemVo extends BaseEntity {
     /**
      * 花型号ID
      */
-    @TableId("id")
-    private Long id;
+    private int id;
     /**
      *租户ID
      */

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/pom.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
+
+    <description>
+        大货订单生产管理模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-ratelimiter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/FactoryController.java

@@ -0,0 +1,113 @@
+package org.dromara.productionManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+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.FactoryBo;
+import org.dromara.productionManagement.domain.vo.FactoryVo;
+import org.dromara.productionManagement.service.FactoryService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工厂管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/productionManagement/factory")
+public class FactoryController extends BaseController {
+    private final FactoryService factoryService;
+
+    /**
+     * 根据条件获取工厂管理列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
+        return factoryService.selectPageFactoryList(factoryBo, pageQuery);
+    }
+
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 新增结果
+     */
+    @PostMapping
+    public R<Void> insertFactory(@RequestBody FactoryBo factoryBo){
+        return toAjax(factoryService.insertFactory(factoryBo));
+    }
+
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 修改结果
+     */
+    @PutMapping
+    public R<Void> updateFactory(@RequestBody FactoryBo factoryBo){
+        return toAjax(factoryService.updateFactory(factoryBo));
+    }
+
+    /**
+     * 将工厂放入回收站
+     * @param ids 工厂id数组
+     * @return 回收结果
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> deleteFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(factoryService.deleteFactoryByIds(ids));
+    }
+
+    /**
+     * 根据条件查询回收站工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/recycle")
+    public TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
+        return factoryService.selectRecycleFactoryList(factoryBo, pageQuery);
+    }
+
+    /**
+     * 还原回收站中指定id的工厂
+     * @param ids 工厂id数组
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(factoryService.backFactoryByIds(ids));
+    }
+
+    /**
+     * 还原回收站中的全部工厂
+     * @return 还原结果
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backFactoryAll() {
+        return toAjax(factoryService.backFactoryAll());
+    }
+
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param ids 工厂id数组
+     * @return 销毁结果
+     */
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(factoryService.deleteRecycleFactoryByIds(ids));
+    }
+
+    /**
+     * 销毁回收站中的全部工厂
+     * @return 销毁结果
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecycleFactoryAll() {
+        return toAjax(factoryService.deleteRecycleFactoryAll());
+    }
+}

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ProductionPlanController.java

@@ -0,0 +1,6 @@
+package org.dromara.productionManagement.controller;
+
+import org.dromara.common.web.core.BaseController;
+
+public class ProductionPlanController extends BaseController {
+}

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ShaoHuaFactoryController.java

@@ -0,0 +1,114 @@
+package org.dromara.productionManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+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.ShaoHuaFactoryBo;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+import org.dromara.productionManagement.service.ShaoHuaFactoryService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 烧花工厂管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/productionManagement/shaohuaFactory")
+public class ShaoHuaFactoryController extends BaseController {
+
+    private final ShaoHuaFactoryService shaoHuaFactoryService;
+
+    /**
+     * 分页查询烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery) {
+        return shaoHuaFactoryService.selectPageShaoHuaFactoryList(shaohuaFactoryBo, pageQuery);
+    }
+
+    /**
+     * 新增烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @PostMapping
+    public R<Void> insertFactory(@RequestBody ShaoHuaFactoryBo shaohuaFactoryBo){
+        return toAjax(shaoHuaFactoryService.insertFactory(shaohuaFactoryBo));
+    }
+
+    /**
+     * 修改烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @PutMapping
+    public R<Void> updateFactory(@RequestBody ShaoHuaFactoryBo shaohuaFactoryBo){
+        return toAjax(shaoHuaFactoryService.updateFactory(shaohuaFactoryBo));
+    }
+
+    /**
+     * 删除烧花工厂信息
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> deleteFactoryByIds(@PathVariable int [] ids) {
+        return toAjax(shaoHuaFactoryService.deleteFactoryByIds(ids));
+    }
+
+    /**
+     * 回收站查询
+     * @param shaohuafactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @GetMapping("/recycle")
+    public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
+        return shaoHuaFactoryService.selectRecycleFactoryList(shaohuafactoryBo, pageQuery);
+    }
+
+    /**
+     * 回收站还原（id还原）
+     * @param ids
+     * @return
+     */
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(shaoHuaFactoryService.backFactoryByIds(ids));
+    }
+
+    /**
+     * 回收站还原（全部还原）
+     * @return
+     */
+    @PostMapping("/recycle/back/all")
+    public R<Void> backFactoryAll() {
+        return toAjax(shaoHuaFactoryService.backFactoryAll());
+    }
+
+    /**
+     * 回收站删除（id删除）
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecycleFactoryByIds(@PathVariable List<Integer> ids) {
+        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryByIds(ids));
+    }
+
+    /**
+     * 回收站删除（全部删除）
+     * @return
+     */
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecycleFactoryAll() {
+        return toAjax(shaoHuaFactoryService.deleteRecycleFactoryAll());
+    }
+}

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

@@ -0,0 +1,35 @@
+package org.dromara.productionManagement.domain;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_out_factory")
+public class Factory extends TenantEntity {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 工厂名称
+     */
+    @NotBlank(message = "工厂名称不能为空")
+    private String name;
+    /**
+     * 工厂地址
+     */
+    private String address;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+}

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

@@ -0,0 +1,294 @@
+package org.dromara.productionManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_plan")
+public class ProductionPlan extends TenantEntity {
+
+    /**
+     * 主键
+     */
+    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 basicNmber;
+
+    /**
+     * 基本份数
+     */
+    private double basicFenNmber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    private double gongyiPrice;
+
+    /**
+     * 单价
+     */
+    private double unitPrice;
+
+    /**
+     * 金额
+     */
+    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;
+
+    /**
+     *
+     */
+    private int shFactoryId;
+}

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

@@ -0,0 +1,60 @@
+package org.dromara.productionManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 烧花工厂基类
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_sh_factory")
+public class ShaoHuaFactory extends TenantEntity {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    @NotBlank(message = "工厂名称不能为空")
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+
+}

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

@@ -0,0 +1,39 @@
+package org.dromara.productionManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.Factory;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Factory.class, reverseConvertGenerate = false)
+public class FactoryBo extends BaseEntity implements Serializable {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 工厂名称
+     */
+    private String name;
+    /**
+     * 工厂地址
+     */
+    private String address;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+}

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

@@ -0,0 +1,295 @@
+package org.dromara.productionManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ProductionPlan;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductionPlan.class, reverseConvertGenerate = false)
+public class ProductionPlanBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    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 basicNmber;
+
+    /**
+     * 基本份数
+     */
+    private double basicFenNmber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    private double gongyiPrice;
+
+    /**
+     * 单价
+     */
+    private double unitPrice;
+
+    /**
+     * 金额
+     */
+    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-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ShaoHuaFactoryBo.java

@@ -0,0 +1,59 @@
+package org.dromara.productionManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 烧花工厂业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHuaFactory.class, reverseConvertGenerate = false)
+public class ShaoHuaFactoryBo extends BaseEntity implements Serializable {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+
+}

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

@@ -0,0 +1,38 @@
+package org.dromara.productionManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.Factory;
+
+import java.util.Date;
+
+/**
+ * 工厂值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Factory.class)
+public class FactoryVo extends BaseEntity {
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 工厂名称
+     */
+    private String name;
+    /**
+     * 工厂地址
+     */
+    private String address;
+    /**
+     * 联系人
+     */
+    private String linkman;
+    /**
+     * 删除时间
+     */
+    private Date deletetime;
+}

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

@@ -0,0 +1,295 @@
+package org.dromara.productionManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ProductionPlan;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductionPlan.class)
+public class ProductionPlanVo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    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 basicNmber;
+
+    /**
+     * 基本份数
+     */
+    private double basicFenNmber;
+
+    /**
+     * 底布单价
+     */
+    private double baseClothPrice;
+
+    /**
+     * 工艺单价
+     */
+    private double gongyiPrice;
+
+    /**
+     * 单价
+     */
+    private double unitPrice;
+
+    /**
+     * 金额
+     */
+    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;
+
+    /**
+     *
+     */
+    private int shFactoryId;
+}

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

@@ -0,0 +1,57 @@
+package org.dromara.productionManagement.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+
+import java.util.Date;
+
+/**
+ * 烧花工厂业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHuaFactory.class)
+public class ShaoHuaFactoryVo extends BaseEntity {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 工厂名称
+     */
+    private String name;
+
+    /**
+     * 工厂地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updatetime")
+    private Date updateTime;
+
+    /**
+     * 删除时间
+     */
+    @TableField(value = "deletetime")
+    private Date deleteTime;
+}

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/FactoryMapper.java

@@ -0,0 +1,16 @@
+package org.dromara.productionManagement.mapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.productionManagement.domain.Factory;
+import org.dromara.productionManagement.domain.vo.FactoryVo;
+
+
+@Mapper
+public interface FactoryMapper extends BaseMapperPlus<Factory, FactoryVo> {
+    /**
+     * 还原回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     */
+     void backFactoryByIds(Long[] factoryIds);
+}
+

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/ProductionPlanMapper.java

@@ -0,0 +1,19 @@
+package org.dromara.productionManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.productionManagement.domain.ProductionPlan;
+import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
+
+/**
+ * 生产计划 Mapper
+ */
+@Mapper
+public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
+
+    /**
+     * 查询最新生产计划id
+     * @return id
+     */
+    Long selectLastId();
+}

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/ShaoHuaFactoryMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.productionManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.productionManagement.domain.ShaoHuaFactory;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+
+@Mapper
+public interface ShaoHuaFactoryMapper extends BaseMapperPlus<ShaoHuaFactory, ShaoHuaFactoryVo> {
+}

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

@@ -0,0 +1,65 @@
+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.FactoryBo;
+import org.dromara.productionManagement.domain.vo.FactoryVo;
+
+import java.util.List;
+
+public interface FactoryService {
+    /**
+     * 根据条件查询工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery);
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 影响行数
+     */
+    int insertFactory(FactoryBo factoryBo);
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 影响行数
+     */
+    int updateFactory(FactoryBo factoryBo);
+    /**
+     * 将工厂放入回收站
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int deleteFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 查询回收站列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery);
+    /**
+     * 将工厂从回收站还原
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int backFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 影响行数
+     */
+    int deleteRecycleFactoryByIds(List<Integer> factoryIds);
+    /**
+     * 还原回收站中的全部工厂
+     * @return 影响行数
+     */
+    int backFactoryAll();
+    /**
+     * 销毁回收站中的全部工厂
+     * @return 影响行数
+     */
+    int deleteRecycleFactoryAll();
+}

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

@@ -0,0 +1,4 @@
+package org.dromara.productionManagement.service;
+
+public interface ProductionPlanService {
+}

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

@@ -0,0 +1,29 @@
+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.ShaoHuaFactoryBo;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+
+import java.util.List;
+
+public interface ShaoHuaFactoryService {
+
+    TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery);
+
+    int insertFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
+
+    int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo);
+
+    int deleteFactoryByIds(int[] ids);
+
+    TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery);
+
+    int backFactoryByIds(List<Integer> ids);
+
+    int backFactoryAll();
+
+    int deleteRecycleFactoryByIds(List<Integer> ids);
+
+    int deleteRecycleFactoryAll();
+}

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

@@ -0,0 +1,143 @@
+package org.dromara.productionManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+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.domain.Factory;
+import org.dromara.productionManagement.domain.bo.FactoryBo;
+import org.dromara.productionManagement.domain.vo.FactoryVo;
+import org.dromara.productionManagement.mapper.FactoryMapper;
+import org.dromara.productionManagement.service.FactoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+public class FactoryServiceImpl implements FactoryService {
+    private final FactoryMapper factoryMapper;
+
+    /**
+     * 查询数码印花厂管理列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery){
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
+        qw.like(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
+        qw.like(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
+        qw.isNull("deletetime");
+        Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 新增结果
+     */
+    @Override
+    public int insertFactory(FactoryBo factoryBo){
+        Factory factory= MapstructUtils.convert(factoryBo, Factory.class);
+        return factoryMapper.insert(factory);
+    }
+
+    /**
+     * 修改工厂
+     * @param factoryBo 工厂Bo对象
+     * @return 修改结果
+     */
+    @Override
+    public int updateFactory(FactoryBo factoryBo){
+        Factory factory= MapstructUtils.convert(factoryBo, Factory.class);
+        return factoryMapper.updateById(factory);
+    }
+
+    /**
+     * 将指定id的工厂移入回收站
+     * @param factoryIds 工厂id数组
+     * @return 删除结果
+     */
+    @Override
+    public int deleteFactoryByIds(List<Integer> factoryIds){
+        UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", factoryIds);
+        updateWrapper.set("deletetime",new Date());
+        return factoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 还原回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 还原结果
+     */
+    @Override
+    public int backFactoryByIds(List<Integer> factoryIds){
+        UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", factoryIds);
+        updateWrapper.set("deletetime",null);
+        return factoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 查询回收站中的工厂列表
+     * @param factoryBo 工厂Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @Override
+    public TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        Map<String, Object> params = factoryBo.getParams();
+        qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+            "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+        qw.isNotNull("deletetime");
+        Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 销毁回收站中指定id的工厂
+     * @param factoryIds 工厂id数组
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> factoryIds) {
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.in("id",factoryIds);
+        qw.isNotNull("deletetime");
+        return factoryMapper.delete(qw);
+    }
+
+    /**
+     * 还原回收站中所有的工厂
+     * @return 还原结果
+     */
+    @Override
+    public int backFactoryAll() {
+        UpdateWrapper<Factory> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return factoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 销毁回收站中所有的工厂
+     * @return 销毁结果
+     */
+    @Override
+    public int deleteRecycleFactoryAll() {
+        QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return factoryMapper.delete(qw);
+    }
+
+}

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

@@ -0,0 +1,4 @@
+package org.dromara.productionManagement.service.impl;
+
+public class ProductionPlanServiceImpl {
+}

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

@@ -0,0 +1,148 @@
+package org.dromara.productionManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+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.domain.ShaoHuaFactory;
+import org.dromara.productionManagement.domain.bo.ShaoHuaFactoryBo;
+import org.dromara.productionManagement.domain.vo.ShaoHuaFactoryVo;
+import org.dromara.productionManagement.mapper.ShaoHuaFactoryMapper;
+import org.dromara.productionManagement.service.ShaoHuaFactoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
+
+    private final ShaoHuaFactoryMapper shaoHuaFactoryMapper;
+
+    /**
+     * 分页查询烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<ShaoHuaFactoryVo> selectPageShaoHuaFactoryList(ShaoHuaFactoryBo shaohuaFactoryBo, PageQuery pageQuery) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getName()), "name", shaohuaFactoryBo.getName());
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getAddress()), "address", shaohuaFactoryBo.getAddress());
+        qw.eq(StringUtils.isNotBlank(shaohuaFactoryBo.getLinkman()), "linkman", shaohuaFactoryBo.getLinkman());
+        qw.isNull("deletetime");
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @Override
+    public int insertFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
+        ShaoHuaFactory shaohuaFactory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
+        return shaoHuaFactoryMapper.insert(shaohuaFactory);
+    }
+
+    /**
+     * 修改烧花工厂信息
+     * @param shaohuaFactoryBo
+     * @return
+     */
+    @Override
+    public int updateFactory(ShaoHuaFactoryBo shaohuaFactoryBo) {
+        ShaoHuaFactory factory = MapstructUtils.convert(shaohuaFactoryBo, ShaoHuaFactory.class);
+        return shaoHuaFactoryMapper.updateById(factory);
+    }
+
+    /**
+     * 删除烧花工厂信息（删除到回收站）
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteFactoryByIds(int[] ids) {
+        List<ShaoHuaFactory> list = new ArrayList<>();
+        for (int factoryId : ids) {
+            ShaoHuaFactory factory = new ShaoHuaFactory();
+            factory.setId(factoryId);
+            factory.setDeleteTime(new Date());
+            list.add(factory);
+        }
+        return shaoHuaFactoryMapper.updateById(list).size();
+    }
+
+    /**
+     * 查询回收站信息
+     * @param shaohuafactoryBo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        qw.isNotNull("deletetime");
+        Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 回收站还原（id还原）
+     * @param ids
+     * @return
+     */
+    @Override
+    public int backFactoryByIds(List<Integer> ids) {
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",ids);
+        updateWrapper.set("deletetime",null);
+        return shaoHuaFactoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 回收站还原（全部还原）
+     * @return
+     */
+    @Override
+    public int backFactoryAll() {
+        UpdateWrapper<ShaoHuaFactory> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return shaoHuaFactoryMapper.update(updateWrapper);
+    }
+
+    /**
+     * 回收站删除（id删除）
+     * @param ids
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> ids) {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.in("id",ids);
+        qw.isNotNull("deletetime");
+        return shaoHuaFactoryMapper.delete(qw);
+    }
+
+    /**
+     * 回收站删除（全部删除）
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryAll() {
+        QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return shaoHuaFactoryMapper.delete(qw);
+    }
+
+
+}

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

@@ -0,0 +1,13 @@
+<?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.FactoryMapper">
+    <update id="backFactoryByIds">
+        update fa_kuyou_factory set deletetime = null where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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="selectLastId" resultType="java.lang.Long">
+        SELECT
+            id
+        FROM fa_kuyou_plan
+        ORDER BY id DESC
+        LIMIT 1
+    </select>
+</mapper>

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

@@ -0,0 +1,15 @@
+<?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.ShaoHuaFactoryMapper">
+    <resultMap id="BaseResultMap" type="org.dromara.productionManagement.domain.ShaoHuaFactory">
+    </resultMap>
+<!--    <update id="backFactoryByIds">-->
+<!--        update fa_kuyou_factory set deletetime = null where id in-->
+<!--        <foreach collection="array" item="id" open="(" separator="," close=")">-->
+<!--            #{id}-->
+<!--        </foreach>-->
+<!--    </update>-->
+
+</mapper>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/resources/mapper/package-info.md

@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件