Merge branch 'develop' into release

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

@@ -0,0 +1,4 @@
+package org.dromara.bulk.controller;
+
+public class BulkOrderListController {
+}

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

@@ -0,0 +1,255 @@
+package org.dromara.bulk.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_plan_info")
+public class BulkOrderList extends TenantEntity {
+
+    /**
+    * id
+    */
+    private Long id;
+
+    /**
+    * 系统单号
+    */
+
+    private String sysNo;
+
+    /**
+    * 生产单号
+    */
+    private String scNo;
+
+    /**
+    * 用户id
+    */
+    private Long userId;
+
+    /**
+    * 计划ID
+    */
+    private Long planId;
+
+    /**
+    * 商品ID
+    */
+    private Long goodsId;
+
+    /**
+    * 商品编号
+    */
+    private String goodsCode;
+
+    /**
+    * 商品名称
+    */
+    private String goodsName;
+
+    /**
+    * 商品规格型号
+    */
+    private String goodsNote;
+
+    /**
+    * 单位ID
+    */
+    private int unitId;
+
+    /**
+    * 默认单位
+    */
+    private Long defaultUnit;
+
+    /**
+    * 进价
+    */
+    private double purchase;
+
+    /**
+    * 数量
+    */
+    private double number;
+
+    /**
+    * 份数
+    */
+    private double fenNumber;
+
+    /**
+    * 基本数量
+    */
+    private double basicNmber;
+
+    /**
+    * 基本份数
+    */
+    private double basicFenNmber;
+
+    /**
+    * 金额
+    */
+    private double money;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 面料id
+    */
+    private String goodsTypeExtend1Id;
+
+    /**
+    * 面料的扩展信息
+    */
+    private String goodsTypeExtend1Attr;
+
+    /**
+    * 物料id
+    */
+    private String goodsTypeExtend2Id;
+
+    /**
+    * 物料的扩展信息
+    */
+    private String goodsTypeExtend2Attr;
+
+    /**
+    * 工艺类型id
+    */
+    private String goodsTypeExtend3Id;
+
+    /**
+    * 工艺类型的扩展信息
+    */
+    private String goodsTypeExtend3Attr;
+
+    /**
+    * 花型号id
+    */
+    private String goodsTypeExtend4Id;
+
+    /**
+    * 花型号的扩展信息
+    */
+    private String goodsTypeExtend4Attr;
+
+    /**
+    * 底布
+    */
+    private String baseCloth;
+
+    /**
+    * 底布单价
+    */
+    private double baseClothPrice;
+
+    /**
+    * 工艺单价
+    */
+    private double gongyiPrice;
+
+    /**
+    * 款号
+    */
+    private String itemNumber;
+
+    /**
+    * 克重
+    */
+    private String weight;
+
+    /**
+    * 门幅
+    */
+    private String menfu;
+
+    /**
+    * 机器
+    */
+    private String machine;
+
+    /**
+    * 品牌组
+    */
+    private String brandGroup;
+
+    /**
+    * 成衣厂
+    */
+    private String garmentFactory;
+
+    /**
+    * 成衣厂联系人
+    */
+    private String garmentFactoryPeople;
+
+    /**
+    * 成衣厂电话
+    */
+    private String garmentFactoryTel;
+
+    /**
+    * 收货地址
+    */
+    private String receivingAddress;
+
+    /**
+    * 当前消耗
+    */
+    private String currentTimeConsumption;
+
+    /**
+    * 下单码数
+    */
+    private String numberOrdersPlaced;
+
+    /**
+    * 下单时间
+    */
+    private String orderTime;
+
+    /**
+    * 交货日期
+    */
+    private String deliveryDate;
+    /**
+    * 目标日期
+    */
+    private String targetDate;
+    /**
+    * 订单id
+    */
+    private Long userOrderId;
+    /**
+    * 销货单id
+    */
+    private Long goodsSalesInfoId;
+    /**
+    * 下单码数类型
+    */
+    private String numberOrdersPlacedType;
+    /**
+    * 发货数量
+    */
+    private int shipNum;
+    /**
+    * 账单备注
+    */
+    private String billRemark;
+    /**
+    * 账单状态
+    */
+    private int duizhangStatus;
+
+}

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

