合并develop分支代码

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

@@ -49,7 +49,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/sys_chenx_buyi_b?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://10.10.244.243:3306/sys_chenx_buyi_b?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
           password: 123456
 #        # 从库数据源

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/BrandController.java

@@ -1,15 +1,21 @@
 package org.dromara.commodityManagement.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.commodityManagement.domain.bo.BrandBo;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.commodityManagement.service.BrandService;
 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.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 /**
  * 品牌组接口
  */
@@ -36,7 +42,7 @@ public class BrandController extends BaseController {
      * @return 新增结果
      */
     @PostMapping()
-    public R<Void> insertBrand(@RequestBody BrandBo brand) {
+    public R<Void> insertBrand(@Validated @RequestBody BrandBo brand) {
         return toAjax(brandService.insertBrand(brand));
     }
 
@@ -46,7 +52,7 @@ public class BrandController extends BaseController {
      * @return 修改结果
      */
     @PutMapping()
-    public R<Void> updateBrand(@RequestBody BrandBo brand) {
+    public R<Void> updateBrand(@Validated @RequestBody BrandBo brand) {
         return toAjax(brandService.updateBrand(brand));
     }
 
@@ -59,4 +65,22 @@ public class BrandController extends BaseController {
     public R<Void> deleteBrandByIds(@PathVariable Long[] brandIds) {
         return toAjax(brandService.deleteBrandById(brandIds));
     }
+
+    /**
+     * 根据品牌Ids导出Excel
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportBrandExcel(@RequestParam("ids") Long[] brandIds , HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandListByIds(brandIds)), "品牌列表","excel/品牌导出模板.xlsx", response);
+    }
+
+    /**
+     * 通过Excel导出所有品牌数据
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcel")
+    public void exportBrandExcel(HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),brandService.selectBrandList()), "品牌列表","excel/品牌导出模板.xlsx", response);
+    }
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/CraftController.java

@@ -0,0 +1,82 @@
+package org.dromara.commodityManagement.controller;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.commodityManagement.service.CraftService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+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 org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.HashMap;
+
+/**
+ * 工艺管理接口
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/commodityManagement/craft")
+public class CraftController extends BaseController {
+    private final CraftService craftService;
+
+    /**
+     * 查询工艺管理列表
+     * @param craft 工艺Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<CraftVo> selectPageCraftList(CraftBo craft, PageQuery pageQuery) {
+        return craftService.selectPageCraftList(craft, pageQuery);
+    }
+    /**
+     * 新增工艺
+     * @param craft 工艺Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertCraft(@Validated @RequestBody CraftBo craft) {
+        return toAjax(craftService.insertCraft(craft));
+    }
+    /**
+     * 修改工艺
+     * @param craft 工艺Bo对象
+     * @return 修改结果
+     */
+    @PutMapping()
+    public R<Void> updateCraft(@RequestBody CraftBo craft) {
+        return toAjax(craftService.updateCraft(craft));
+    }
+    /**
+     * 删除工艺
+     * @param craftIds 工艺id数组
+     * @return 删除结果
+     */
+    @DeleteMapping("/{craftIds}")
+    public R<Void> deleteCraftByIds(@PathVariable Long[] craftIds) {
+        return toAjax(craftService.deleteCraftByIds(craftIds));
+    }
+
+    /**
+     * 根据工艺Ids导出Excel
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportCraftExcel(@RequestParam("ids") Long[] craftIds , HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(), craftService.selectCraftListByIds(craftIds)),"工艺列表.xlsx","excel/工艺导出模板.xlsx",response);
+    }
+
+    /**
+     * 通过Excel导出工艺数据
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcel")
+    public void exportCraftExcel(HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(), craftService.selectCraftList()),"工艺列表.xlsx","excel/工艺导出模板.xlsx",response);
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/DaHuoNumberController.java

@@ -0,0 +1,88 @@
+package org.dromara.commodityManagement.controller;
+
+
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
+import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.commodityManagement.service.DaHuoNumberService;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+/**
+ * 大货编号管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/commodityManagement/daHuoNumber")
+public class DaHuoNumberController extends BaseController {
+
+    private final DaHuoNumberService daHuoNumberService;
+
+    /**
+     * 查询大货编号列表
+     * @param daHuoNumberBo 大货编号Bo对象
+     * @param pageQuery 分页信息
+     * @return 查询结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<DaHuoNumberVo> selectPageDiBuList(DaHuoNumberBo daHuoNumberBo, PageQuery pageQuery) {
+        return daHuoNumberService.selectPageDaHuoNumberList(daHuoNumberBo, pageQuery);
+    }
+
+    /**
+     * 新增大货编号
+     * @param daHuoNumberBo 大货编号Bo对象
+     * @return 新增结果
+     */
+    @PostMapping()
+    public R<Void> insertBrand(@Validated @RequestBody DaHuoNumberBo daHuoNumberBo) {
+        return toAjax(daHuoNumberService.insertDaHuoNumber(daHuoNumberBo));
+    }
+
+    /**
+     * 修改大货编号
+     * @param daHuoNumberBo 大货编号Bo对象
+     * @return 修改结果
+     */
+    @PutMapping()
+    public R<Void> updateBrand(@Validated @RequestBody DaHuoNumberBo daHuoNumberBo) {
+        return toAjax(daHuoNumberService.updateDaHuoNumber(daHuoNumberBo));
+    }
+
+    /**
+     * 删除大货编号
+     * @param daHuoNumberIds 大货编号ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/{daHuoNumberIds}")
+    public R<Void> deleteBrandByIds(@PathVariable Long[] daHuoNumberIds) {
+        return toAjax(daHuoNumberService.deleteDaHuoNumberByIds(daHuoNumberIds));
+    }
+
+    /**
+     * 根据大货编号Ids导出Excel
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportDiBuExcel(@RequestParam("ids") Long[] daHuoNumberIds , HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),daHuoNumberService.selectDaHuoNumberListByIds(daHuoNumberIds)), "大货编号列表","excel/大货编号导出模板.xlsx", response);
+    }
+
+    /**
+     * 通过Excel导出所有大货编号数据
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcel")
+    public void exportDiBuExcel(HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),daHuoNumberService.selectDaHuoNumberList()), "大货编号列表","excel/大货编号导出模板.xlsx", response);
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/DiBuController.java

@@ -0,0 +1,87 @@
+package org.dromara.commodityManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.DiBuBo;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.commodityManagement.service.DiBuService;
+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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+/**
+ * 底布管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/commodityManagement/dibu")
+public class DiBuController extends BaseController {
+
+    private final DiBuService diBuService;
+
+    /**
+     * 获取底布列表
+     * @param diBu 底布BO对象
+     * @param pageQuery 条件分页
+     * @return 结果
+     */
+    @GetMapping("/PageList")
+    public TableDataInfo<DiBuVo> selectPageDiBuList(DiBuBo diBu, PageQuery pageQuery) {
+        return diBuService.selectPageDiBuList(diBu, pageQuery);
+    }
+
+    /**
+     * 新增底布
+     * @param diBuBo 底布BO对象
+     * @return 结果
+     */
+    @PostMapping()
+    public R<Void> insertDiBu(@Validated @RequestBody DiBuBo diBuBo) {
+        return toAjax(diBuService.insertDiBu(diBuBo));
+    }
+
+    /**
+     * 修改底布
+     * @param diBuBo 底布BO对象
+     * @return 影响行数
+     */
+    @PutMapping()
+    public R<Void> updateDiBu(@Validated @RequestBody DiBuBo diBuBo) {
+        return toAjax(diBuService.updateDiBu(diBuBo));
+    }
+
+    /**
+     * 删除底布
+     * @param diBuIds 底布Ids
+     * @return 影响行数
+     */
+    @DeleteMapping("/{diBuIds}")
+    public R<Void> deleteDiBuByIds(@PathVariable Long[] diBuIds) {
+        return toAjax(diBuService.deleteDiBuById(diBuIds));
+    }
+
+    /**
+     * 根据底布Ids导出Excel
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportDiBuExcel(@RequestParam("ids") Long[] diBuIds ,HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),diBuService.selectDiBuListByIds(diBuIds)), "底布列表.xlsx","excel/底布导出模板.xlsx", response);
+    }
+    /**
+     * 通过Excel导出所有底布数据
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcel")
+    public void exportDiBuExcel(HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),diBuService.selectDiBuList()), "底布列表.xlsx","excel/底布导出模板.xlsx", response);
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/OemController.java

@@ -1,15 +1,20 @@
 package org.dromara.commodityManagement.controller;
-
+import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.vo.OemVo;
 import org.dromara.commodityManagement.service.OemService;
 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.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 /**
  * 花型号管理接口
  */
@@ -25,7 +30,7 @@ public class OemController extends BaseController {
      * @param pageQuery 分页信息
      * @return 查询结果
      */
-    @GetMapping()
+    @GetMapping("/PageList")
     public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
         return oemService.selectPageOemList(oem, pageQuery);
     }
@@ -35,7 +40,7 @@ public class OemController extends BaseController {
      * @return 新增结果
      */
     @PostMapping()
-    public R<Void> insertOem(@RequestBody OemBo oem) {
+    public R<Void> insertOem(@Validated @RequestBody OemBo oem) {
         return toAjax(oemService.insertOem(oem));
     }
     /**
@@ -49,11 +54,29 @@ public class OemController extends BaseController {
     }
     /**
      * 删除花型号
-     * @param oemId 花型号Id
+     * @param oemIds 花型号Id
      * @return 删除结果
      */
-    @DeleteMapping()
-    public R<Void> deleteOemByIds(@RequestParam int oemId) {
-        return toAjax(oemService.deleteOemById(oemId));
+    @DeleteMapping("/{oemIds}")
+    public R<Void> deleteOemByIds(@PathVariable Long[] oemIds) {
+        return toAjax(oemService.deleteOemByIds(oemIds));
+    }
+
+    /**
+     * 根据花型号Ids导出Excel
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcelByIds")
+    public void exportOemExcel(@RequestParam("ids") Long[] oemIds, HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),oemService.selectOemList(oemIds)),"花型号列表.xlsx","excel/花型号导出模板.xlsx",response);
+    }
+
+    /**
+     * 通过Excel导出所有花型号数据
+     * @param response 响应对象
+     */
+    @GetMapping("/exportExcel")
+    public void exportOemExcel(HttpServletResponse response) {
+        ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),oemService.selectList()),"花型号列表.xlsx","excel/花型号导出模板.xlsx",response);
     }
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/ShaoHuaController.java

@@ -0,0 +1,34 @@
+package org.dromara.commodityManagement.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.bo.ShaoHuaBo;
+import org.dromara.commodityManagement.service.ShaoHuaService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 烧花单价管理接口
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/commodityManagement/shaohua")
+public class ShaoHuaController extends BaseController {
+    private final ShaoHuaService shaoHuaService;
+
+    /**
+     * 修改烧花单价
+     *
+     * @param shaoHua 烧花BO对象
+     * @return 烧花单价
+     */
+    @PutMapping()
+    public R<Void> updateShaoHua(@RequestBody ShaoHuaBo shaoHua) {
+        return toAjax(shaoHuaService.updateShaoHua(shaoHua));
+    }
+}
+

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

@@ -2,20 +2,21 @@ package org.dromara.commodityManagement.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_item_name")
-public class Brand{
+public class Brand extends TenantEntity {
     /**
      * 品牌ID
      */
     private Long id;
 
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 品牌名称
      */

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

@@ -0,0 +1,62 @@
+package org.dromara.commodityManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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_type_extend")
+public class Craft extends TenantEntity {
+    /**
+     * 工艺ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    @TableField("admin_id")
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    @TableField("goods_type_extend_type")
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    @TableField("goods_type_extend_name")
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+}

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

@@ -0,0 +1,69 @@
+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;
+
+/**
+ * 大货编号基类
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_item_name")
+public class DaHuoNumber extends TenantEntity {
+
+    /**
+     * 序号
+     */
+    private Long id;
+
+    /**
+     * 大货编号
+     */
+    private String name;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 款号
+     */
+    private String kuanhao;
+
+    /**
+     * 花型号
+     */
+    private String huaxinghao;
+
+    /**
+     * 底布
+     */
+    private String dibu;
+
+    /**
+     * 底布价格
+     */
+    private String dibu_price;
+
+    /**
+     * 客户名称
+     */
+    private String customer_name;
+
+    /**
+     * 机器
+     */
+    private String machine;
+
+    /**
+     * 版图
+     */
+    @TableField(exist = false)
+    private List<Template> template;
+}

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

@@ -0,0 +1,100 @@
+package org.dromara.commodityManagement.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_dibu")
+public class DiBu extends TenantEntity {
+
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchase_price;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 单价2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stock_warn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

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

@@ -1,16 +1,17 @@
 package org.dromara.commodityManagement.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 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_oem")
-public class Oem {
+public class Oem extends TenantEntity {
     /**
      * 花型号 ID
      */
-    @TableId("id")
     private Long id;
     /**
      * 花型号名称

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

@@ -0,0 +1,30 @@
+package org.dromara.commodityManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+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_sets")
+public class ShaoHua extends TenantEntity {
+    /**
+     * 烧花ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 烧花英文名称
+     */
+    private String name;
+    /**
+     * 烧花中文名称
+     */
+    private String nikename;
+    /**
+     * 烧花单价
+     */
+    private String value;
+}

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

@@ -0,0 +1,32 @@
+package org.dromara.commodityManagement.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_item_name_template")
+public class Template extends TenantEntity {
+
+    /**
+     * 版图id
+     */
+    private Long id;
+
+    /**
+     * 大货id
+     */
+    private Long item_id;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 图片
+     */
+    private String image;
+}

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

@@ -3,28 +3,27 @@ package org.dromara.commodityManagement.domain.bo;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Brand;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 品牌业务对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Brand.class, reverseConvertGenerate = false)
-public class BrandBo {
+public class BrandBo extends BaseEntity {
 
     /**
      * 品牌ID
      */
     private Long id;
 
-    /**
-     *租户ID
-     */
-    private Long tenant_id;
-
     /**
      * 品牌名称
      */
+    @NotBlank(message = "品牌名称不能为空")
     private String name;
 
     /**

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

@@ -0,0 +1,60 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 工艺对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Craft.class, reverseConvertGenerate = false)
+public class CraftBo extends BaseEntity {
+    /**
+     * 工艺ID
+     */
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+}

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

@@ -0,0 +1,72 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+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.common.mybatis.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 货号管理业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DaHuoNumber.class, reverseConvertGenerate = false)
+public class DaHuoNumberBo extends BaseEntity {
+
+    /**
+     * 序号
+     */
+    private Long id;
+
+    /**
+     * 大货编号
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 款号
+     */
+    private String kuanhao;
+
+    /**
+     * 花型号
+     */
+    private String huaxinghao;
+
+    /**
+     * 底布
+     */
+    private String dibu;
+
+    /**
+     * 底布价格
+     */
+    private String dibu_price;
+
+    /**
+     * 客户名称
+     */
+    private String customer_name;
+
+    /**
+     * 机器
+     */
+    private String machine;
+
+    /**
+     * 版图
+     */
+    private List<Template> template;
+
+}

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

@@ -0,0 +1,109 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 底布业务对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DiBu.class, reverseConvertGenerate = false)
+public class DiBuBo extends BaseEntity {
+
+    /**
+     * 底布Id
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空")
+    private String name;
+
+    /**
+     * 颜色
+     */
+    @NotBlank(message = "颜色不能为空")
+    private String color;
+
+    /**
+     * 门幅
+     */
+    @NotBlank(message = "门幅不能为空")
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    @NotBlank(message = "克重不能为空")
+    private String weight;
+
+    /**
+     * 单价
+     */
+    @NotBlank(message = "单价不能为空")
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchase_price;
+
+    /**
+     * 单位
+     */
+    @NotBlank(message = "单位不能为空")
+    private String unit;
+
+    /**
+     * 针织
+     */
+    @NotBlank(message = "针织不能为空")
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stock_warn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

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

@@ -2,16 +2,19 @@ package org.dromara.commodityManagement.domain.bo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.tenant.core.TenantEntity;
 
 /**
  * 花型号对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Oem.class, reverseConvertGenerate = false)
-public class OemBo {
+public class OemBo extends BaseEntity {
     /**
      * 花型号 ID
      */
@@ -20,12 +23,9 @@ public class OemBo {
     /**
      * 花型号名称
      */
-    @NotBlank(message = "名称不能为空")
     private String name;
-
     /**
      * 花型号图片
      */
-    @NotBlank(message = "图片不能为空")
     private String image;
 }

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

@@ -0,0 +1,34 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.ShaoHua;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 烧花对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHua.class, reverseConvertGenerate = false)
+public class ShaoHuaBo extends BaseEntity {
+    /**
+     * 烧花ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 烧花英文名称
+     */
+    private String name;
+    /**
+     * 烧花中文名称
+     */
+    private String nikename;
+    /**
+     * 烧花单价
+     */
+    private String value;
+}

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

@@ -0,0 +1,33 @@
+package org.dromara.commodityManagement.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.Template;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Template.class, reverseConvertGenerate = false)
+public class TemplateBo extends BaseEntity {
+
+    /**
+     * 版图id
+     */
+    private Long id;
+
+    /**
+     * 大货id
+     */
+    private Long item_id;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 图片
+     */
+    private String image;
+}

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

@@ -3,16 +3,17 @@ package org.dromara.commodityManagement.domain.vo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Brand;
-
-import java.math.BigInteger;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 品牌值对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Brand.class)
-public class BrandVo {
+public class BrandVo extends BaseEntity {
 
     /**
      * 品牌ID

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

@@ -0,0 +1,60 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 工艺值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Craft.class)
+public class CraftVo extends BaseEntity {
+    /**
+     * 工艺ID
+     */
+    private Long id;
+    /**
+     * 管理员ID
+     */
+    private int adminId;
+    /**
+     * 工艺类型
+     */
+    private int goodsTypeExtendType;
+    /**
+     * 工艺名称
+     */
+    private String goodsTypeExtendName;
+    /**
+     * 工艺价格
+     */
+    private String price;
+    /**
+     * 工艺图片
+     */
+    private String goodsTypeExtendImage;
+    /**
+     * pid
+     */
+    private int pid;
+    /**
+     * 路径
+     */
+    private String path;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 重量
+     */
+    private String weigh;
+    /**
+     * 订单状态
+     */
+    private String orderStatus;
+}

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

@@ -0,0 +1,70 @@
+package org.dromara.commodityManagement.domain.vo;
+
+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;
+
+/**
+ * 货号管理视图对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DaHuoNumber.class)
+public class DaHuoNumberVo extends BaseEntity {
+
+    /**
+     * 序号
+     */
+    private Long id;
+
+    /**
+     * 大货编号
+     */
+    private String name;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 款号
+     */
+    private String kuanhao;
+
+    /**
+     * 花型号
+     */
+    private String huaxinghao;
+
+    /**
+     * 底布
+     */
+    private String dibu;
+
+    /**
+     * 底布价格
+     */
+    private String dibu_price;
+
+    /**
+     * 客户名称
+     */
+    private String customer_name;
+
+    /**
+     * 机器
+     */
+    private String machine;
+
+    /**
+     * 版图
+     */
+    private List<Template> template;
+
+}

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

@@ -0,0 +1,101 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 底布视图对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DiBu.class)
+public class DiBuVo extends BaseEntity {
+
+    /**
+     * 底布ID
+     */
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 门幅
+     */
+    private String menfu;
+
+    /**
+     * 克重
+     */
+    private String weight;
+
+    /**
+     * 单价
+     */
+    private String price;
+
+    /**
+     * 进货价
+     */
+    private double purchase_price;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 针织
+     */
+    private String zhenzhi;
+
+    /**
+     * 成分
+     */
+    private String chengfen;
+
+    /**
+     * 供应商
+     */
+    private String gongyingshang;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格2
+     */
+    private String price2;
+
+    /**
+     * 单位2
+     */
+    private String unit2;
+
+    /**
+     * 库存预警
+     */
+    private String stock_warn;
+
+    /**
+     * 库存
+     */
+    private double stock;
+
+    /**
+     * 库存1
+     */
+    private double stock1;
+}

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

@@ -3,25 +3,32 @@ package org.dromara.commodityManagement.domain.vo;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.commodityManagement.domain.Oem;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
  * 花型号值对象
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = Oem.class)
-public class OemVo {
+public class OemVo extends BaseEntity {
     /**
-     * 花类型ID
+     * 花型号ID
      */
     @TableId("id")
     private Long id;
     /**
-     * 花类型名称
+     *租户ID
+     */
+    private Long tenant_id;
+    /**
+     * 花型号名称
      */
     private String name;
     /**
-     * 花类型图片
+     * 花型号图片
      */
     private String image;
 }

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

@@ -0,0 +1,34 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.ShaoHua;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 烧花值对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ShaoHua.class)
+public class ShaoHuaVo extends BaseEntity {
+    /**
+     * 烧花ID
+     */
+    @TableId("id")
+    private Long id;
+    /**
+     * 烧花英文名称
+     */
+    private String name;
+    /**
+     * 烧花中文名称
+     */
+    private String nikename;
+    /**
+     * 烧花单价
+     */
+    private String value;
+}

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

@@ -0,0 +1,33 @@
+package org.dromara.commodityManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.commodityManagement.domain.Template;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Template.class)
+public class TemplateVo extends BaseEntity {
+
+    /**
+     * 版图id
+     */
+    private Long id;
+
+    /**
+     * 大货id
+     */
+    private Long item_id;
+
+    /**
+     * 版图名称
+     */
+    private String name;
+
+    /**
+     * 图片
+     */
+    private String image;
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/BrandMapper.java

@@ -1,10 +1,12 @@
 package org.dromara.commodityManagement.mapper;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.Brand;
 import org.dromara.commodityManagement.domain.vo.BrandVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 
+@Mapper
 public interface BrandMapper extends BaseMapperPlus<Brand, BrandVo> {
 
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/CraftMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+@Mapper
+public interface CraftMapper extends BaseMapperPlus<Craft, CraftVo> {
+
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/DaHuoNumberMapper.java

@@ -0,0 +1,17 @@
+package org.dromara.commodityManagement.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.DaHuoNumber;
+import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 大货管理Mapper
+ */
+@Mapper
+public interface DaHuoNumberMapper extends BaseMapperPlus<DaHuoNumber, DaHuoNumberVo> {
+    Page<DaHuoNumberVo> selectVoPageWithTemplate(IPage<DaHuoNumberVo> page, QueryWrapper<DaHuoNumber> wrapper);
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/DiBuMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 底布Mapper
+ */
+@Mapper
+public interface DiBuMapper extends BaseMapperPlus<DiBu, DiBuVo> {
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/OemMapper.java

@@ -1,11 +1,14 @@
 package org.dromara.commodityManagement.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.dromara.commodityManagement.domain.Oem;
 import org.dromara.commodityManagement.domain.vo.OemVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+/**
+ * 花型号Mapper
+ */
+@Mapper
 public interface OemMapper extends BaseMapperPlus<Oem, OemVo> {
 
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/ShaoHuaMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.ShaoHua;
+import org.dromara.commodityManagement.domain.vo.ShaoHuaVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 烧花Mapper
+ */
+@Mapper
+public interface ShaoHuaMapper extends BaseMapperPlus<ShaoHua, ShaoHuaVo> {
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/mapper/TemplateMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.commodityManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.commodityManagement.domain.Template;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 版图Mapper
+ */
+@Mapper
+public interface TemplateMapper extends BaseMapperPlus<Template, TemplateVo> {
+}

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

@@ -1,16 +1,55 @@
 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;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import java.util.List;
+
+/**
+ * 品牌Service接口
+ */
 public interface BrandService {
+    /**
+     * 分页查询品牌管理
+     * @param brandBo 品牌BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
     TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo, PageQuery pageQuery);
 
+    /**
+     * 新增品牌管理
+     * @param brandBo 品牌BO对象
+     * @return 影响行数
+     */
     int insertBrand(BrandBo brandBo);
 
+    /**
+     * 修改品牌管理
+     * @param brandBo 品牌BO对象
+     * @return 影响行数
+     */
     int updateBrand(BrandBo brandBo);
 
+    /**
+     * 删除品牌管理
+     * @param brandId 品牌ID
+     * @return 影响行数
+     */
     int deleteBrandById(Long[] brandId);
+
+    /**
+     * 根据品牌Ids查询品牌列表
+     * @return 品牌列表
+     */
+    List<Brand> selectBrandListByIds(Long[] brandIds);
+
+    /**
+     * 查询品牌列表
+     * @return 品牌列表
+     */
+    List<Brand> selectBrandList();
 }

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

@@ -0,0 +1,54 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 工艺Service接口
+ */
+public interface CraftService {
+    /**
+     * 查询工艺列表
+     * @param craft 工艺Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<CraftVo> selectPageCraftList(CraftBo craft, PageQuery pageQuery);
+
+    /**
+     * 新增工艺
+     * @param craftBo 工艺Bo对象
+     * @return 影响行数
+     */
+    int insertCraft(CraftBo craftBo);
+
+    /**
+     * 修改工艺
+     * @param craftBo 工艺Bo对象
+     * @return 影响行数
+     */
+    int updateCraft(CraftBo craftBo);
+
+    /**
+     * 删除工艺
+     * @param craftIds 工艺ID
+     * @return 影响行数
+     */
+    int deleteCraftByIds(Long[] craftIds);
+    /**
+     * 查询工艺列表
+     * @return 工艺列表
+     */
+    List<Craft> selectCraftList();
+
+    /**
+     * 根据工艺Ids查询工艺列表
+     * @return 工艺列表
+     */
+    List<Craft> selectCraftListByIds(Long[] craftIds);
+}

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

@@ -0,0 +1,52 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.DaHuoNumber;
+import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
+import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+public interface DaHuoNumberService {
+    /**
+     * 分页查询大货编号管理
+     * @param daHuoNumberBo 大货编号BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<DaHuoNumberVo> selectPageDaHuoNumberList(DaHuoNumberBo daHuoNumberBo, PageQuery pageQuery);
+
+    /**
+     * 新增大货编号管理
+     * @param daHuoNumberBo 大货编号BO对象
+     * @return 影响行数
+     */
+    int insertDaHuoNumber(DaHuoNumberBo daHuoNumberBo);
+
+    /**
+     * 修改大货编号管理
+     * @param daHuoNumberBo 大货编号BO对象
+     * @return 影响行数
+     */
+    int updateDaHuoNumber(DaHuoNumberBo daHuoNumberBo);
+
+    /**
+     * 删除大货编号管理
+     * @param daHuoNumberBo 大货编号ID
+     * @return 影响行数
+     */
+    int deleteDaHuoNumberByIds(Long[] daHuoNumberBo);
+
+    /**
+     * 根据大货编号Ids查询大货编号列表
+     * @return 大货编号列表
+     */
+    List<DaHuoNumber> selectDaHuoNumberListByIds(Long[] daHuoNumberIds);
+
+    /**
+     * 查询大货编号列表
+     * @return 大货编号列表
+     */
+    List<DaHuoNumber> selectDaHuoNumberList();
+}

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

@@ -0,0 +1,55 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.commodityManagement.domain.bo.DiBuBo;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 底布Service接口
+ */
+public interface DiBuService {
+    /**
+     * 查询底布列表
+     * @param diBuBo 底布BO对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
+    TableDataInfo<DiBuVo> selectPageDiBuList(DiBuBo diBuBo, PageQuery pageQuery);
+
+    /**
+     * 新增底布
+     * @param diBuBo 底布BO对象
+     * @return 影响行数
+     */
+    int insertDiBu(DiBuBo diBuBo);
+
+    /**
+     * 修改底布
+     * @param diBuBo 底布BO对象
+     * @return 影响行数
+     */
+    int updateDiBu(DiBuBo diBuBo);
+
+    /**
+     * 删除底布
+     * @param diBuId 底布ID
+     * @return 影响行数
+     */
+    int deleteDiBuById(Long[] diBuId);
+
+    /**
+     * 根据底布Ids查询底布列表
+     * @return 底布列表
+     */
+    List<DiBu> selectDiBuListByIds(Long[] diBuIds);
+
+    /**
+     * 查询底布列表
+     * @return 底布列表
+     */
+    List<DiBu> selectDiBuList();
+}

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

@@ -1,16 +1,53 @@
 package org.dromara.commodityManagement.service;
 
+import org.dromara.commodityManagement.domain.Oem;
 import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.vo.OemVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import java.util.List;
 
+/**
+ * 花型号Service接口
+ */
 public interface OemService {
+    /**
+     * 查询花型号列表
+     * @param oem 花型号Bo对象
+     * @param pageQuery 分页信息
+     * @return 分页结果
+     */
     TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery);
 
+    /**
+     * 新增花型号
+     * @param oemBo 花型号Bo对象
+     * @return 影响行数
+     */
     int insertOem(OemBo oemBo);
-
+    /**
+     * 修改花型号
+     * @param oemBo 花型号ID
+     * @return 影响行数
+     */
     int updateOem(OemBo oemBo);
+    /**
+     * 删除花型号
+     * @param oemId 花型号ID
+     * @return 影响行数
+     */
+    int deleteOemByIds(Long[] oemId);
+
+    /**
+     * 根据花型号Ids查询底布列表
+     * @return 底布列表
+     */
+
+    List<Oem> selectOemList(Long[] oemIds);
 
-    int deleteOemById(int oemId);
+    /**
+     * 根据花型号IDs查询花型号列表
+     * @return 底布列表
+     */
+    List<Oem> selectList();
 }

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

@@ -0,0 +1,15 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.bo.ShaoHuaBo;
+
+/**
+ * 烧花Service接口
+ */
+public interface ShaoHuaService {
+    /**
+     * 修改烧花单价
+     * @param shaoHuaBo ShaoHuaBo对象
+     * @return 结果
+     */
+    int updateShaoHua(ShaoHuaBo shaoHuaBo);
+}

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

@@ -0,0 +1,41 @@
+package org.dromara.commodityManagement.service;
+
+import org.dromara.commodityManagement.domain.bo.TemplateBo;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 版图Service接口
+ */
+public interface TemplateService {
+    /**
+     * 分页查询版图管理
+     * @param TemplateBo 版图BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<TemplateVo> selectPageTemplateList(TemplateBo TemplateBo, PageQuery pageQuery);
+
+    /**
+     * 新增版图
+     * @param TemplateBo 版图BO对象
+     * @return 影响行数
+     */
+    int insertTemplate(TemplateBo TemplateBo);
+
+    /**
+     * 修改版图
+     * @param TemplateBo 版图BO对象
+     * @return 影响行数
+     */
+    int updateTemplate(TemplateBo TemplateBo);
+
+    /**
+     * 删除版图
+     * @param TemplateId 版图ID
+     * @return 影响行数
+     */
+    int deleteTemplateById(Long[] TemplateId);
+
+}

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

@@ -13,9 +13,11 @@ 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.common.satoken.utils.LoginHelper;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 品牌服务实现
@@ -82,18 +84,47 @@ public class BrandServiceImpl implements BrandService {
         return brandMapper.deleteByIds(Arrays.asList(brandIds));
     }
 
+    /**
+     * 根据品牌ID查询品牌
+     * @param brandIds BrandID列表
+     * @return Brand列表
+     */
+    @Override
+    public List<Brand> selectBrandListByIds(Long[] brandIds) {
+        return selectBrandsByIdOrChooseAll(brandIds);
+    }
+
+    /**
+     * 查询品牌列表
+     * @return Brand列表
+     */
+    @Override
+    public List<Brand> selectBrandList() {
+        return selectBrandsByIdOrChooseAll(null);
+    }
+
     /**
      * 保存前校验
      * @param entity Brand实体对象
      */
     private void validEntityBeforeSave(Brand entity) {
-        if (!StringUtils.isNotEmpty(entity.getName())) {
-            throw new ServiceException("名称不能为空！");
-        } else if (!StringUtils.isNoneBlank(entity.getType())) {
-            throw new ServiceException("类型不能为空！");
-        } else if (!(entity.getType().equals("1") || entity.getType().equals("2"))) {
+        if (!(entity.getType().equals("1") || entity.getType().equals("2"))) {
             throw new ServiceException("类型错误！");
         }
     }
 
+    /**
+     * 根据是否传入品牌ID列表查询品牌
+     * @param brandIds BrandID列表
+     * @return Brand列表
+     */
+    private List<Brand> selectBrandsByIdOrChooseAll(Long[] brandIds){
+        QueryWrapper<Brand> qw = new QueryWrapper<>();
+        qw.eq("type",2);
+        if (brandIds != null) {
+            qw.in("id",Arrays.asList(brandIds));
+        }
+        return MapstructUtils.convert(brandMapper.selectVoList(qw), Brand.class);
+    }
+
 }

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

@@ -0,0 +1,101 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.Craft;
+import org.dromara.commodityManagement.domain.bo.CraftBo;
+import org.dromara.commodityManagement.domain.vo.CraftVo;
+import org.dromara.commodityManagement.mapper.CraftMapper;
+import org.dromara.commodityManagement.service.CraftService;
+import org.dromara.common.core.exception.ServiceException;
+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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Service
+public class CraftServiceImpl implements CraftService {
+    private final CraftMapper craftMapper;
+
+    /**
+     * 查询工艺对象分页查询工艺数据
+     *
+     * @param craftBo   工艺Bo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @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());
+        Page<CraftVo> page = craftMapper.selectVoPage(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增工艺
+     *
+     * @param craftBo CraftBo对象
+     * @return 结果
+     */
+    @Override
+    public int insertCraft(CraftBo craftBo) {
+        Craft craft = MapstructUtils.convert(craftBo, Craft.class);
+        validEntityBeforeSave(craft);
+        return craftMapper.insert(craft);
+    }
+
+    /**
+     * 修改工艺
+     *
+     * @param craftBo CraftBo对象
+     * @return 结果
+     */
+    @Override
+    public int updateCraft(CraftBo craftBo) {
+        Craft craft = MapstructUtils.convert(craftBo, Craft.class);
+        validEntityBeforeSave(craft);
+        QueryWrapper<Craft> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", craft.getId());
+        return craftMapper.updateById(craft);
+    }
+
+    /**
+     * 批量删除工艺
+     *
+     * @param craftIds CraftIds
+     * @return 结果
+     */
+    @Override
+    public int deleteCraftByIds(Long[] craftIds) {
+        return craftMapper.deleteByIds(Arrays.asList(craftIds));
+    }
+
+    @Override
+    public List<Craft> selectCraftList() {
+        return craftMapper.selectList();
+    }
+
+    @Override
+    public List<Craft> selectCraftListByIds(Long[] craftIds) {
+        return MapstructUtils.convert(craftMapper.selectByIds(Arrays.asList(craftIds)), Craft.class);
+    }
+
+    /**
+     * 保存前检验
+     *
+     * @param entity 实体对象
+     */
+    private void validEntityBeforeSave(Craft entity) {
+        if (!StringUtils.isNotEmpty(entity.getGoodsTypeExtendName())) {
+            throw new ServiceException("名称不能为空！");
+        }
+    }
+}
+

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

@@ -0,0 +1,74 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.DaHuoNumber;
+import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
+import org.dromara.commodityManagement.domain.vo.DaHuoNumberVo;
+import org.dromara.commodityManagement.mapper.DaHuoNumberMapper;
+import org.dromara.commodityManagement.mapper.TemplateMapper;
+import org.dromara.commodityManagement.service.DaHuoNumberService;
+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.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class DaHuoNumberImpl implements DaHuoNumberService {
+
+    private final DaHuoNumberMapper daHuoNumberMapper;
+    private final TemplateMapper templateMapper;
+
+    private static final String DAHUO_TYPE = "1";
+
+    @Override
+    public TableDataInfo<DaHuoNumberVo> selectPageDaHuoNumberList(DaHuoNumberBo daHuoNumberBo, PageQuery pageQuery) {
+        QueryWrapper<DaHuoNumber> qw = new QueryWrapper<>();
+        qw.eq("type", DAHUO_TYPE);
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getName()), "name", daHuoNumberBo.getName());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getKuanhao()), "kuanhao", daHuoNumberBo.getKuanhao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getHuaxinghao()), "huaxinghao", daHuoNumberBo.getHuaxinghao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getCustomer_name()), "customer_name", daHuoNumberBo.getCustomer_name());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getDibu()), "dibu", daHuoNumberBo.getDibu());
+        Page<DaHuoNumberVo> page = daHuoNumberMapper.selectVoPageWithTemplate(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public int insertDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
+        DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
+        if (daHuoNumber.getTemplate() != null) {
+            templateMapper.insert(daHuoNumber.getTemplate());
+        }
+        return daHuoNumberMapper.insert(daHuoNumber);
+    }
+
+    @Override
+    public int updateDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
+        DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
+        QueryWrapper<DaHuoNumber> qw = new QueryWrapper<>();
+        qw.eq("id", daHuoNumber.getId());
+        return daHuoNumberMapper.update(daHuoNumber, qw);
+    }
+
+    @Override
+    public int deleteDaHuoNumberByIds(Long[] daHuoNumberIds) {
+        return daHuoNumberMapper.deleteByIds(Arrays.asList(daHuoNumberIds));
+    }
+
+    @Override
+    public List<DaHuoNumber> selectDaHuoNumberListByIds(Long[] daHuoNumberIds) {
+        return MapstructUtils.convert(daHuoNumberMapper.selectVoByIds(Arrays.asList(daHuoNumberIds)), DaHuoNumber.class);
+    }
+
+    @Override
+    public List<DaHuoNumber> selectDaHuoNumberList() {
+        return daHuoNumberMapper.selectList();
+    }
+}

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

