feat:新增大货编号管理

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

@@ -0,0 +1,13 @@
+package org.dromara.commodityManagement.mapper;
+
+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> {
+}

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/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/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/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()), "name", daHuoNumberBo.getKuanhao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getHuaxinghao()), "name", daHuoNumberBo.getHuaxinghao());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getCustomer_name()), "name", daHuoNumberBo.getCustomer_name());
+        qw.eq(StringUtils.isNotBlank(daHuoNumberBo.getDibu()), "name", daHuoNumberBo.getDibu());
+        Page<DaHuoNumberVo> page = daHuoNumberMapper.selectVoPage(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/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/DaHuoNumberMapper.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.DaHuoNumberMapper">
+
+</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>