Merge branch 'develop' into release

pom.xml

@@ -379,7 +379,11 @@
                 <artifactId>ruoyi-productionManagementOfBulkOrders</artifactId>
                 <version>${revision}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-dataManagement</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!--  工作流模块  -->
             <dependency>

ruoyi-admin/pom.xml

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

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/OrderNumberGenerator.java

@@ -31,6 +31,7 @@ public class OrderNumberGenerator {
      * @return 生成的订单号为字符串。
      */
     public synchronized String generateOrderNumber(String name) {
+        StringBuilder stringBuilder = new StringBuilder();
         LocalDate today = LocalDate.now();
         String datePart = today.format(DATE_FORMATTER);
 
@@ -41,7 +42,8 @@ public class OrderNumberGenerator {
         // 通过在计数器对象上同步来确保线程安全
         synchronized (counter) {
             int count = counter.incrementAndGet();
-            return String.format(name, datePart, count);
+            stringBuilder.append(name).append(datePart).append(count);
+            return stringBuilder.toString();
         }
     }
 

ruoyi-modules/pom.xml

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

ruoyi-modules/ruoyi-bulkOrder/pom.xml

@@ -33,6 +33,11 @@
             <artifactId>ruoyi-common-sms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-mail</artifactId>

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

@@ -1,5 +1,6 @@
 package org.dromara.bulk.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
@@ -15,10 +16,11 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/bulkOrder/daHuoDingDanGuanLi")
+@RequestMapping("/bulkOrder/BulkOrderManagement")
 class BulkOrderManagementController extends BaseController {
     private final BulkOrderManagementService BulkOrderManagementService;
 
+    @SaIgnore
     @PostMapping()
     public R<Void> insertBulkOrder(@RequestBody NewBulkOrderBo newBulkOrderBo){
         return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));

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

@@ -0,0 +1,109 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 附件表基类
+ */
+@Data
+@TableName("fa_attachment")
+public class Attachment {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String category;
+
+    /**
+     * 管理员ID
+     */
+    private Long adminId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 物理路径
+     */
+    private String url;
+
+    /**
+     * 宽度
+     */
+    @TableField("imagewidth")
+    private String imageWidth;
+
+    /**
+     * 高度
+     */
+    @TableField("imageheight")
+    private String imageHeight;
+
+    /**
+     * 图片类型
+     */
+    @TableField("imagetype")
+    private String imageType;
+
+    /**
+     * 图片帧数
+     */
+    @TableField("imageframes")
+    private int imageFrames;
+
+    /**
+     * 文件名
+     */
+    @TableField("filename")
+    private String fileName;
+
+    /**
+     * 文件大小
+     */
+    @TableField("filesize")
+    private int fileSize;
+
+    /**
+     * mime类型
+     */
+    private String mimetype;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createtime")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("updatetime")
+    private Date updateTime;
+
+    /**
+     * 上传时间
+     */
+    @TableField("uploadtime")
+    private Date uploadTime;
+
+    /**
+     * 存储位置
+     */
+    private String storage;
+
+    /**
+     * sha1值
+     */
+    private String sha1;
+}

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

@@ -170,7 +170,7 @@ public class BulkOrderList extends TenantEntity {
     private double gongyiPrice;
 
     /**
-    * 款号
+    * 款号(大货编号)
     */
     private String itemNumber;
 
@@ -237,14 +237,17 @@ public class BulkOrderList extends TenantEntity {
     * 目标日期
     */
     private Date targetDate;
+
     /**
     * 订单id
     */
     private Long userOrderId;
+
     /**
     * 销货单id
     */
     private Long goodsSalesInfoId;
+
     /**
     * 下单码数类型
     */

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

@@ -0,0 +1,47 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 图片关联表基类
+ */
+@Data
+@TableName("fa_kuyou_flower_pattern")
+public class FlowerPattern {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    @TableField("image")
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    @TableField("code")
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

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

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
-import java.util.Date;
-
 
 /**
  * 用户订单表基类
@@ -68,10 +66,5 @@ public class UserOrder extends TenantEntity {
      * 支付状态
      * 0=支付中,1=支付成功,2=支付失败
      */
-    private int pay_Status = 0;
-
-    /**
-     * 支付时间
-     */
-    private Date payTime;
+    private int payStatus = 0;
 }

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

@@ -0,0 +1,100 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.Attachment;
+
+import java.util.Date;
+
+/**
+ * 附件表Bo类
+ */
+@Data
+@AutoMapper(target = Attachment.class, reverseConvertGenerate = false)
+public class AttachmentBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String category;
+
+    /**
+     * 管理员ID
+     */
+    private Long adminId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 物理路径
+     */
+    private String url;
+
+    /**
+     * 宽度
+     */
+    private String imageWidth;
+
+    /**
+     * 高度
+     */
+    private String imageHeight;
+
+    /**
+     * 图片类型
+     */
+    private String imageType;
+
+    /**
+     * 图片帧数
+     */
+    private int imageFrames;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件大小
+     */
+    private int fileSize;
+
+    /**
+     * mime类型
+     */
+    private String mimetype;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 上传时间
+     */
+    private Date uploadTime;
+
+    /**
+     * 存储位置
+     */
+    private String storage;
+
+    /**
+     * sha1值
+     */
+    private String sha1;
+}

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

@@ -11,254 +11,254 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import java.util.Date;
 
 /**
-* 大货订单列表BO类
-*/
+ * 大货订单列表BO类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = BulkOrderList.class, reverseConvertGenerate = false)
 public class BulkOrderListBo extends BaseEntity {
 
     /**
-    * id
-    */
+     * id
+     */
     private Long id;
 
     /**
-    * 系统单号
-    */
+     * 系统单号
+     */
     private String sysNo;
 
     /**
-    * 生产单号
-    */
+     * 生产单号
+     */
     private String scNo;
 
     /**
-    * 用户id
-    */
+     * 用户id
+     */
     @NotNull(message = "用户id不能为空")
     private Long userId;
 
     /**
-    * 计划ID
-    */
+     * 计划ID
+     */
     @NotNull(message = "计划ID不能为空")
     private Long planId;
 
     /**
-    * 商品ID
-    */
+     * 商品ID
+     */
     private Long goodsId;
 
     /**
-    * 商品编号
-    */
+     * 商品编号
+     */
     private String goodsCode;
 
     /**
-    * 商品名称
-    */
+     * 商品名称
+     */
     private String goodsName;
 
     /**
-    * 商品规格型号
-    */
+     * 商品规格型号
+     */
     private String goodsNote;
 
     /**
-    * 单位ID
-    */
+     * 单位ID
+     */
     private int unitId;
 
     /**
-    * 默认单位
-    */
+     * 默认单位
+     */
     private int defaultUnit;
 
     /**
-    * 进价
-    */
+     * 进价
+     */
     @NotNull(message = "进价不能为空")
     private double purchase;
 
     /**
-    * 数量
-    */
+     * 数量
+     */
     @NotNull(message = "数量不能为空")
     private double number;
 
     /**
-    * 份数
-    */
+     * 份数
+     */
     private double fenNumber;
 
     /**
-    * 基本数量
-    */
+     * 基本数量
+     */
     private double basicNmber;
 
     /**
-    * 基本份数
-    */
+     * 基本份数
+     */
     private double basicFenNmber;
 
     /**
-    * 金额
-    */
+     * 金额
+     */
     private double money;
 
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
 
     /**
-    * 面料id(大货编号)
-    */
+     * 面料id(大货编号)
+     */
     private String goodsTypeExtend1Id;
 
     /**
-    * 面料的扩展信息
-    */
+     * 面料的扩展信息
+     */
     private String goodsTypeExtend1Attr;
 
     /**
-    * 物料id
-    */
+     * 物料id
+     */
     private String goodsTypeExtend2Id;
 
     /**
-    * 物料的扩展信息
-    */
+     * 物料的扩展信息
+     */
     private String goodsTypeExtend2Attr;
 
     /**
-    * 工艺类型id
-    */
+     * 工艺类型id
+     */
     private String goodsTypeExtend3Id;
 
     /**
-    * 工艺类型的扩展信息
-    */
+     * 工艺类型的扩展信息
+     */
     private String goodsTypeExtend3Attr;
 
     /**
-    * 花型号id
-    */
+     * 花型号id
+     */
     private String goodsTypeExtend4Id;
 
     /**
-    * 花型号的扩展信息
-    */
+     * 花型号的扩展信息
+     */
     private String goodsTypeExtend4Attr;
 
     /**
-    * 底布名称
-    */
+     * 底布名称
+     */
     private String baseCloth;
 
     /**
-    * 底布单价
-    */
+     * 底布单价
+     */
     private double baseClothPrice;
 
     /**
-    * 工艺单价
-    */
+     * 工艺单价
+     */
     private double gongyiPrice;
 
     /**
-    * 款号
-    */
+     * 款号
+     */
     private String itemNumber;
 
     /**
-    * 克重
-    */
+     * 克重
+     */
     private String weight;
 
     /**
-    * 门幅
-    */
+     * 门幅
+     */
     private String menfu;
 
     /**
-    * 机器
-    */
+     * 机器
+     */
     private String machine;
 
     /**
-    * 品牌组
-    */
+     * 品牌组
+     */
     private String brandGroup;
 
     /**
-    * 成衣厂
-    */
+     * 成衣厂
+     */
     private String garmentFactory;
 
     /**
-    * 成衣厂联系人
-    */
+     * 成衣厂联系人
+     */
     private String garmentFactoryPeople;
 
     /**
-    * 成衣厂电话
-    */
+     * 成衣厂电话
+     */
     private String garmentFactoryTel;
 
     /**
-    * 收货地址
-    */
+     * 收货地址
+     */
     private String receivingAddress;
 
     /**
-    * 当前消耗
-    */
+     * 当前消耗
+     */
     private String currentTimeConsumption;
 
     /**
-    * 下单码数
-    */
+     * 下单码数
+     */
     @NotBlank(message = "下单码数不能为空")
     private String numberOrdersPlaced;
 
     /**
-    * 下单时间
-    */
+     * 下单时间
+     */
     private Date orderTime;
 
     /**
-    * 交货日期
-    */
+     * 交货日期
+     */
     private Date deliveryDate;
     /**
-    * 目标日期
-    */
+     * 目标日期
+     */
     private Date targetDate;
     /**
-    * 订单id
-    */
+     * 订单id
+     */
     private Long userOrderId;
     /**
-    * 销货单id
-    */
+     * 销货单id
+     */
     private Long goodsSalesInfoId;
     /**
-    * 下单码数类型
-    */
+     * 下单码数类型
+     */
     private String numberOrdersPlacedType;
     /**
-    * 发货数量
-    */
+     * 发货数量
+     */
     private int shipNum;
     /**
-    * 账单备注
-    */
+     * 账单备注
+     */
     private String billRemark;
     /**
-    * 账单状态
-    */
+     * 账单状态
+     */
     private int duizhangStatus;
 
     /**
@@ -285,5 +285,4 @@ public class BulkOrderListBo extends BaseEntity {
      * 商品图片
      */
     private String image;
-
 }

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

@@ -0,0 +1,45 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.FlowerPattern;
+
+import java.util.Date;
+
+/**
+ * 图片关联表Bo类
+ */
+@Data
+@AutoMapper(target = FlowerPattern.class, reverseConvertGenerate = false)
+public class FlowerPatternBo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

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

@@ -1,6 +1,8 @@
 package org.dromara.bulk.domain.bo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.List;
 
@@ -9,12 +11,13 @@ import java.util.List;
  */
 
 @Data
-public class NewBulkOrderBo {
+@EqualsAndHashCode(callSuper = true)
+public class NewBulkOrderBo extends BaseEntity {
 
     /**
      * 用户id
      */
-    private Long user_id;
+    private Long userId;
 
     /**
      * 用户名
@@ -22,9 +25,9 @@ public class NewBulkOrderBo {
     private String userName;
 
     /**
-     * 电话
+     * 用户电话
      */
-    private int phone;
+    private String userPhone;
 
     /**
      * 备注
@@ -32,12 +35,20 @@ public class NewBulkOrderBo {
     private String remark;
 
     /**
-     * 商品名称
+     * 订单信息列表
      */
-    private String goodsName;
+    private List<OrderListBo> orderLists;
 
     /**
-     * 订单信息列表
+     * userName：“123123”，
+     * userPhone:12312312315,
+     * orderList:[
+     * {
+     *     images:1
+     * },{
+     *     images:2
+     * }
+     * ]
+     *
      */
-    private List<OrderListBo> orderLists;
 }

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

@@ -1,34 +1,45 @@
 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 org.dromara.system.domain.vo.SysOssVo;
 
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 订单列表BO对象
+ */
 @Data
 public class OrderListBo {
 
     /**
-     * 大货编号
+     * 大货编号名称
      */
-    private DaHuoNumberBo DaHuoNumberBo;
+    private String daHuoNumberName;
 
     /**
-     * 成衣厂
+     * 大货编号id
+     */
+    private Long daHuoNumberId;
+
+    /**
+     * 款号
+     */
+    private String itemNumber;
+
+    /**
+     * 工厂名称
      */
     private String garmentFactory;
 
     /**
-     * 成衣厂联系人
+     * 收货人
      */
     private String garmentFactoryPeople;
 
     /**
-     * 成衣厂电话
+     * 收货人电话
      */
     private String garmentFactoryTel;
 
@@ -68,14 +79,19 @@ public class OrderListBo {
     private String brandGroup;
 
     /**
-     * 工艺类型
+     * 工艺id
      */
-    private CraftBo craft;
+    private String craftId;
+
+    /**
+     * 工艺价格
+     */
+    private double craftPrice;
 
     /**
      * 版图列表
      */
-    private List<TemplateBo> templateList;//未找到表
+    private List<TemplateBo> templateList;
 
     /**
      * 烧花,0否，1是
@@ -117,23 +133,16 @@ public class OrderListBo {
      */
     private String isSys = "0";
 
-    /**
-     * 用户id
-     */
-    private Long userId;
-
     /**
      * 花型号
      */
-    private OemBo Oem;
+    private String oemId;
 
     /**
-     * 款式图
+     * 款式图的ossId
      */
-    private String styleImage;
+    private Long imageId;
+
+    private SysOssVo ossVo;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
 }

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

@@ -0,0 +1,100 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.Attachment;
+
+import java.util.Date;
+
+/**
+ * 附件表Vo类
+ */
+@Data
+@AutoMapper(target = Attachment.class)
+public class AttachmentVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 类别
+     */
+    private String category;
+
+    /**
+     * 管理员ID
+     */
+    private Long adminId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 物理路径
+     */
+    private String url;
+
+    /**
+     * 宽度
+     */
+    private String imageWidth;
+
+    /**
+     * 高度
+     */
+    private String imageHeight;
+
+    /**
+     * 图片类型
+     */
+    private String imageType;
+
+    /**
+     * 图片帧数
+     */
+    private int imageFrames;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件大小
+     */
+    private int fileSize;
+
+    /**
+     * mime类型
+     */
+    private String mimetype;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 上传时间
+     */
+    private Date uploadTime;
+
+    /**
+     * 存储位置
+     */
+    private String storage;
+
+    /**
+     * sha1值
+     */
+    private String sha1;
+}

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

@@ -0,0 +1,45 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.bulk.domain.FlowerPattern;
+
+import java.util.Date;
+
+/**
+ * 图片关联表Vo类
+ */
+@Data
+@AutoMapper(target = FlowerPattern.class)
+public class FlowerPatternVo {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 图片地址
+     */
+    private String imageUrl;
+
+    /**
+     * 花型号id
+     */
+    private String OemId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 用户订单id
+     */
+    private Long userOrderId;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+}

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

@@ -10,9 +10,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderMapper extends BaseMapperPlus<UserOrder, UserOrderVo> {
-    /**
-     * 查询最后一条订单id
-     * @return 订单id
-     */
-    Long selectLastId();
 }

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

@@ -0,0 +1,79 @@
+package org.dromara.bulk.mapstruct;
+
+import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.UserOrder;
+import org.dromara.bulk.domain.UserOrderTemplate;
+import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+import org.dromara.bulk.domain.bo.OrderListBo;
+import org.dromara.commodityManagement.domain.bo.TemplateBo;
+import org.dromara.productionManagement.domain.ProductionPlan;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Mapper(componentModel = "spring")
+public interface NewBulkOrderMapstruct {
+
+    // BulkOrderList映射
+    @Mapping(target = "scNo", source = "purchaseCode")
+    @Mapping(target = "goodsCode", constant = "SP001")
+    @Mapping(target = "goodsName", constant = "图片下单")
+    @Mapping(target = "goodsId", constant = "9")
+    @Mapping(target = "unitId", constant = "5")
+    @Mapping(target = "defaultUnit", constant = "5")
+    @Mapping(target = "goodsTypeExtend1Id", source = "orderList.daHuoNumberName")
+    @Mapping(target = "goodsTypeExtend4Id", source = "orderList.oemId")
+    @Mapping(target = "gongyiPrice", source = "orderList.craftPrice")
+    @Mapping(target = "duizhangStatus", constant = "0")
+    BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,
+                                  OrderListBo orderList,
+                                  String sysNo,
+                                  String purchaseCode,
+                                  Long userOrderId,
+                                  Long planId);
+
+    // ProductionPlan映射
+    @Mapping(target = "orderNum", source = "orderNumber")
+    @Mapping(target = "goodsCode", constant = "SP001")
+    @Mapping(target = "goodsName", constant = "图片下单")
+    @Mapping(target = "price", constant = "5")
+    @Mapping(target = "defaultUnit", constant = "5")
+    @Mapping(target = "examineStatus", constant = "0")
+    @Mapping(target = "status", constant = "0")
+    @Mapping(target = "mrpStatus", constant = "0")
+    ProductionPlan toProductionPlan(NewBulkOrderBo newBulkOrder,
+                                    OrderListBo orderList,
+                                    String sysNo,
+                                    String purchaseCode,
+                                    String orderNumber);
+
+    // UserOrder映射
+    @Mapping(target = "name", source = "newBulkOrder.userName")
+    @Mapping(target = "phone", source = "newBulkOrder.userPhone")
+    @Mapping(target = "address", source = "orderList.receivingAddress")
+    UserOrder toUserOrder(NewBulkOrderBo newBulkOrder,
+                          OrderListBo orderList,
+                          String orderNumber,
+                          String remark);
+
+    // UserOrderTemplate列表映射
+    @Mapping(target = "orderId", source = "orderId")
+    @Mapping(target = "planId", source = "planId")
+    @Mapping(target = "itemId", source = "orderList.daHuoNumberId")
+    UserOrderTemplate toUserOrderTemplate(NewBulkOrderBo newBulkOrder,
+                                          OrderListBo orderList,
+                                          Long orderId,
+                                          Long planId,
+                                          TemplateBo templateBo);
+
+    // 集合映射方法
+    default ArrayList<UserOrderTemplate> toTemplateList(NewBulkOrderBo newBulkOrderBo, OrderListBo orderList, Long orderId, Long planId, List<TemplateBo> templateList) {
+        ArrayList<UserOrderTemplate> arrayList = new ArrayList<>(templateList.size());
+        for (TemplateBo templateBo : templateList) {
+            arrayList.add(toUserOrderTemplate(newBulkOrderBo, orderList, orderId, planId, templateBo));
+        }
+        return arrayList;
+    }
+}

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

@@ -1,7 +1,14 @@
 package org.dromara.bulk.service;
 
+import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 public interface BulkOrderManagementService {
+
+//    TableDataInfo<BulkOrderListVo> selectPageVoList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
+
     int insertBulkOrder(NewBulkOrderBo newBulkOrderBo);
 }

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

@@ -1,30 +1,30 @@
 package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.UserOrder;
 import org.dromara.bulk.domain.UserOrderTemplate;
-import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
 import org.dromara.bulk.mapper.UserOrderMapper;
 import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 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.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 大货订单管理服务层实现
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
@@ -33,141 +33,75 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
+    private final NewBulkOrderMapstruct newBulkOrderMapstruct;
+    private final SysOssServiceImpl sysOssService;
 
+    /**
+     * 新增生产订单
+     *
+     * @param newBulkOrderBo 生产订单的BO对象
+     * @return 添加结果
+     */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     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");
+        try {
+            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));
+                // 用户订单映射
+                UserOrder userOrder = newBulkOrderMapstruct.toUserOrder(
+                    newBulkOrderBo,
+                    orderList,
+                    orderNumber,
+                    newBulkOrderBo.getRemark()
+                );
+                userOrder.setCreateTime(newBulkOrderBo.getCreateTime());
+                userOrderMapper.insert(userOrder);
 
-            bulkOrderListMapper.insert(initBulkOrderListBo(orderList, sysNo, purchaseCode));
+                // 生产计划映射
+                ProductionPlan productionPlan = newBulkOrderMapstruct.toProductionPlan(
+                    newBulkOrderBo,
+                    orderList,
+                    sysNo,
+                    purchaseCode,
+                    orderNumber
+                );
+                productionPlan.setCreateTime(newBulkOrderBo.getCreateTime());
+                productionPlanMapper.insert(productionPlan);
 
-            Long orderId = userOrderMapper.selectLastId();
-            Long planId = productionPlanMapper.selectLastId();
-
-            List<UserOrderTemplate> userOrderTemplate = initUserOrderTemplate(orderList, orderId, planId);
-            userOrderTemplateMapper.insert(userOrderTemplate);
-        }
+                // 订单列表映射
+                BulkOrderList bulkOrderList = newBulkOrderMapstruct.toBulkOrderList(
+                    newBulkOrderBo,
+                    orderList, sysNo,
+                    purchaseCode,
+                    userOrder.getId(),
+                    productionPlan.getId());
+                bulkOrderListMapper.insert(bulkOrderList);
 