@@ -0,0 +1,27 @@
+package org.dromara.bulk.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("fa_kuyou_goods")
+public class Goods extends TenantEntity {
+
+    private Long id;
+
+    @TableField("goods_code")
+    private String code;
+
+    @TableField("goods_name")
+    private String name;
+
+    @TableField("goods_specification_id")
+    private String specificationId;
+
+    @TableField("more_unit_id")
+    private int unit_id;
+}

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

@@ -0,0 +1,258 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+* 计划详情
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BulkOrderList.class, reverseConvertGenerate = false)
+public class BulkOrderListBo extends BaseEntity {
+
+    /**
+    * id
+    */
+    private Long id;
+
+    /**
+    * 系统单号
+    */
+    private String sysNo;
+
+    /**
+    * 生产单号
+    */
+    private String scNo;
+
+    /**
+    * 用户id
+    */
+    @NotBlank(message = "用户id不能为空")
+    private Long userId;
+
+    /**
+    * 计划ID
+    */
+    @NotBlank(message = "计划ID不能为空")
+    private Long planId;
+
+    /**
+    * 商品ID
+    */
+    private Long goodsId;
+
+    /**
+    * 商品编号
+    */
+    private String goodsCode;
+
+    /**
+    * 商品名称
+    */
+    private String goodsName;
+
+    /**
+    * 商品规格型号
+    */
+    private String goodsNote;
+
+    /**
+    * 单位ID
+    */
+    private int unitId;
+
+    /**
+    * 默认单位
+    */
+    private Long defaultUnit;
+
+    /**
+    * 进价
+    */
+    private double purchase;
+
+    /**
+    * 数量
+    */
+    private double number;
+
+    /**
+    * 份数
+    */
+    private double fenNumber;
+
+    /**
+    * 基本数量
+    */
+    private double basicNmber;
+
+    /**
+    * 基本份数
+    */
+    private double basicFenNmber;
+
+    /**
+    * 金额
+    */
+    private double money;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 面料id
+    */
+    private String goodsTypeExtend1Id;
+
+    /**
+    * 面料的扩展信息
+    */
+    private String goodsTypeExtend1Attr;
+
+    /**
+    * 物料id
+    */
+    private String goodsTypeExtend2Id;
+
+    /**
+    * 物料的扩展信息
+    */
+    private String goodsTypeExtend2Attr;
+
+    /**
+    * 工艺类型id
+    */
+    private String goodsTypeExtend3Id;
+
+    /**
+    * 工艺类型的扩展信息
+    */
+    private String goodsTypeExtend3Attr;
+
+    /**
+    * 花型号id
+    */
+    private String goodsTypeExtend4Id;
+
+    /**
+    * 花型号的扩展信息
+    */
+    private String goodsTypeExtend4Attr;
+
+    /**
+    * 底布
+    */
+    private String baseCloth;
+
+    /**
+    * 底布单价
+    */
+    private double baseClothPrice;
+
+    /**
+    * 工艺单价
+    */
+    private double gongyiPrice;
+
+    /**
+    * 款号
+    */
+    private String itemNumber;
+
+    /**
+    * 克重
+    */
+    private String weight;
+
+    /**
+    * 门幅
+    */
+    private String menfu;
+
+    /**
+    * 机器
+    */
+    private String machine;
+
+    /**
+    * 品牌组
+    */
+    private String brandGroup;
+
+    /**
+    * 成衣厂
+    */
+    private String garmentFactory;
+
+    /**
+    * 成衣厂联系人
+    */
+    private String garmentFactoryPeople;
+
+    /**
+    * 成衣厂电话
+    */
+    private String garmentFactoryTel;
+
+    /**
+    * 收货地址
+    */
+    private String receivingAddress;
+
+    /**
+    * 当前消耗
+    */
+    private String currentTimeConsumption;
+
+    /**
+    * 下单码数
+    */
+    private String numberOrdersPlaced;
+
+    /**
+    * 下单时间
+    */
+    private String orderTime;
+
+    /**
+    * 交货日期
+    */
+    private String deliveryDate;
+    /**
+    * 目标日期
+    */
+    private String targetDate;
+    /**
+    * 订单id
+    */
+    private Long userOrderId;
+    /**
+    * 销货单id
+    */
+    private Long goodsSalesInfoId;
+    /**
+    * 下单码数类型
+    */
+    private String numberOrdersPlacedType;
+    /**
+    * 发货数量
+    */
+    private int shipNum;
+    /**
+    * 账单备注
+    */
+    private String billRemark;
+    /**
+    * 账单状态
+    */
+    private int duizhangStatus;
+
+}

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

