Merge branch 'develop' into release

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

@@ -1,4 +1,44 @@
 package org.dromara.bulk.controller;
 
-public class BulkOrderListController {
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.BulkOrderListBo;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.bulk.service.BulkOrderListService;
+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.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/bulkOrderList")
+public class BulkOrderListController extends BaseController {
+    private final BulkOrderListService bulkOrderListService;
+
+    @SaIgnore
+    @GetMapping("/PageList")
+    public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
+        return bulkOrderListService.selectPageBulkOrderList(bulkOrderListBo, pageQuery);
+    }
+
+    @SaIgnore
+    @PostMapping()
+    public R<Void> insertBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
+        return toAjax(bulkOrderListService.insertBulkOrder(bulkOrderListBo));
+    }
+
+    @SaIgnore
+    @PutMapping()
+    public R<Void> updateBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
+        return toAjax(bulkOrderListService.updateBulkOrder(bulkOrderListBo));
+    }
+
+    @SaIgnore
+    @DeleteMapping("/{bulkOrderListIds}")
+    public R<Void> deleteBulkOrderById(@PathVariable Long[] bulkOrderListIds) {
+        return toAjax(bulkOrderListService.deleteBulkOrderById(bulkOrderListIds));
+    }
 }

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

@@ -0,0 +1,45 @@
+package org.dromara.bulk.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.GoodsBo;
+import org.dromara.bulk.domain.vo.GoodsVo;
+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.*;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/goods")
+public class GoodsController extends BaseController {
+    private final GoodsService goodsService;
+
+    @SaIgnore
+    @GetMapping("/PageList")
+    public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
+        return goodsService.selectPageGoodsList(goodsBo, pageQuery);
+    }
+
+    @SaIgnore
+    @PostMapping()
+    public R<Void> insertGoods(@Validated @RequestBody GoodsBo goodsBo) {
+        return toAjax(goodsService.insertGoods(goodsBo));
+    }
+
+    @SaIgnore
+    @PutMapping()
+    public R<Void> updateGoods(@Validated @RequestBody GoodsBo goodsBo) {
+        return toAjax(goodsService.updateGoods(goodsBo));
+    }
+
+    @SaIgnore
+    @DeleteMapping("/{goodsIds}")
+    public R<Void> deleteGoodsById(@PathVariable Long[] goodsIds) {
+        return toAjax(goodsService.deleteGoodsById(goodsIds));
+    }
+}

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

@@ -1,12 +1,13 @@
 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)
@@ -21,7 +22,6 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 系统单号
     */
-
     private String sysNo;
 
     /**
@@ -107,41 +107,49 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 面料id
     */
+    @TableField("goods_type_extend_1_id")
     private String goodsTypeExtend1Id;
 
     /**
     * 面料的扩展信息
     */
+    @TableField("goods_type_extend_1_attr")
     private String goodsTypeExtend1Attr;
 
     /**
     * 物料id
     */
+    @TableField("goods_type_extend_2_id")
     private String goodsTypeExtend2Id;
 
     /**
     * 物料的扩展信息
     */
+    @TableField("goods_type_extend_2_attr")
     private String goodsTypeExtend2Attr;
 
     /**
     * 工艺类型id
     */
+    @TableField("goods_type_extend_3_id")
     private String goodsTypeExtend3Id;
 
     /**
     * 工艺类型的扩展信息
     */
+    @TableField("goods_type_extend_3_attr")
     private String goodsTypeExtend3Attr;
 
     /**
     * 花型号id
     */
+    @TableField("goods_type_extend_4_id")
     private String goodsTypeExtend4Id;
 
     /**
     * 花型号的扩展信息
     */
+    @TableField("goods_type_extend_4_attr")
     private String goodsTypeExtend4Attr;
 
     /**
@@ -252,4 +260,24 @@ public class BulkOrderList extends TenantEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

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

@@ -11,17 +11,38 @@ import org.dromara.common.tenant.core.TenantEntity;
 @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;
+
+    /**
+     * 商品图片
+     */
+    @TableField("goods_image")
+    private String image;
 }

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

@@ -75,11 +75,13 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 进价
     */
+    @NotBlank(message = "进价不能为空")
     private double purchase;
 
     /**
     * 数量
     */
+    @NotBlank(message = "数量不能为空")
     private double number;
 
     /**
@@ -241,6 +243,7 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 下单码数类型
     */
