Merge branch 'develop' into release

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

@@ -1,6 +1,5 @@
 package org.dromara.bulk.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
@@ -26,7 +25,6 @@ class BulkOrderManagementController extends BaseController {
      * @param newBulkOrderBo 新增生产订单BO对象
      * @return 结果
      */
-    @SaIgnore
     @PostMapping()
     public R<Void> insertBulkOrder(@Validated @RequestBody NewBulkOrderBo newBulkOrderBo){
         return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));

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

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

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

@@ -1,45 +0,0 @@
-package org.dromara.bulk.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.tenant.core.TenantEntity;
-
-/**
- * 商品基类
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("fa_kuyou_goods")
-public class Goods extends TenantEntity {
-
-    /**
-     * 商品id
-     */
-    private Long id;
-
-    /**
-     * 商品编码
-     */
-    @TableField("goods_code")
-    private String code;
-
-    /**
-     * 商品名称
-     */
-    @TableField("goods_name")
-    private String name;
-
-    /**
-     * 商品规格id
-     */
-    @TableField("goods_specification_id")
-    private String specificationId;
-
-    /**
-     * 商品单位id
-     */
-    @TableField("more_unit_id")
-    private int unit_id;
-}

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

@@ -8,6 +8,9 @@ import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
 
+/**
+ * 订单记录基类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class OrderRecord extends TenantEntity {

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+/**
+ * 用户订单版图基类
+ */
 @Data
 @TableName("fa_kuyou_user_order_template")
 public class UserOrderTemplate {

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

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

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

@@ -119,43 +119,43 @@ public class OrderListBo {
     /**
      * 烧花,0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isBurnFlowers = 0;
 
     /**
      * 快返,0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isFirstOrder = 0;
 
     /**
      * 加急，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isUrgent = 0;
 
     /**
      * 补货，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isBuhuo = 0;
 
     /**

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

@@ -2,12 +2,16 @@ package org.dromara.bulk.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
-
 import java.util.Date;
 
+/**
+ * 订单记录BO对象
+ */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class OrderRecordBo extends BaseEntity {
     /**
      * 订单号

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

@@ -8,7 +8,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.Date;
 
-
+/**
+ * 用户订单BO对象
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = UserOrder.class, reverseConvertGenerate = false)

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

@@ -1,41 +0,0 @@
-package org.dromara.bulk.domain.vo;
-
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.bulk.domain.Goods;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-
-/**
- * 商品VO类
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Goods.class)
-public class GoodsVo extends BaseEntity {
-
-    /**
-     * 商品id
-     */
-    private Long id;
-
-    /**
-     * 商品编码
-     */
-    private String code;
-
-    /**
-     * 商品名称
-     */
-    private String name;
-
-    /**
-     * 规格id
-     */
-    private String specificationId;
-
-    /**
-     * 单位id
-     */
-    private int unit_id;
-}

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

@@ -9,6 +9,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.Date;
 
+/**
+ * 订单记录VO对象
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = OrderRecord.class)

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

@@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 import java.util.Date;
 
 /**
- *
+ * 用户订单VO对象
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -5,6 +5,9 @@ import org.dromara.bulk.domain.Attachment;
 import org.dromara.bulk.domain.vo.AttachmentVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+/**
+ * 附件表Mapper
+ */
 @Mapper
 public interface AttachmentMapper extends BaseMapperPlus<Attachment, AttachmentVo> {
 }

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

@@ -23,8 +23,11 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      */
     Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
-
-
+    /**
+     * 获取指定的计划表id
+     * @return 计划表id
+     */
+    Long selectPlanId(Long id);
 }
 
 

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

@@ -5,6 +5,15 @@ import org.dromara.bulk.domain.FlowerPattern;
 import org.dromara.bulk.domain.vo.FlowerPatternVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+/**
+ * 图片关联表 Mapper
+ */
 @Mapper
 public interface FlowerPatternMapper extends BaseMapperPlus<FlowerPattern, FlowerPatternVo> {
+    /**
+     * 根据订单id删除图片关联表
+     * @param userOrderId 用户订单Id
+     * @return 行数
+     */
+    int deleteByUserOrderId(Long userOrderId);
 }

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

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

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

@@ -11,6 +11,9 @@ import org.dromara.bulk.domain.OrderRecord;
 import org.dromara.bulk.domain.vo.OrderRecordVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+/**
+ * 用户下单记录Mapper
+ */
 @Mapper
 public interface OrderRecordMapper extends BaseMapperPlus<OrderRecord, OrderRecordVo> {
     Page<OrderRecordVo> selectVoPageWithUserId(IPage<OrderRecordVo> page, @Param(Constants.WRAPPER) QueryWrapper<OrderRecord> wrapper);

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

@@ -10,4 +10,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderMapper extends BaseMapperPlus<UserOrder, UserOrderVo> {
+    /**
+     * 根据订单编号获取用户订单表Id
+     * @param orderNumber 订单编号
+     * @return 行数
+     */
+    Long selectIdByOrderNumber(String orderNumber);
 }

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

@@ -10,4 +10,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderTemplateMapper extends BaseMapperPlus<UserOrderTemplate, UserOrderTemplateVo> {
+    int deleteByPlanId(Long planId);
 }

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

@@ -6,6 +6,9 @@ import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+/**
+ * 大货订单Service层
+ */
 public interface BulkOrderListService {
     /**
      * 分页查询大货订单

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

@@ -2,9 +2,14 @@ package org.dromara.bulk.service;
 
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 
+/**
+ * 大货订单管理Service层
+ */
 public interface BulkOrderManagementService {
-
-//    TableDataInfo<BulkOrderListVo> selectPageVoList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
-
+    /**
+     * 新增生产订单
+     * @param newBulkOrderBo 新生产订单BO对象
+     * @return 结果
+     */
     int insertBulkOrder(NewBulkOrderBo newBulkOrderBo);
 }

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

@@ -1,21 +0,0 @@
-package org.dromara.bulk.service;
-
-import org.dromara.bulk.domain.bo.GoodsBo;
-import org.dromara.bulk.domain.vo.GoodsVo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-
-import java.util.List;
-
-public interface GoodsService {
-
-    TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery);
-
-    int insertGoods(GoodsBo goodsBo);
-
-    int updateGoods(GoodsBo goodsBo);
-
-    int deleteGoodsById(Long[] goodsIds);
-
-    List<GoodsVo> selectGoodsList();
-}

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

@@ -5,6 +5,16 @@ import org.dromara.bulk.domain.vo.OrderRecordVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+/**
+ * 客户下单记录Service层
+ */
 public interface OrderRecordService {
+
+    /**
+     * 查询客户下单记录列表
+     * @param orderRecordBo 查询条件
+     * @param page 分页信息
+     * @return 结果
+     */
     TableDataInfo<OrderRecordVo> selectPageOrderList(OrderRecordBo orderRecordBo, PageQuery page);
 }

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

@@ -6,14 +6,17 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
-import org.dromara.bulk.mapper.*;
-import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
+import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.FlowerPatternMapper;
+import org.dromara.bulk.mapper.UserOrderMapper;
+import org.dromara.bulk.mapper.UserOrderTemplateMapper;
 import org.dromara.bulk.service.BulkOrderListService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -27,11 +30,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
-    private final AttachmentMapper attachmentMapper;
     private final FlowerPatternMapper flowerPatternMapper;
 
-    private final NewBulkOrderMapstruct newBulkOrderMapstruct;
-
     /**
      * 查询大货订单列表分页信息
      * @param bulkOrderListBo 大货订单BO对象
@@ -57,14 +57,26 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     }
 
     /**
-     * 删除大货订单
+     * 删除大货订单及所属数据
      * @param bulkOrderListIds 大货订单ID数组
      * @return 删除行数
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
         for (Long bulkOrderListId : bulkOrderListIds) {
+            Long planId = bulkOrderListMapper.selectPlanId(bulkOrderListId);
+            if (null == planId){
+                return 0;
+            }
+            String orderNUmber = productionPlanMapper.selectOrderNumberById(planId);
+            Long userOrderId = userOrderMapper.selectIdByOrderNumber(orderNUmber);
 
+            bulkOrderListMapper.deleteById(bulkOrderListId);
+            productionPlanMapper.deleteById(planId);
+            userOrderMapper.deleteById(userOrderId);
+            flowerPatternMapper.deleteByUserOrderId(userOrderId);
+            userOrderTemplateMapper.deleteByPlanId(planId);
         }
         return 1;
     }

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

@@ -1,7 +1,6 @@
 package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.dromara.bulk.domain.*;
 import org.dromara.bulk.domain.bo.AttachmentBo;
 import org.dromara.bulk.domain.bo.FlowerPatternBo;
@@ -25,7 +24,6 @@ import java.util.List;
 /**
  * 大货订单管理服务层实现
  */
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
@@ -132,7 +130,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
             }
             return 1;
         } catch (Exception e) {
-            log.error("插入生产订单失败: {}", e.getMessage(), e);
             throw new RuntimeException("插入生产订单失败", e);
         }
     }

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

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

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