@@ -0,0 +1,23 @@
+package org.dromara.bulk.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.Goods;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Goods.class, reverseConvertGenerate = false)
+public class GoodsBo extends BaseEntity {
+
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private String specificationId;
+
+    private int unit_id;
+}

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

@@ -0,0 +1,256 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+* 计划详情
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = BulkOrderList.class)
+public class BulkOrderListVo extends BaseEntity {
+
+    /**
+    * id
+    */
+    private Long id;
+
+    /**
+    * 系统单号
+    */
+
+    private String sysNo;
+
+    /**
+    * 生产单号
+    */
+    private String scNo;
+
+    /**
+    * 用户id
+    */
+    private Long userId;
+
+    /**
+    * 计划ID
+    */
+    private Long planId;
+
+    /**
+    * 商品ID
+    */
+    private Long goodsId;
+
+    /**
+    * 商品编号
+    */
+    private String goodsCode;
+
+    /**
+    * 商品名称
+    */
+    private String goodsName;
+
+    /**
+    * 商品规格型号
+    */
+    private String goodsNote;
+
+    /**
+    * 单位ID
+    */
+    private int unitId;
+
+    /**
+    * 默认单位
+    */
+    private Long defaultUnit;
+
+    /**
+    * 进价
+    */
+    private double purchase;
+
+    /**
+    * 数量
+    */
+    private double number;
+
+    /**
+    * 份数
+    */
+    private double fenNumber;
+
+    /**
+    * 基本数量
+    */
+    private double basicNmber;
+
+    /**
+    * 基本份数
+    */
+    private double basicFenNmber;
+
+    /**
+    * 金额
+    */
+    private double money;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 面料id
+    */
+    private String goodsTypeExtend1Id;
+
+    /**
+    * 面料的扩展信息
+    */
+    private String goodsTypeExtend1Attr;
+
+    /**
+    * 物料id
+    */
+    private String goodsTypeExtend2Id;
+
+    /**
+    * 物料的扩展信息
+    */
+    private String goodsTypeExtend2Attr;
+
+    /**
+    * 工艺类型id
+    */
+    private String goodsTypeExtend3Id;
+
+    /**
+    * 工艺类型的扩展信息
+    */
+    private String goodsTypeExtend3Attr;
+
+    /**
+    * 花型号id
+    */
+    private String goodsTypeExtend4Id;
+
+    /**
+    * 花型号的扩展信息
+    */
+    private String goodsTypeExtend4Attr;
+
+    /**
+    * 底布
+    */
+    private String baseCloth;
+
+    /**
+    * 底布单价
+    */
+    private double baseClothPrice;
+
+    /**
+    * 工艺单价
+    */
+    private double gongyiPrice;
+
+    /**
+    * 款号
+    */
+    private String itemNumber;
+
+    /**
+    * 克重
+    */
+    private String weight;
+
+    /**
+    * 门幅
+    */
+    private String menfu;
+
+    /**
+    * 机器
+    */
+    private String machine;
+
+    /**
+    * 品牌组
+    */
+    private String brandGroup;
+
+    /**
+    * 成衣厂
+    */
+    private String garmentFactory;
+
+    /**
+    * 成衣厂联系人
+    */
+    private String garmentFactoryPeople;
+
+    /**
+    * 成衣厂电话
+    */
+    private String garmentFactoryTel;
+
+    /**
+    * 收货地址
+    */
+    private String receivingAddress;
+
+    /**
+    * 当前消耗
+    */
+    private String currentTimeConsumption;
+
+    /**
+    * 下单码数
+    */
+    private String numberOrdersPlaced;
+
+    /**
+    * 下单时间
+    */
+    private String orderTime;
+
+    /**
+    * 交货日期
+    */
+    private String deliveryDate;
+    /**
+    * 目标日期
+    */
+    private String targetDate;
+    /**
+    * 订单id
+    */
+    private Long userOrderId;
+    /**
+    * 销货单id
+    */
+    private Long goodsSalesInfoId;
+    /**
+    * 下单码数类型
+    */
+    private String numberOrdersPlacedType;
+    /**
+    * 发货数量
+    */
+    private int shipNum;
+    /**
+    * 账单备注
+    */
+    private String billRemark;
+    /**
+    * 账单状态
+    */
+    private int duizhangStatus;
+
+}

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