-        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;
-    }
+                // 处理模板
+                if (orderList.getTemplateList() != null) {
+                    List<UserOrderTemplate> templates = newBulkOrderMapstruct.toTemplateList(
+                        newBulkOrderBo,
+                        orderList,
+                        productionPlan.getId(),
+                        userOrder.getId(),
+                        orderList.getTemplateList()
+                    );
+                    userOrderTemplateMapper.insert(templates);
+                }
 
-    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);
+                //处理款式图
+//                SysOssVo styleImageVo = sysOssService.upload(orderList.getStyleImage());
+            }
+            return 1;
+        } catch (Exception e) {
+            log.error(String.valueOf(e));
+            return 0;
         }
-        return userOrderTemplateList;
     }
 }

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

@@ -3,11 +3,4 @@
         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-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/OemController.java

@@ -23,7 +23,6 @@ import java.util.HashMap;
 @RequestMapping("/commodityManagement/oem")
 public class OemController extends BaseController {
     private final OemService oemService;
-
     /**
      * 查询花型号管理列表
      * @param oem 花型号Bo对象

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/CraftServiceImpl.java

@@ -33,7 +33,9 @@ public class CraftServiceImpl implements CraftService {
     @Override
     public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craftBo, PageQuery pageQuery) {
         QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(craftBo.getGoodsTypeExtendName()), "goods_type_extend_name", craftBo.getGoodsTypeExtendName());
+        queryWrapper.eq(null!=craftBo.getId(),"id",craftBo.getId());
+        queryWrapper.like(StringUtils.isNotBlank(craftBo.getGoodsTypeExtendName()), "goods_type_extend_name", craftBo.getGoodsTypeExtendName());
+        queryWrapper.like(StringUtils.isNotBlank(craftBo.getPrice()),"price",craftBo.getPrice());
         Page<CraftVo> page = craftMapper.selectVoPage(pageQuery.build(), queryWrapper);
         return TableDataInfo.build(page);
     }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/OemServiceImpl.java

@@ -31,7 +31,7 @@ public class OemServiceImpl implements OemService {
     @Override
     public TableDataInfo<OemVo> selectPageOemList(OemBo oemBo, PageQuery pageQuery) {
         QueryWrapper<Oem> lqw =new QueryWrapper<>();
-        lqw.eq(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
+        lqw.like(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
         Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }

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

@@ -30,8 +30,8 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     public TableDataInfo<CustomerVo> selectPageCustomerList(CustomerBo customersBo, PageQuery pageQuery){
         QueryWrapper<Customer> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(customersBo.getUsername()),"username",customersBo.getUsername());
-        qw.eq(StringUtils.isNotBlank(customersBo.getMobile()),"mobile",customersBo.getMobile());
+        qw.like(StringUtils.isNotBlank(customersBo.getUsername()),"username",customersBo.getUsername());
+        qw.like(StringUtils.isNotBlank(customersBo.getMobile()),"mobile",customersBo.getMobile());
         Page<CustomerVo>page= customerMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }

ruoyi-modules/ruoyi-dataManagement/pom.xml

@@ -0,0 +1,113 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+
+    <artifactId>ruoyi-dataManagement</artifactId>
+
+    <description>
+        demo模块
+    </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>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,46 @@
+package org.dromara.dataManagement.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+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.dataManagement.domain.bo.SupplierBo;
+import org.dromara.dataManagement.domain.vo.SupplierVo;
+import org.dromara.dataManagement.service.SupplierService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/dataManagement/supplier")
+public class SupplierController extends BaseController {
+
+    private final SupplierService supplierService;
+
+    /**
+     * 分页条件查询供应商信息
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
+        return supplierService.selectPageSupplierList(supplierBo, pageQuery);
+    }
+
+    /**
+     * 导入供应商文件
+     */
+
+    /**
+     * 删除供应商信息
+     */
+    @DeleteMapping("/delete/{ids}")
+    public R<Void> deleteSupplierByIds(@PathVariable("ids") List<Integer> supplyertypeId) {
+        return toAjax(supplierService.deleteRecycleFactoryByIds(supplyertypeId));
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package org.dromara.dataManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+import org.dromara.dataManagement.service.WorkShopService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/dataManagement/workshop")
+public class WorkShopController extends BaseController {
+    private final WorkShopService workShopService;
+    @GetMapping("/PageList")
+    public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
+        return workShopService.selectPageWorkshopList(workshopBo, pageQuery);
+    }
+    @PostMapping()
+    public R<Void> insertWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
+        return toAjax(workShopService.insertWorkShop(workshopBo));
+    }
+    @PutMapping()
+    public R<Void> updateWorkShop(@Validated @RequestBody WorkShopBo workshopBo){
+        return toAjax(workShopService.updateWorkShop(workshopBo));
+    }
+    @DeleteMapping("/{workshopIds}")
+    public R<Void> deleteWorkShopByIds(@PathVariable Long[] workshopIds){
+        return toAjax(workShopService.deleteWorkShopByIds(workshopIds));
+    }
+    @GetMapping("/exportExcel")
+    public void exportWorkShopExcel(HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectList()),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
+    }
+    @GetMapping("/exportExcelByIds")
+    public void exportWorkShopExcel(@RequestParam("ids")Long[] workshopIds,HttpServletResponse response){
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),workShopService.selectWorkshopListByIds(workshopIds)),"车间列表.xlsx","excel/车间导出模板.xlsx",response);
+    }
+}

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