@@ -119,4 +119,7 @@
             fa_kuyou_flower_pattern fp ON uo.id = fp.user_order_id
             ${ew.getCustomSqlSegment()}
     </select>
+    <select id="selectPlanId" resultType="java.lang.Long">
+        SELECT plan_id FROM fa_kuyou_plan_info WHERE id = #{id}
+    </select>
 </mapper>

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

@@ -3,4 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.FlowerPatternMapper">
+    <delete id="deleteByUserOrderId">
+        DELETE FROM fa_kuyou_flower_pattern WHERE user_order_id = #{userOrderId}
+    </delete>
 </mapper>

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

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

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

@@ -3,4 +3,7 @@
         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="selectIdByOrderNumber" resultType="java.lang.Long">
+        SELECT id FROM fa_kuyou_user_order WHERE order_num = #{orderNumber}
+    </select>
 </mapper>

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

@@ -3,4 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.UserOrderTemplateMapper">
+    <delete id="deleteByPlanId">
+        DELETE FROM fa_kuyou_user_order_template WHERE plan_id = #{planId}
+    </delete>
 </mapper>

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

@@ -0,0 +1,17 @@
+package org.dromara.dataManagement.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.dataManagement.service.SelfGetAddressSerivce;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@SaIgnore
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/dataManagement/getAddress")
+public class SelfGetAddressController {
+
+    private final SelfGetAddressSerivce selfGetAddressSerivce;
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -23,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 
 
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/supplier")

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

@@ -0,0 +1,4 @@
+package org.dromara.dataManagement.domain;
+
+public class SelfGetAddress {
+}

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

@@ -1,5 +1,6 @@
 package org.dromara.dataManagement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,6 +14,7 @@ public class Supplier extends TenantEntity {
     /**
      * 主键ID
      */
+    @TableId("id")
     private int id;
 
     /**

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

@@ -0,0 +1,4 @@
+package org.dromara.dataManagement.domain.bo;
+
+public class SelfGetAddressBo {
+}

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

@@ -0,0 +1,4 @@
+package org.dromara.dataManagement.domain.vo;
+
+public class SelfGetAddressVo {
+}

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

@@ -12,6 +12,11 @@ import java.io.Serializable;
 @AutoMapper(target = Supplier.class)
 public class SupplierExcelVo implements Serializable {
 
+    /**
+     * 主键Id
+     */
+    private int id;
+
     /**
      * 供应商类别
      */

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

@@ -13,6 +13,11 @@ import org.dromara.dataManagement.domain.Supplier;
 @AutoMapper(target = Supplier.class)
 public class SupplierVo extends BaseEntity {
 
+    /**
+     * id
+     */
+    private int id;
+
     /**
      * 供应商类别
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/mapper/SelfGetAddressMapper.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.SelfGetAddress;
+import org.dromara.dataManagement.domain.vo.SelfGetAddressVo;
+
+@Mapper
+public interface SelfGetAddressMapper extends BaseMapperPlus<SelfGetAddress, SelfGetAddressVo> {
+}

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

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

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

@@ -0,0 +1,8 @@
+package org.dromara.dataManagement.service.impl;
+
+import org.dromara.dataManagement.service.SelfGetAddressSerivce;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SelfGetAddressSerivceImpl implements SelfGetAddressSerivce {
+}

ruoyi-modules/ruoyi-dataManagement/src/main/resources/mapper/SelfGetAddressMapper.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.SelfGetAddressMapper">
+
+</mapper>

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

@@ -10,4 +10,10 @@ import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
  */
 @Mapper
 public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
+    /**
+     * 根据id查询订单编号
+     * @param id id
+     * @return 订单编号
+     */
+    String selectOrderNumberById(Long id);
 }

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

@@ -3,4 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.productionManagement.mapper.ProductionPlanMapper">
+    <select id="selectOrderNumberById" resultType="java.lang.String">
+        SELECT order_num FROM fa_kuyou_plan WHERE id = #{id}
+    </select>
 </mapper>