@@ -0,0 +1,23 @@
+package org.dromara.bulk.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.bulk.domain.Goods;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Goods.class)
+public class GoodsVo extends BaseEntity {
+
+    private Long id;
+
+    private String code;
+
+    private String name;
+
+    private String specificationId;
+
+    private int unit_id;
+}

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

@@ -0,0 +1,21 @@
+package org.dromara.bulk.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+* @author kgy
+* @description 针对表【fa_kuyou_plan_info(计划详情)】的数据库操作Mapper
+* @createDate 2025-03-13 15:57:15
+* @Entity org.dromara.bulk.domain.bulkOrderList
+*/
+@Mapper
+public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkOrderListVo> {
+
+}
+
+
+
+

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

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

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

@@ -0,0 +1,38 @@
+package org.dromara.bulk.service;
+
+
+import org.dromara.bulk.domain.bo.BulkOrderListBo;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+public interface BulkOrderListService {
+    /**
+     * 分页查询大货订单
+     * @param bulkOrderListBo 大货订单BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
+    TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery);
+
+    /**
+     * 新增大货订单
+     * @param bulkOrderListBo 大货订单BO对象
+     * @return 影响行数
+     */
+    int insertBulkOrder(BulkOrderListBo bulkOrderListBo);
+
+    /**
+     * 修改大货订单
+     * @param bulkOrderListBo 大货订单BO对象
+     * @return 影响行数
+     */
+    int updateBulkOrder(BulkOrderListBo bulkOrderListBo);
+
+    /**
+     * 删除大货订单
+     * @param bulkOrderListIds 大货订单ID
+     * @return 影响行数
+     */
+    int deleteBulkOrderById(Long[] bulkOrderListIds);
+}

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

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

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

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

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

@@ -0,0 +1,48 @@
+package org.dromara.bulk.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.bo.BulkOrderListBo;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.service.BulkOrderListService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@RequiredArgsConstructor
+public class BulkOrderListServiceImpl implements BulkOrderListService {
+
+    private final BulkOrderListMapper bulkOrderListMapper;
+
+    @Override
+    public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
+        QueryWrapper<BulkOrderList> qw = new QueryWrapper<>();
+        qw.eq(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
+        Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
+        return 0;
+    }
+
+    @Override
+    public int updateBulkOrder(BulkOrderListBo bulkOrderListBo) {
+        return 0;
+    }
+
+    @Override
+    public int deleteBulkOrderById(Long[] bulkOrderListIds) {
+        return 0;
+    }
+}
+
+
+
+

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

@@ -0,0 +1,43 @@
+package org.dromara.bulk.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.GoodsBo;
+import org.dromara.bulk.domain.vo.GoodsVo;
+import org.dromara.bulk.mapper.GoodsMapper;
+import org.dromara.bulk.service.GoodsService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class GoodsServiceImpl implements GoodsService {
+
+    private final GoodsMapper goodsMapper;
+    @Override
+    public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
+        return null;
+    }
+
+    @Override
+    public int insertGoods(GoodsBo goodsBo) {
+        return 0;
+    }
+
+    @Override
+    public int updateGoods(GoodsBo goodsBo) {
+        return 0;
+    }
+
+    @Override
+    public int deleteGoodsById(Long[] goodsIds) {
+        return 0;
+    }
+
+    @Override
+    public List<GoodsVo> selectGoodsList() {
+        return goodsMapper.selectVoList();
+    }
+}

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.bulk.mapper.BulkOrderListMapper">
+</mapper>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.bulk.mapper.GoodsMapper">
+</mapper>

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

@@ -15,7 +15,17 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface DaHuoNumberMapper extends BaseMapperPlus<DaHuoNumber, DaHuoNumberVo> {
+    /**
+     * 分页查询大货管理和版图
+     * @param page 分页对象
+     * @param wrapper 查询条件
+     * @return 分页结果
+     */
     Page<DaHuoNumberVo> selectVoPageWithTemplate(IPage<DaHuoNumberVo> page,@Param(Constants.WRAPPER) Wrapper<DaHuoNumber> wrapper);
 
+    /**
+     * 查询最新一条的大货id
+     * @return 大货id
+     */
     Long selectLastId();
 }

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