@@ -0,0 +1,68 @@
+package org.dromara.dataManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_suppliers")
+public class Supplier extends TenantEntity {
+
+    /**
+     * 供应商类别
+     */
+    private int supplyertypeId;
+
+    /**
+     * 供应商编号
+     */
+    private String supplyerCode;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyerName;
+
+    /**
+     * 首要联系人
+     */
+    private String firstConnectName;
+
+    /**
+     * 首要联系人手机号
+     */
+    private String firstConnectMobile;
+
+    /**
+     * 首要联系人座机号
+     */
+    private String firstConnectPhone;
+
+    /**
+     * 首要联系人QQ/微信/Email
+     */
+    private String qqWxEmail;
+
+    /**
+     * 联系地址
+     */
+    private String connectAddress;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 应付余额
+     */
+    private double needGiveAccount;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

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

@@ -0,0 +1,28 @@
+package org.dromara.dataManagement.domain;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+//@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_workshop")
+public class WorkShop {
+    /**
+     * 车间id
+     */
+    private int id;
+    /**
+     * 车间编号
+     */
+    @NotBlank(message = "编号不能为空")
+    private String code;
+    /**
+     * 车间名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private String status;
+}

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

@@ -0,0 +1,70 @@
+package org.dromara.dataManagement.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.dataManagement.domain.Supplier;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class, reverseConvertGenerate = false)
+public class SupplierBo extends BaseEntity {
+
+    /**
+     * 供应商类别
+     */
+    private int supplyertypeId;
+
+    /**
+     * 供应商编号
+     */
+    private String supplyerCode;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyerName;
+
+    /**
+     * 首要联系人
+     */
+    private String firstConnectName;
+
+    /**
+     * 首要联系人手机号
+     */
+    private String firstConnectMobile;
+
+    /**
+     * 首要联系人座机号
+     */
+    private String firstConnectPhone;
+
+    /**
+     * 首要联系人QQ/微信/Email
+     */
+    private String qqWxEmail;
+
+    /**
+     * 联系地址
+     */
+    private String connectAddress;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 应付余额
+     */
+    private double needGiveAccount;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

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

@@ -0,0 +1,29 @@
+package org.dromara.dataManagement.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.dataManagement.domain.WorkShop;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WorkShop.class,reverseConvertGenerate = false)
+public class WorkShopBo extends BaseEntity {
+    /**
+     * 车间id
+     */
+    private int id;
+    /**
+     * 车间编号
+     */
+    private String code;
+    /**
+     * 车间名称
+     */
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private String status;
+}

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

@@ -0,0 +1,70 @@
+package org.dromara.dataManagement.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.dataManagement.domain.Supplier;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Supplier.class)
+public class SupplierVo extends BaseEntity {
+
+    /**
+     * 供应商类别
+     */
+    private int supplyertypeId;
+
+    /**
+     * 供应商编号
+     */
+    private String supplyerCode;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyerName;
+
+    /**
+     * 首要联系人
+     */
+    private String firstConnectName;
+
+    /**
+     * 首要联系人手机号
+     */
+    private String firstConnectMobile;
+
+    /**
+     * 首要联系人座机号
+     */
+    private String firstConnectPhone;
+
+    /**
+     * 首要联系人QQ/微信/Email
+     */
+    private String qqWxEmail;
+
+    /**
+     * 联系地址
+     */
+    private String connectAddress;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 应付余额
+     */
+    private double needGiveAccount;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

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

@@ -0,0 +1,37 @@
+package org.dromara.dataManagement.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.dataManagement.domain.WorkShop;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = WorkShop.class)
+public class WorkShopVo extends BaseEntity {
+    /**
+     * 车间id
+     */
+    private int id;
+    /**
+     * 车间编号
+     */
+    private String code;
+    /**
+     * 车间名称
+     */
+    private String name;
+    /**
+     * 状态:0=关闭,1=正常
+     */
+    private String status;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+}

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/SupplierMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.dataManagement.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dataManagement.domain.Supplier;
+import org.dromara.dataManagement.domain.vo.SupplierVo;
+
+@Mapper
+public interface SupplierMapper extends BaseMapperPlus<Supplier, SupplierVo> {
+}

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/WorkShopMapper.java