+    @NotBlank(message = "下单码数类型不能为空")
     private String numberOrdersPlacedType;
     /**
     * 发货数量
@@ -255,4 +258,24 @@ public class BulkOrderListBo extends BaseEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

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

@@ -253,4 +253,24 @@ public class BulkOrderListVo extends BaseEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

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

@@ -11,13 +11,33 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 @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;
+
+    /**
+     * 图片
+     */
+    private String image;
 }

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

@@ -8,10 +8,14 @@ import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
 import org.dromara.bulk.service.BulkOrderListService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
 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;
+
 
 @Service
 @RequiredArgsConstructor
@@ -22,24 +26,27 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     @Override
     public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
         QueryWrapper<BulkOrderList> qw = new QueryWrapper<>();
-        qw.eq(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
+        qw.like(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
         Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
     @Override
     public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        return 0;
+        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
+        bulkOrderListBo.setScNo(orderNumberGenerator.generateOrderNumber("SC"));
+        bulkOrderListBo.setSysNo(orderNumberGenerator.generateOrderNumber("SYS"));
+        return bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
     @Override
     public int updateBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        return 0;
+        return bulkOrderListMapper.updateById(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
     @Override
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
-        return 0;
+        return bulkOrderListMapper.deleteByIds(Arrays.asList(bulkOrderListIds));
     }
 }
 

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

@@ -1,6 +1,9 @@
 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;
@@ -18,7 +21,9 @@ public class GoodsServiceImpl implements GoodsService {
     private final GoodsMapper goodsMapper;
     @Override
     public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
-        return null;
+        QueryWrapper<Goods> qw = new QueryWrapper<>();
+        Page<GoodsVo> page = goodsMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
     }
 
     @Override

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

@@ -1,13 +1,10 @@
 package org.dromara.commodityManagement.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.List;
-
 /**
  * 大货编号基类
  */
@@ -60,10 +57,4 @@ public class DaHuoNumber extends TenantEntity {
      * 机器
      */
     private String machine;
-
-    /**
-     * 版图
-     */
-    @TableField(exist = false)
-    private List<Template> template;
 }

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,11 +9,6 @@ import org.dromara.common.tenant.core.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_item_name_template")
 public class Template extends TenantEntity {
-
-    public Template(String name) {
-        this.name = name;
-    }
-
     /**
      * 版图id
      */
@@ -34,11 +28,4 @@ public class Template extends TenantEntity {
      * 图片
      */
     private String image;
-
-    /**
-     * 增删改标志
-     * 1.为删除 2.为修改 3.为新增 0.为未变动
-     */
-    @TableField(exist = false)
-    private int delUpdateOrAdd = 0;
 }

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

@@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DaHuoNumber;
-import org.dromara.commodityManagement.domain.Template;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.List;
@@ -67,6 +67,6 @@ public class DaHuoNumberBo extends BaseEntity {
     /**
      * 版图
      */
-    private List<Template> template;
+    private List<TemplateVo> template;
 
 }

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

@@ -4,7 +4,6 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.DaHuoNumber;
-import org.dromara.commodityManagement.domain.Template;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.List;
@@ -65,6 +64,6 @@ public class DaHuoNumberVo extends BaseEntity {
     /**
      * 版图
      */
-    private List<Template> template;
+    private List<TemplateVo> template;
 
 }

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

@@ -11,6 +11,9 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 @AutoMapper(target = Template.class)
 public class TemplateVo extends BaseEntity {
 
+    public TemplateVo(String name) {
+        this.name = name;
+    }
     /**
      * 版图id
      */

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

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.service;
 
-import org.dromara.commodityManagement.domain.Brand;
 import org.dromara.commodityManagement.domain.bo.BrandBo;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -45,11 +44,11 @@ public interface BrandService {
      * 根据品牌Ids查询品牌列表
      * @return 品牌列表
      */
-    List<Brand> selectBrandListByIds(Long[] brandIds);
+    List<BrandVo> selectBrandListByIds(Long[] brandIds);
 
     /**
      * 查询品牌列表
      * @return 品牌列表
      */
-    List<Brand> selectBrandList();
+    List<BrandVo> selectBrandList();
 }

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

@@ -8,7 +8,6 @@ import org.dromara.commodityManagement.domain.bo.BrandBo;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.commodityManagement.mapper.BrandMapper;
 import org.dromara.commodityManagement.service.BrandService;
-import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -54,7 +53,6 @@ public class BrandServiceImpl implements BrandService {
     @Override
     public int insertBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
-        validEntityBeforeSave(brand);
         return brandMapper.insert(brand);
     }
 
@@ -67,7 +65,6 @@ public class BrandServiceImpl implements BrandService {
     @Override
     public int updateBrand(BrandBo brandBo) {
         Brand brand = MapstructUtils.convert(brandBo, Brand.class);
-        validEntityBeforeSave(brand);
         return brandMapper.updateById(brand);
     }
 
@@ -89,7 +86,7 @@ public class BrandServiceImpl implements BrandService {
      * @return Brand列表
      */
     @Override
-    public List<Brand> selectBrandListByIds(Long[] brandIds) {
+    public List<BrandVo> selectBrandListByIds(Long[] brandIds) {
         return selectBrandsByIdOrChooseAll(brandIds);
     }
 
@@ -99,34 +96,23 @@ public class BrandServiceImpl implements BrandService {
      * @return Brand列表
      */
     @Override
-    public List<Brand> selectBrandList() {
+    public List<BrandVo> selectBrandList() {
         return selectBrandsByIdOrChooseAll(null);
     }
 
-    /**
-     * 保存前校验
-     *
-     * @param entity Brand实体对象
-     */
-    private void validEntityBeforeSave(Brand entity) {
-        if (!(entity.getType().equals("1") || entity.getType().equals("2"))) {
-            throw new ServiceException("类型错误！");
-        }
-    }
-
     /**
      * 根据是否传入品牌ID列表查询品牌
      *
      * @param brandIds BrandID列表
      * @return Brand列表
      */
-    private List<Brand> selectBrandsByIdOrChooseAll(Long[] brandIds) {
+    private List<BrandVo> selectBrandsByIdOrChooseAll(Long[] brandIds) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
-        qw.eq("type", 2);
-        if (brandIds != null) {
+        qw.eq("type", BRAND_TYPE.getType());
+        if (null != brandIds) {
             qw.in("id", Arrays.asList(brandIds));
         }
-        return MapstructUtils.convert(brandMapper.selectVoList(qw), Brand.class);
+        return brandMapper.selectVoList(qw);
     }
 
 }

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

@@ -8,6 +8,7 @@ import org.dromara.commodityManagement.domain.Template;
 import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
 import org.dromara.commodityManagement.domain.vo.DaHuoNumberImportVo;
 import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
 import org.dromara.commodityManagement.mapper.DaHuoNumberMapper;
 import org.dromara.commodityManagement.mapper.TemplateMapper;
 import org.dromara.commodityManagement.service.DaHuoNumberService;
@@ -64,10 +65,10 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         int allRow = 0;
         allRow += daHuoNumberMapper.insert(daHuoNumber);
         Long row = daHuoNumberMapper.selectLastId();
-        if (daHuoNumber.getTemplate() != null) {
-            for (Template template : daHuoNumber.getTemplate()){
+        if (daHuoNumberBo.getTemplate() != null) {
+            for (TemplateVo template : daHuoNumberBo.getTemplate()){
                 template.setItem_id(row);
-                allRow += templateMapper.insert(template);
+                allRow += templateMapper.insert(MapstructUtils.convert(template, Template.class));
             }
         }
         return allRow;
@@ -81,15 +82,18 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
     @Override
     public int updateDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
         DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
-        if (daHuoNumber.getTemplate() != null){
-            for (Template template : daHuoNumber.getTemplate()){
-                switch (template.getDelUpdateOrAdd()){
+        if (null != daHuoNumberBo.getTemplate()) {
+            for (TemplateVo template : daHuoNumberBo.getTemplate()) {
+                switch (template.getDelUpdateOrAdd()) {
                     case 1:
-                        templateMapper.deleteById(template);break;
+                        templateMapper.deleteById(template);
+                        break;
                     case 2:
-                        templateMapper.updateById(template);break;
+                        templateMapper.updateById(MapstructUtils.convert(template, Template.class));
+                        break;
                     case 3:
-                        templateMapper.insert(template);break;
+                        templateMapper.insert(MapstructUtils.convert(template, Template.class));
+                        break;
                 }
             }
         }
@@ -136,9 +140,9 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
     public void insertImportExcel(ExcelResult<DaHuoNumberImportVo> result){
         for (DaHuoNumberImportVo importVo : result.getList()){
             String[] templateNames = importVo.getTemplate().split(",");
-            List<Template> templates = new ArrayList<>();
+            List<TemplateVo> templates = new ArrayList<>();
             for (String templateName : templateNames){
-                templates.add(new Template(templateName));
+                templates.add(new TemplateVo(templateName));
             }
             DaHuoNumberBo daHuoNumber = MapstructUtils.convert(importVo, DaHuoNumberBo.class);
             if (daHuoNumber != null) {