@@ -10,6 +10,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 import java.util.List;
 
+/**
+ * 大货编号管理服务
+ */
 public interface DaHuoNumberService {
     /**
      * 分页查询大货编号管理
@@ -52,5 +55,9 @@ public interface DaHuoNumberService {
      */
     List<DaHuoNumber> selectDaHuoNumberList();
 
-    int insertImportExcel(ExcelResult<DaHuoNumberImportVo> importVo);
+    /**
+     * 导入大货编号
+     * @param importVo 导入的大货编号对象
+     */
+    void insertImportExcel(ExcelResult<DaHuoNumberImportVo> importVo);
 }

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

@@ -24,6 +24,9 @@ import java.util.List;
 
 import static org.dromara.commodityManagement.emum.ItemType.DAHUO_TYPE;
 
+/**
+ * 大货编号业务实现
+ */
 @Service
 @RequiredArgsConstructor
 public class DaHuoNumberImpl implements DaHuoNumberService {
@@ -31,6 +34,12 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
     private final DaHuoNumberMapper daHuoNumberMapper;
     private final TemplateMapper templateMapper;
 
+    /**
+     * 查询大货编号列表
+     * @param daHuoNumberBo 大货编号BO对象
+     * @param pageQuery 分页参数
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<DaHuoNumberVo> selectPageDaHuoNumberList(DaHuoNumberBo daHuoNumberBo, PageQuery pageQuery) {
         QueryWrapper<DaHuoNumber> qw = new QueryWrapper<>();
@@ -44,6 +53,11 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 新增大货编号
+     * @param daHuoNumberBo 大货编号BO对象
+     * @return 插入数量
+     */
     @Override
     public int insertDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
         DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
@@ -59,6 +73,11 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         return allRow;
     }
 
+    /**
+     * 修改大货编号
+     * @param daHuoNumberBo 大货编号BO对象
+     * @return 更新数量
+     */
     @Override
     public int updateDaHuoNumber(DaHuoNumberBo daHuoNumberBo) {
         DaHuoNumber daHuoNumber = MapstructUtils.convert(daHuoNumberBo, DaHuoNumber.class);
@@ -77,6 +96,11 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         return daHuoNumberMapper.updateById(daHuoNumber);
     }
 
+    /**
+     * 删除大货编号
+     * @param daHuoNumberIds 大货编号ID
+     * @return 删除数量
+     */
     @Override
     public int deleteDaHuoNumberByIds(Long[] daHuoNumberIds) {
         for (Long daHuoNumberId : daHuoNumberIds) {
@@ -85,18 +109,31 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
         return daHuoNumberMapper.deleteByIds(Arrays.asList(daHuoNumberIds));
     }
 
+    /**
+     * 根据ID查询大货编号
+     * @param daHuoNumberIds 大货编号ID
+     * @return 大货编号基类
+     */
     @Override
     public List<DaHuoNumber> selectDaHuoNumberListByIds(Long[] daHuoNumberIds) {
         return MapstructUtils.convert(daHuoNumberMapper.selectVoByIds(Arrays.asList(daHuoNumberIds)), DaHuoNumber.class);
     }
 
+    /**
+     * 查询大货编号列表
+     * @return 大货编号列表
+     */
     @Override
     public List<DaHuoNumber> selectDaHuoNumberList() {
         return daHuoNumberMapper.selectList();
     }
 
+    /**
+     * 处理导入的Excel数据
+     * @param result Excel数据
+     */
     @Override
-    public int insertImportExcel(ExcelResult<DaHuoNumberImportVo> result){
+    public void insertImportExcel(ExcelResult<DaHuoNumberImportVo> result){
         for (DaHuoNumberImportVo importVo : result.getList()){
             String[] templateNames = importVo.getTemplate().split(",");
             List<Template> templates = new ArrayList<>();
@@ -109,6 +146,5 @@ public class DaHuoNumberImpl implements DaHuoNumberService {
             }
             insertDaHuoNumber(daHuoNumber);
         }
-        return 1;
     }
 }