@@ -0,0 +1,10 @@
+package org.dromara.dataManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+
+@Mapper
+public interface WorkShopMapper extends BaseMapperPlus<WorkShop, WorkShopVo> {
+}

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

@@ -0,0 +1,16 @@
+package org.dromara.dataManagement.service;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.bo.SupplierBo;
+import org.dromara.dataManagement.domain.vo.SupplierVo;
+
+import java.util.List;
+
+public interface SupplierService {
+
+    TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
+
+    int deleteRecycleFactoryByIds(List<Integer> supplyertypeId);
+}

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

@@ -0,0 +1,18 @@
+package org.dromara.dataManagement.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+
+import java.util.List;
+
+public interface WorkShopService {
+    TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery);
+    int insertWorkShop(WorkShopBo workshopBo);
+    int updateWorkShop(WorkShopBo workshopBo);
+    int deleteWorkShopByIds(Long[] workshopIds);
+    List<WorkShop> selectList();
+    List<WorkShop> selectWorkshopListByIds(Long[] workshopIds);
+}

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

@@ -0,0 +1,54 @@
+package org.dromara.dataManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.dataManagement.domain.Supplier;
+import org.dromara.dataManagement.domain.bo.SupplierBo;
+import org.dromara.dataManagement.domain.vo.SupplierVo;
+import org.dromara.dataManagement.mapper.SupplierMapper;
+import org.dromara.dataManagement.service.SupplierService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@RequiredArgsConstructor
+public class SupplierServiceImpl implements SupplierService {
+
+    private final SupplierMapper supplierMapper;
+
+    /**
+     * 查询供应商信息
+     * @param supplierBo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
+        QueryWrapper<Supplier> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerCode()), "supplyer_code", supplierBo.getSupplyerCode());
+        qw.like(StringUtils.isNotBlank(supplierBo.getSupplyerName()), "supplyer_name", supplierBo.getSupplyerName());
+        qw.eq(StringUtils.isNotBlank(supplierBo.getStatus()), "status", supplierBo.getStatus());
+        List<Supplier> page = supplierMapper.selectList(pageQuery.build(), qw);
+        List<SupplierVo> supplierVoList = MapstructUtils.convert(page, SupplierVo.class);
+        return TableDataInfo.build(supplierVoList);
+    }
+
+    /**
+     * 批量删除供应商信息
+     * @param supplyertypeId
+     * @return
+     */
+    @Override
+    public int deleteRecycleFactoryByIds(List<Integer> supplyertypeId) {
+        QueryWrapper<Supplier> qw = new QueryWrapper<>();
+        qw.in("supplyertype_id",supplyertypeId);
+        return supplierMapper.delete(qw);
+    }
+}

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

