Merge branch 'develop' into release

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

@@ -6,10 +6,11 @@ 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.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
+import org.springframework.validation.annotation.Validated;
+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;
 
 /**
  * 大货订单管理接口
@@ -27,19 +28,8 @@ class BulkOrderManagementController extends BaseController {
      */
     @SaIgnore
     @PostMapping()
-    public R<Void> insertBulkOrder(@RequestBody NewBulkOrderBo newBulkOrderBo){
+    public R<Void> insertBulkOrder(@Validated @RequestBody NewBulkOrderBo newBulkOrderBo){
         return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));
     }
-
-    /**
-     * 上传图片
-     * @param imageList 图片列表
-     * @return 结果
-     */
-    @SaIgnore
-    @PostMapping("uploadImage")
-    public R<Void> uploadImage(@RequestParam("imageList") List<MultipartFile> imageList){
-        return toAjax(BulkOrderManagementService.uploadImage(imageList));
-    }
 }
 

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

@@ -72,7 +72,7 @@ public class Attachment {
      * 文件大小
      */
     @TableField("filesize")
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -100,12 +100,10 @@ public class Attachment {
     /**
      * 存储位置
      */
-    @TableField("storage")
-    private String ossId;
+    private String storage;
 
     /**
-     * ossId
+     * sha1
      */
-    @TableField("sha1")
     private String sha1;
 }

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

@@ -89,12 +89,14 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 基本数量
     */
-    private double basicNmber;
+    @TableField("basic_nmber")
+    private double basicNumber;
 
     /**
     * 基本份数
     */
-    private double basicFenNmber;
+    @TableField("basic_fen_nmber")
+    private double basicFenNumber;
 
     /**
     * 金额
@@ -167,7 +169,8 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 工艺单价
     */
-    private double gongyiPrice;
+    @TableField("gongyi_price")
+    private double craftPrice;
 
     /**
     * 款号(大货编号)

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/bo/AttachmentBo.java

@@ -15,16 +15,17 @@ import java.util.Date;
 @AutoMapper(target = Attachment.class, reverseConvertGenerate = false)
 public class AttachmentBo {
 
-    public AttachmentBo(String category, Long userId, String url, String imageType, String fileName, Date createTime, Date updateTime, Date uploadTime, String ossId) {
+    public AttachmentBo(String category, Long userId, String url, String imageType, String fileName, String mimetype, Date createTime, Date updateTime, Date uploadTime) {
         this.category = category;
         this.userId = userId;
         this.url = url;
         this.imageType = imageType;
         this.fileName = fileName;
+        this.mimetype = mimetype;
         this.createTime = createTime;
         this.updateTime = updateTime;
         this.uploadTime = uploadTime;
-        this.ossId = ossId;
+        this.storage = "local";
     }
 
     /**
@@ -80,7 +81,7 @@ public class AttachmentBo {
     /**
      * 文件大小
      */
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -103,9 +104,9 @@ public class AttachmentBo {
     private Date uploadTime;
 
     /**
-     * ossId
+     * 存储位置
      */
-    private String ossId;
+    private String storage;
 
     /**
      * sha1

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

@@ -95,12 +95,12 @@ public class BulkOrderListBo extends BaseEntity {
     /**
      * 基本数量
      */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
      * 基本份数
      */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
      * 金额
@@ -165,7 +165,7 @@ public class BulkOrderListBo extends BaseEntity {
     /**
      * 工艺单价
      */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
      * 款号
@@ -280,9 +280,4 @@ public class BulkOrderListBo extends BaseEntity {
      * 烧花打包数量
      */
     private String shaohuaDabaoCount;
-
-    /**
-     * 商品图片
-     */
-    private String image;
 }

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

@@ -0,0 +1,54 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.bulk.domain.FlowerPattern;
+
+import java.util.Date;
+
+/**
+ * 图片关联表Bo类
+ */
+@Data
+@NoArgsConstructor
+@AutoMapper(target = FlowerPattern.class, reverseConvertGenerate = false)
+public class FlowerPatternBo {
+
+    public FlowerPatternBo(String imageUrl, Date createTime, Long userOrderId, Long userId) {
+        this.imageUrl = imageUrl;
+        this.createTime = createTime;
+        this.userOrderId = userOrderId;
+        this.userId = userId;
+    }
+
+    /**
+     * 主键
+     */
+    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,5 +1,6 @@
 package org.dromara.bulk.domain.bo;
 
+import jakarta.validation.Valid;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
@@ -37,18 +38,7 @@ public class NewBulkOrderBo extends BaseEntity {
     /**
      * 订单信息列表
      */
+    @Valid
     private List<OrderListBo> orderLists;
 
-    /**
-     * userName：“123123”，
-     * userPhone:12312312315,
-     * orderList:[
-     * {
-     *     images:1
-     * },{
-     *     images:2
-     * }
-     * ]
-     *
-     */
 }

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

@@ -1,8 +1,11 @@
 package org.dromara.bulk.domain.bo;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
-import org.dromara.system.domain.vo.SysOssVo;
 
 import java.util.Date;
 import java.util.List;
@@ -16,11 +19,13 @@ public class OrderListBo {
     /**
      * 大货编号名称
      */
+    @NotBlank(message = "大货编号名称不能为空")
     private String daHuoNumberName;
 
     /**
      * 大货编号id
      */
+    @NotNull(message = "大货编号id不能为空")
     private Long daHuoNumberId;
 
     /**
@@ -73,6 +78,16 @@ public class OrderListBo {
      */
     private double baseClothPrice;
 
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
     /**
      * 品牌组
      */
@@ -91,41 +106,49 @@ public class OrderListBo {
     /**
      * 版图列表
      */
+    @Valid
     private List<TemplateBo> templateList;
 
     /**
      * 烧花,0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isBurnFlowers = 0;
 
     /**
      * 快返,0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isFirstOrder = 0;
 
     /**
      * 加急，0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isUrgent = 0;
 
     /**
      * 补货，0否，1是
      */
+    @Size(max = 1,message = "0否，1是")
     private int isBuhuo = 0;
 
     /**
@@ -136,13 +159,16 @@ public class OrderListBo {
     /**
      * 花型号
      */
+    @Size(max = 1,message = "0否，1是")
     private String oemId;
 
     /**
-     * 款式图的ossId
+     * 款式图的Url
      */
-    private Long imageId;
-
-    private SysOssVo ossVo;
+    private String imageUrl;
 
+    /**
+     * ossId
+     */
+    private Long ossId;
 }

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

@@ -66,7 +66,7 @@ public class AttachmentVo {
     /**
      * 文件大小
      */
-    private int fileSize;
+    private Long fileSize;
 
     /**
      * mime类型
@@ -89,9 +89,9 @@ public class AttachmentVo {
     private Date uploadTime;
 
     /**
-     * ossId
+     * 存储位置
      */
-    private String ossId;
+    private String storage;
 
     /**
      * sha1

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

@@ -90,12 +90,12 @@ public class BulkOrderListVo extends BaseEntity {
     /**
     * 基本数量
     */
-    private double basicNmber;
+    private double basicNumber;
 
     /**
     * 基本份数
     */
-    private double basicFenNmber;
+    private double basicFenNumber;
 
     /**
     * 金额
@@ -160,7 +160,7 @@ public class BulkOrderListVo extends BaseEntity {
     /**
     * 工艺单价
     */
-    private double gongyiPrice;
+    private double craftPrice;
 
     /**
     * 款号
@@ -278,6 +278,11 @@ public class BulkOrderListVo extends BaseEntity {
     /**
      * 商品图片
      */
-    private String image;
+    private String imageUrl;
+
+    /**
+     * 状态
+     */
+    private int status;
 
 }

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

@@ -21,13 +21,7 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      * @param wrapper 查询条件
      * @return 分页对象
      */
-    Page<BulkOrderListVo> selectVoPageWithGoodImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
-
-    /**
-     * 查询大货列表最近插入的ID
-     * @return ID
-     */
-    Long selectLastId();
+    Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
 }
 

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

@@ -0,0 +1,10 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.FlowerPattern;
+import org.dromara.bulk.domain.vo.FlowerPatternVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface FlowerPatternMapper extends BaseMapperPlus<FlowerPattern, FlowerPatternVo> {
+}

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

@@ -13,6 +13,9 @@ import org.mapstruct.Mapping;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 新增生产订单映射
+ */
 @Mapper(componentModel = "spring")
 public interface NewBulkOrderMapstruct {
 
@@ -25,7 +28,7 @@ public interface NewBulkOrderMapstruct {
     @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 = "craftPrice", source = "orderList.craftPrice")
     @Mapping(target = "duizhangStatus", constant = "0")
     BulkOrderList toBulkOrderList(NewBulkOrderBo newBulkOrderBo,
                                   OrderListBo orderList,

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

@@ -1,15 +1,10 @@
 package org.dromara.bulk.service;
 
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 public interface BulkOrderManagementService {
 
 //    TableDataInfo<BulkOrderListVo> selectPageVoList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
 
     int insertBulkOrder(NewBulkOrderBo newBulkOrderBo);
-
-    int uploadImage(List<MultipartFile> imageList);
 }

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

@@ -35,8 +35,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     @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.selectVoPageWithGoodImage(pageQuery.build(), qw);
+        qw.like(null != bulkOrderListBo.getId(), "pi.id", bulkOrderListBo.getId());
+        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPageWithImage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 

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

@@ -2,17 +2,12 @@ package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.bulk.domain.Attachment;
-import org.dromara.bulk.domain.BulkOrderList;
-import org.dromara.bulk.domain.UserOrder;
-import org.dromara.bulk.domain.UserOrderTemplate;
+import org.dromara.bulk.domain.*;
 import org.dromara.bulk.domain.bo.AttachmentBo;
+import org.dromara.bulk.domain.bo.FlowerPatternBo;
 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.AttachmentMapper;
-import org.dromara.bulk.mapper.UserOrderMapper;
-import org.dromara.bulk.mapper.UserOrderTemplateMapper;
+import org.dromara.bulk.mapper.*;
 import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
 import org.dromara.bulk.service.BulkOrderManagementService;
 import org.dromara.common.core.utils.MapstructUtils;
@@ -23,9 +18,7 @@ import org.dromara.system.domain.vo.SysOssVo;
 import org.dromara.system.service.impl.SysOssServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,23 +34,11 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
     private final AttachmentMapper attachmentMapper;
+    private final FlowerPatternMapper flowerPatternMapper;
 
     private final NewBulkOrderMapstruct newBulkOrderMapstruct;
     private final SysOssServiceImpl sysOssService;
 
-    private List<MultipartFile> imageList;
-
-    /**
-     * 单独上传图片的处理
-     * @param inputImageList 图片列表
-     * @return 结果
-     */
-    @Override
-    public int uploadImage(List<MultipartFile> inputImageList) {
-        imageList = inputImageList;
-        return imageList == null ? 0 : 1;
-    }
-
     /**
      * 新增生产订单
      *
@@ -68,16 +49,9 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     @Transactional(rollbackFor = Exception.class)
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
         try {
-            //保存上传的图片
-            List<SysOssVo> ossList = new ArrayList<>();
-            for (MultipartFile image : imageList) {
-                ossList.add(sysOssService.upload(image));
-            }
             //批量处理新增生产订单
             OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
-            for (int i = 0; i < newBulkOrderBo.getOrderLists().size(); i++) {
-                OrderListBo orderList = newBulkOrderBo.getOrderLists().get(i);
-                SysOssVo sysOssVo = ossList.get(i);
+            for (OrderListBo orderList : newBulkOrderBo.getOrderLists()) {
                 // 生成单号
                 String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
                 String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
@@ -125,17 +99,29 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
                     userOrderTemplateMapper.insert(templates);
                 }
 
-                // 处理图片关联性
-                attachmentMapper.insert(MapstructUtils.convert(new AttachmentBo(
-                    "image",
-                    newBulkOrderBo.getUserId(),
-                    sysOssVo.getUrl(),
-                    sysOssVo.getFileSuffix(),
-                    sysOssVo.getFileName(),
-                    newBulkOrderBo.getCreateTime(),
-                    newBulkOrderBo.getUpdateTime(),
-                    sysOssVo.getCreateTime(),
-                    sysOssVo.getOssId().toString()), Attachment.class));
+                if (orderList.getOssId() != null) {
+                    SysOssVo sysOssVo =  sysOssService.getById(orderList.getOssId());
+                    // 处理图片关联性
+                    attachmentMapper.insert(MapstructUtils.convert(new AttachmentBo(
+                        "image",
+                        newBulkOrderBo.getUserId(),
+                        sysOssVo.getUrl(),
+                        sysOssVo.getFileSuffix(),
+                        sysOssVo.getFileName(),
+                        "image/" + sysOssVo.getFileSuffix(),
+                        sysOssVo.getCreateTime(),
+                        newBulkOrderBo.getUpdateTime(),
+                        newBulkOrderBo.getCreateTime()
+                        ), Attachment.class)
+                    );
+                    flowerPatternMapper.insert(MapstructUtils.convert(new FlowerPatternBo(
+                        sysOssVo.getUrl(),
+                        sysOssVo.getCreateTime(),
+                        userOrder.getId(),
+                        newBulkOrderBo.getUserId()
+                        ), FlowerPattern.class)
+                    );
+                }
             }
             return 1;
         } catch (Exception e) {

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

@@ -15,8 +15,8 @@
         <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="basicNumber" column="basic_nmber"/>
+        <result property="basicFenNumber" column="basic_fen_nmber"/>
         <result property="money" column="money"/>
         <result property="remark" column="remark"/>
         <result property="goodsTypeExtend1Id" column="goods_type_extend_1_id"/>
@@ -29,7 +29,7 @@
         <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="craftPrice" column="gongyi_price"/>
         <result property="itemNumber" column="item_number"/>
         <result property="weight" column="weight"/>
         <result property="menfu" column="menfu"/>
@@ -54,70 +54,69 @@
         <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"/>
+        <result property="imageUrl" column="image"/>
+        <result property="status" column="craft_status"/>
     </resultMap>
-    <select id="selectVoPageWithGoodImage" resultType="org.dromara.bulk.domain.vo.BulkOrderListVo">
+    <select id="selectVoPageWithImage" 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
+            pi.id,
+            pi.sys_no,
+            pi.sc_no,
+            pi.goods_id,
+            pi.goods_code,
+            pi.goods_name,
+            pi.goods_note,
+            pi.unit_id,
+            pi.purchase,
+            pi.number,
+            pi.fen_number,
+            pi.basic_nmber,
+            pi.basic_fen_nmber,
+            pi.money,
+            pi.remark,
+            pi.goods_type_extend_1_id,
+            pi.goods_type_extend_1_attr,
+            pi.goods_type_extend_2_id,
+            pi.goods_type_extend_2_attr,
+            pi.goods_type_extend_3_id,
+            pi.goods_type_extend_3_attr,
+            pi.goods_type_extend_4_id,
+            pi.goods_type_extend_4_attr,
+            pi.base_cloth,
+            pi.base_cloth_price,
+            pi.gongyi_price,
+            pi.item_number,
+            pi.weight,
+            pi.menfu,
+            pi.machine,
+            pi.brand_group,
+            pi.garment_factory,
+            pi.garment_factory_people,
+            pi.garment_factory_tel,
+            pi.receiving_address,
+            pi.current_time_consumption,
+            pi.number_orders_placed,
+            pi.order_time,
+            pi.delivery_date,
+            pi.target_date,
+            pi.user_order_id,
+            pi.goods_sales_info_id,
+            pi.number_orders_placed_type,
+            pi.ship_num,
+            pi.bill_remark,
+            pi.duizhang_status,
+            pi.baibu_type,
+            pi.baibu_price,
+            fp.image,
+            p.craft_status
             FROM
-            fa_kuyou_plan_info bo
+            fa_kuyou_plan_info pi
             LEFT JOIN
-            fa_kuyou_goods go ON go.id = bo.goods_id
+            fa_kuyou_plan p ON pi.plan_id = p.id
+            LEFT JOIN
+            fa_kuyou_user_order uo ON p.order_num = uo.order_num
+            LEFT JOIN
+            fa_kuyou_flower_pattern fp ON uo.id = fp.user_order_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/FlowerPatternMapper.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.FlowerPatternMapper">
+</mapper>

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

@@ -1,6 +1,8 @@
 package org.dromara.commodityManagement.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.commodityManagement.domain.Template;
@@ -19,11 +21,13 @@ public class TemplateBo extends BaseEntity {
     /**
      * 大货id
      */
+    @NotNull(message = "大货id不能为空")
     private Long item_id;
 
     /**
      * 版图名称
      */
+    @NotBlank(message = "版图名称不能为空")
     private String name;
 
     /**

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

@@ -5,18 +5,19 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.excel.core.DropDownOptions;
+import org.dromara.common.excel.core.ExcelResult;
 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.SupplierBo;
+import org.dromara.dataManagement.domain.vo.SupplierExcelVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 import org.dromara.dataManagement.service.SupplierService;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 
@@ -41,7 +42,20 @@ public class SupplierController extends BaseController {
      */
     @GetMapping("/downloadTemplate")
     public void getExampleExcel(HttpServletResponse response){
-        ExcelUtil.exportExcel(new ArrayList<>(), "供应商导入模板", SupplierVo.class, response);
+        ExcelUtil.exportExcel(new ArrayList<>(), "供应商导入模板", SupplierExcelVo.class, response);
+    }
+
+    /**
+     * Excel导入供应商信息
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importExcel")
+    public R<Void> importExcel(@RequestPart("file") MultipartFile file) throws Exception {
+        ExcelResult<SupplierExcelVo> result = ExcelUtil.importExcel(file.getInputStream(), SupplierExcelVo.class,false);
+        supplierService.insertImportExcel(result);
+        return R.ok(result.getAnalysis());
     }
 
     /**

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

@@ -0,0 +1,81 @@
+package org.dromara.dataManagement.domain.vo;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.dataManagement.domain.Supplier;
+
+import java.io.Serializable;
+
+@Data
+@AutoMapper(target = Supplier.class)
+public class SupplierExcelVo implements Serializable {
+
+    /**
+     * 供应商类别
+     */
+    @ExcelProperty(value = "供应商类别", order = 1)
+    private int supplyertypeId;
+
+    /**
+     * 供应商编号
+     */
+    @ExcelProperty(value = "供应商编号", order = 2)
+    private String supplyerCode;
+
+    /**
+     * 供应商名称
+     */
+    @ExcelProperty(value = "供应商名称", order = 3)
+    private String supplyerName;
+
+    /**
+     * 首要联系人
+     */
+    @ExcelProperty(value = "首要联系人", order = 4)
+    private String firstConnectName;
+
+    /**
+     * 首要联系人手机号
+     */
+    @ExcelProperty(value = "首要联系人手机号", order = 5)
+    private String firstConnectMobile;
+
+    /**
+     * 首要联系人座机号
+     */
+    @ExcelProperty(value = "首要联系人座机号", order = 6)
+    private String firstConnectPhone;
+
+    /**
+     * 首要联系人QQ/微信/Email
+     */
+    @ExcelProperty(value = "首要联系人QQ/微信/Email", order = 7)
+    private String qqWxEmail;
+
+    /**
+     * 联系地址
+     */
+    @ExcelProperty(value = "联系地址", order = 8)
+    private String connectAddress;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注", order = 9)
+    private String note;
+
+    /**
+     * 应付余额
+     */
+    @ExcelProperty(value = "应付余额", order = 10)
+    private double needGiveAccount;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态", order = 11)
+    private String status;
+
+}

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

@@ -1,9 +1,11 @@
 package org.dromara.dataManagement.service;
 
 
+import org.dromara.common.excel.core.ExcelResult;
 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.SupplierExcelVo;
 import org.dromara.dataManagement.domain.vo.SupplierVo;
 
 import java.util.List;
@@ -13,4 +15,6 @@ public interface SupplierService {
     TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
 
     int deleteRecycleFactoryByIds(List<Integer> supplyertypeId);
+
+    void insertImportExcel(ExcelResult<SupplierExcelVo> result);
 }

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

@@ -5,15 +5,18 @@ 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.excel.core.ExcelResult;
 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.SupplierExcelVo;
 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.ArrayList;
 import java.util.List;
 
 
@@ -51,4 +54,14 @@ public class SupplierServiceImpl implements SupplierService {
         qw.in("supplyertype_id",supplyertypeId);
         return supplierMapper.delete(qw);
     }
+
+    /**
+     * 处理Excel数据
+     * @param result
+     */
+    @Override
+    public void insertImportExcel(ExcelResult<SupplierExcelVo> result) {
+
+
+    }
 }