@@ -0,0 +1,90 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.DiBu;
+import org.dromara.commodityManagement.domain.bo.DiBuBo;
+import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.commodityManagement.mapper.DiBuMapper;
+import org.dromara.commodityManagement.service.DiBuService;
+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.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 底布管理服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class DiBuServiceImpl implements DiBuService {
+
+    private final DiBuMapper diBuMapper;
+
+    /**
+     * 根据底布对象查询底布数据
+     * @param diBuBo 底布BO对象
+     * @param pageQuery 分页参数
+     * @return
+     */
+    @Override
+    public TableDataInfo<DiBuVo> selectPageDiBuList(DiBuBo diBuBo, PageQuery pageQuery) {
+        QueryWrapper<DiBu> qw = new QueryWrapper<>();
+        qw.eq(StringUtils.isNotBlank(diBuBo.getName()), "name", diBuBo.getName());
+        Page<DiBuVo> page = diBuMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增底布
+     * @param diBuBo 底布BO对象
+     * @return 影响行数
+     */
+    @Override
+    public int insertDiBu(DiBuBo diBuBo) {
+        DiBu diBu = MapstructUtils.convert(diBuBo, DiBu.class);
+        return diBuMapper.insert(diBu);
+    }
+
+    /**
+     * 修改底布
+     * @param diBuBo 底布BO对象
+     * @return 影响行数
+     */
+    @Override
+    public int updateDiBu(DiBuBo diBuBo) {
+        DiBu diBu = MapstructUtils.convert(diBuBo, DiBu.class);
+        QueryWrapper<DiBu> qw  = new QueryWrapper<>();
+        qw.eq("id", diBu.getId());
+        return diBuMapper.update(diBu,qw);
+    }
+
+    /**
+     * 根据底布ID删除底布
+     * @param diBuId 底布ID
+     * @return 影响行数
+     */
+    @Override
+    public int deleteDiBuById(Long[] diBuId) {
+        return diBuMapper.deleteByIds(Arrays.asList(diBuId));
+    }
+
+    /**
+     * 查询底布列表
+     * @return 底布列表
+     */
+    @Override
+    public List<DiBu> selectDiBuListByIds(Long[] diBuIds) {
+        return MapstructUtils.convert(diBuMapper.selectVoByIds(Arrays.asList(diBuIds)), DiBu.class);
+    }
+
+    @Override
+    public List<DiBu> selectDiBuList() {
+        return diBuMapper.selectList();
+    }
+}

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

@@ -15,29 +15,44 @@ 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;
+
 @RequiredArgsConstructor
 @Service
-public class OemSeviceImpl implements OemService {
+public class OemServiceImpl implements OemService {
     private final OemMapper oemMapper;
     /**
-     * 查询花型号列表
-     * @param oem 花型号Bo对象
+     * 查询花型号对象分页查询花型号数据
+     * @param oemBo 花型号Bo对象
      * @param pageQuery 查询条件
      * @return 分页结果
      */
     @Override
-    public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
+    public TableDataInfo<OemVo> selectPageOemList(OemBo oemBo, PageQuery pageQuery) {
         QueryWrapper<Oem> lqw =new QueryWrapper<>();
-        lqw.eq(StringUtils.isNotBlank(oem.getName()), "name", oem.getName());
+        lqw.eq(StringUtils.isNotBlank(oemBo.getName()), "name", oemBo.getName());
         Page<OemVo> page = oemMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 新增花型号
+     * @param oemBo OemBo对象
+     * @return 结果
+     */
     @Override
     public int insertOem(OemBo oemBo) {
         Oem oem = MapstructUtils.convert(oemBo, Oem.class);
         validEntityBeforeSave(oem);
         return oemMapper.insert(oem);
     }
+
+    /**
+     * 修改花型号
+     * @param oemBo OemBo对象
+     * @return 结果
+     */
     @Override
     public int updateOem(OemBo oemBo) {
         Oem oem = MapstructUtils.convert(oemBo, Oem.class);
@@ -46,10 +61,27 @@ public class OemSeviceImpl implements OemService {
         lqw.eq("id", oem.getId());
         return oemMapper.updateById(oem);
     }
+
+    /**
+     * 批量删除品牌
+     * @param oemIds OemIds
+     * @return 结果
+     */
+    @Override
+    public int deleteOemByIds(Long[] oemIds) {
+        return oemMapper.deleteByIds(Arrays.asList(oemIds));
+    }
+
     @Override
-    public int deleteOemById(int oemId) {
-        return oemMapper.deleteById(oemId);
+    public List<Oem> selectOemList(Long[] oemIds) {
+        return MapstructUtils.convert(oemMapper.selectVoByIds(Arrays.asList(oemIds)), Oem.class);
     }
+
+    @Override
+    public List<Oem> selectList() {
+        return oemMapper.selectList();
+    }
+
     /**
      * 保存前检验
      * @param entity 实体对象
@@ -57,8 +89,6 @@ public class OemSeviceImpl implements OemService {
     private void validEntityBeforeSave(Oem entity) {
         if(!StringUtils.isNotEmpty(entity.getName())){
             throw new ServiceException("名称不能为空！");
-        } else if (!StringUtils.isNotBlank(entity.getImage())) {
-            throw new ServiceException("图片不能为空！");
         }
     }
 }

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

@@ -0,0 +1,28 @@
+package org.dromara.commodityManagement.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.ShaoHua;
+import org.dromara.commodityManagement.domain.bo.ShaoHuaBo;
+import org.dromara.commodityManagement.mapper.ShaoHuaMapper;
+import org.dromara.commodityManagement.service.ShaoHuaService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+public class ShaoHuaServiceImpl implements ShaoHuaService {
+    private final ShaoHuaMapper shaoHuaMapper;
+
+    /**
+     * 修改烧花单价
+     * @param shaoHuaBo ShaoHuaBo对象
+     * @return 结果
+     */
+    @Override
+    public int updateShaoHua(ShaoHuaBo shaoHuaBo) {
+        ShaoHua shaoHua = MapstructUtils.convert(shaoHuaBo, ShaoHua.class);
+//        QueryWrapper<ShaoHua> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("id", shaoHua.getId());
+        return shaoHuaMapper.updateById(shaoHua);
+    }
+}

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

@@ -0,0 +1,73 @@
+package org.dromara.commodityManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.commodityManagement.domain.Template;
+import org.dromara.commodityManagement.domain.bo.TemplateBo;
+import org.dromara.commodityManagement.domain.vo.TemplateVo;
+import org.dromara.commodityManagement.mapper.TemplateMapper;
+import org.dromara.commodityManagement.service.TemplateService;
+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;
+
+/**
+ * 版图服务实现
+ */
+@Service
+@RequiredArgsConstructor
+public class TemplateServiceImpl implements TemplateService {
+
+    private final TemplateMapper TemplateMapper;
+
+    /**
+     * 根据Template对象分页查询品牌数据
+     * @param TemplateBo TemplateBo对象
+     * @param pageQuery 查询条件
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<TemplateVo> selectPageTemplateList(TemplateBo TemplateBo,PageQuery pageQuery) {
+        QueryWrapper<Template> qw = new QueryWrapper<>();
+        Page<TemplateVo> page = TemplateMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增品牌
+     * @param TemplateBo TemplateBo对象
+     * @return 结果
+     */
+    @Override
+    public int insertTemplate(TemplateBo TemplateBo) {
+        Template Template = MapstructUtils.convert(TemplateBo, Template.class);
+        return TemplateMapper.insert(Template);
+    }
+
+    /**
+     * 修改品牌
+     * @param TemplateBo TemplateBo对象
+     * @return 结果
+     */
+    @Override
+    public int updateTemplate(TemplateBo TemplateBo) {
+        Template Template = MapstructUtils.convert(TemplateBo, Template.class);
+        QueryWrapper<Template> qw = new QueryWrapper<>();
+        qw.eq("id", Template.getId());
+        return TemplateMapper.update(Template,qw);
+    }
+
+    /**
+     * 批量删除品牌
+     * @param TemplateIds TemplateIds
+     * @return 结果
+     */
+    @Override
+    public int deleteTemplateById(Long[] TemplateIds) {
+        return TemplateMapper.deleteByIds(Arrays.asList(TemplateIds));
+    }
+}

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

ruoyi-modules/ruoyi-commodityManagement/src/main/resources/mapper/DaHuoNumberMapper.xml

@@ -0,0 +1,52 @@
+<?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.commodityManagement.mapper.DaHuoNumberMapper">
+
+    <resultMap id="DaHuoNumberResultMap" type="org.dromara.commodityManagement.domain.vo.DaHuoNumberVo">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="kuanhao" column="kuanhao"/>
+        <result property="huaxinghao" column="huaxinghao"/>
+        <result property="dibu" column="dibu"/>
+        <result property="dibu_price" column="dibu_price"/>
+        <result property="customer_name" column="customer_name"/>
+        <result property="machine" column="machine"/>
+        <collection property="template" ofType="org.dromara.commodityManagement.domain.Template">
+            <id property="id" column="template_id"/>
+            <result property="item_id" column="item_id"/>
+            <result property="name" column="template_name"/>
+            <result property="image" column="template_image"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectVoPageWithTemplate" resultMap="DaHuoNumberResultMap">
+        SELECT
+        dh.id,
+        dh.name,
+        dh.type,
+        dh.kuanhao,
+        dh.huaxinghao,
+        dh.dibu,
+        dh.dibu_price,
+        dh.customer_name,
+        dh.machine,
+        t.id AS template_id,
+        t.name AS template_name,
+        t.image AS template_image
+        FROM
+        fa_kuyou_item_name dh
+        LEFT JOIN
+        fa_kuyou_item_name_template t ON dh.id = t.item_id
+        WHERE
+        dh.type = #{ew.eq('type', '1')}
+        <if test="ew.getCustomSqlSegment() != null">
+            ${ew.getCustomSqlSegment()}
+        </if>
+        ORDER BY
+        dh.id
+    </select>
+
+</mapper>

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

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

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