@@ -0,0 +1,58 @@
+package org.dromara.dataManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.dataManagement.domain.WorkShop;
+import org.dromara.dataManagement.domain.bo.WorkShopBo;
+import org.dromara.dataManagement.domain.vo.WorkShopVo;
+import org.dromara.dataManagement.mapper.WorkShopMapper;
+import org.dromara.dataManagement.service.WorkShopService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class WorkShopServiceImpl implements WorkShopService {
+    private final WorkShopMapper workShopMapper;
+
+    @Override
+    public TableDataInfo<WorkShopVo> selectPageWorkshopList(WorkShopBo workshopBo, PageQuery pageQuery) {
+        QueryWrapper<WorkShop> qw=new QueryWrapper<>();
+        qw.like(null!=workshopBo.getCode(),"code",workshopBo.getCode());
+        qw.like(null!=workshopBo.getName(),"name",workshopBo.getName());
+        qw.eq(StringUtils.isNotBlank(workshopBo.getStatus()),"status",workshopBo.getStatus());
+        Page<WorkShopVo>page =workShopMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertWorkShop(WorkShopBo workshopBo) {
+        WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
+        return workShopMapper.insert(workShop);
+    }
+    @Override
+    public int updateWorkShop(WorkShopBo workshopBo) {
+        WorkShop workShop= MapstructUtils.convert(workshopBo,WorkShop.class);
+        QueryWrapper<WorkShop> qw=new QueryWrapper<>();
+        qw.eq("id",workshopBo.getId());
+        return workShopMapper.updateById(workShop);
+    }
+    @Override
+    public int deleteWorkShopByIds(Long[] ids) {
+        return workShopMapper.deleteByIds(Arrays.asList(ids));
+    }
+    @Override
+    public List<WorkShop> selectWorkshopListByIds(Long[] workshopIds) {
+        return MapstructUtils.convert(workShopMapper.selectVoByIds(Arrays.asList(workshopIds)),WorkShop.class);
+    }
+    @Override
+    public List<WorkShop> selectList() {
+        return workShopMapper.selectList();
+    }
+    }

ruoyi-modules/ruoyi-dataManagement/src/main/resources/mapper/SupplierMapper.xml

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

ruoyi-modules/ruoyi-dataManagement/src/main/resources/mapper/WorkShopMapper.xml

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

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

@@ -1,6 +1,17 @@
 package org.dromara.productionManagement.controller;
 
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.productionManagement.service.ProductionPlanService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * 生产计划管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/productionManagement/productionPlan")
 public class ProductionPlanController extends BaseController {
+    private final ProductionPlanService productionPlanService;
 }

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

@@ -64,7 +64,7 @@ public class ShaoHuaFactoryController extends BaseController {
     }
 
     /**
-     * 回收站查询
+     * 回收站条件查询
      * @param shaohuafactoryBo
      * @param pageQuery
      * @return

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

@@ -1,16 +1,15 @@
 package org.dromara.productionManagement.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
-@EqualsAndHashCode(callSuper = true)
+
 @TableName("fa_kuyou_plan")
-public class ProductionPlan extends TenantEntity {
+public class ProductionPlan {
 
     /**
      * 主键
@@ -80,12 +79,14 @@ public class ProductionPlan extends TenantEntity {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    @TableField("basic_nmber")
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    @TableField("basic_fen_nmber")
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -95,12 +96,14 @@ public class ProductionPlan extends TenantEntity {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    @TableField("gongyi_price")
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    @TableField("unit_price")
+    private double price;
 
     /**
      * 金额
@@ -205,7 +208,7 @@ public class ProductionPlan extends TenantEntity {
     /**
      * 销货单id
      */
-    private Long goodsSalesId;
+    private Long goodsSalesId = 0L;
 
     /**
      * 宽幅

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

@@ -2,16 +2,14 @@ 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 {
+public class ProductionPlanBo{
 
     /**
      * 主键
@@ -81,12 +79,12 @@ public class ProductionPlanBo extends BaseEntity {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -96,12 +94,12 @@ public class ProductionPlanBo extends BaseEntity {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    private double price;
 
     /**
      * 金额

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

@@ -21,6 +21,7 @@ public class ShaoHuaFactoryBo extends BaseEntity implements Serializable {
     /**
      * id
      */
+
     private int id;
 
     /**

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

@@ -2,16 +2,14 @@ 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 {
+public class ProductionPlanVo{
 
     /**
      * 主键
@@ -81,12 +79,12 @@ public class ProductionPlanVo extends BaseEntity {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 底布单价
@@ -96,12 +94,12 @@ public class ProductionPlanVo extends BaseEntity {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 单价
      */
-    private double unitPrice;
+    private double price;
 
     /**
      * 金额

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

@@ -10,10 +10,4 @@ import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
  */
 @Mapper
 public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
-
-    /**
-     * 查询最新生产计划id
-     * @return id
-     */
-    Long selectLastId();
 }

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

@@ -1,4 +1,7 @@
 package org.dromara.productionManagement.service;
 
+/**
+ * 生产计划服务层
+ */
 public interface ProductionPlanService {
 }

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

@@ -97,6 +97,7 @@ public class FactoryServiceImpl implements FactoryService {
     public TableDataInfo<FactoryVo> selectRecycleFactoryList(FactoryBo factoryBo, PageQuery pageQuery) {
         QueryWrapper<Factory> qw=new QueryWrapper<>();
         Map<String, Object> params = factoryBo.getParams();
+        qw.eq(0 !=factoryBo.getId(),"id", factoryBo.getId());
         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"));

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

@@ -1,4 +1,16 @@
 package org.dromara.productionManagement.service.impl;
 
-public class ProductionPlanServiceImpl {
+import lombok.RequiredArgsConstructor;
+import org.dromara.productionManagement.mapper.ProductionPlanMapper;
+import org.dromara.productionManagement.service.ProductionPlanService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 生产计划服务层实现
+ */
+@Service
+@RequiredArgsConstructor
+public class ProductionPlanServiceImpl implements ProductionPlanService {
+
+    private final ProductionPlanMapper productionPlanMapper;
 }

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

@@ -15,9 +15,7 @@ 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;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
@@ -82,7 +80,7 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     }
 
     /**
-     * 查询回收站信息
+     * 条件查询回收站信息
      * @param shaohuafactoryBo
      * @param pageQuery
      * @return
@@ -90,7 +88,11 @@ public class ShaoHuaFactoryImpl implements ShaoHuaFactoryService {
     @Override
     public TableDataInfo<ShaoHuaFactoryVo> selectRecycleFactoryList(ShaoHuaFactoryBo shaohuafactoryBo, PageQuery pageQuery) {
         QueryWrapper<ShaoHuaFactory> qw = new QueryWrapper<>();
-        qw.eq(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        Map<String, Object> params = shaohuafactoryBo.getParams();
+        qw.eq(0 != shaohuafactoryBo.getId(),"id", shaohuafactoryBo.getId());
+        qw.like(StringUtils.isNotBlank(shaohuafactoryBo.getName()),"name",shaohuafactoryBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+                "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
         qw.isNotNull("deletetime");
         Page<ShaoHuaFactoryVo> page = shaoHuaFactoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);

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

@@ -3,12 +3,4 @@
 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>