From 2698f98834375c3f872cf5c8ffef6ff74d48292a Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 6 Aug 2025 16:04:54 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A1=A3=E5=8F=A3=E5=90=84=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/constant/Constants.java | 23 +++++++++++++- .../impl/StoreCertificateServiceImpl.java | 31 ++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 4b5051f25..5eaf7d624 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -221,7 +221,28 @@ public class Constants public static final String EXPRESS_REGION_LIST_CACHE_KEY = "EXPRESS_REGION_LIST"; public static final String EXPRESS_REGION_TREE_CACHE_KEY = "EXPRESS_REGION_TREE"; - // 上市季节年份 + // 销售出库 + public static final String VOUCHER_SEQ_STORE_SALE_PREFIX = "SD"; + // 销售出库类型 + public static final String VOUCHER_SEQ_STORE_SALE_TYPE = "STORE_SALE"; + // 采购入库 + public static final String VOUCHER_SEQ_STORAGE_PREFIX = "RK"; + // 采购入库类型 + public static final String VOUCHER_SEQ_STORAGE_TYPE = "STORAGE"; + // 需求单 + public static final String VOUCHER_SEQ_DEMAND_PREFIX = "XQ"; + // 需求单类型 + public static final String VOUCHER_SEQ_DEMAND_TYPE = "DEMAND"; + // 代发订单 + public static final String VOUCHER_SEQ_STORE_ORDER_PREFIX = "DF"; + // 代发订单类型 + public static final String VOUCHER_SEQ_STORE_ORDER_TYPE = "STORE_ORDER"; + // %04d + public static final String VOUCHER_SEQ_FORMAT = "%04d"; + + /** + * 上市季节年份 + */ public static final String RELEASE_YEAR_SEASON = "release_year_season"; /** * ES 索引 product_info diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 3aaf94d81..5c0e752fb 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -8,11 +8,13 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.model.ESystemRole; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.xkt.domain.Store; import com.ruoyi.xkt.domain.StoreCertificate; import com.ruoyi.xkt.domain.SysFile; +import com.ruoyi.xkt.domain.VoucherSequence; import com.ruoyi.xkt.dto.storeCertificate.StoreCertDTO; import com.ruoyi.xkt.dto.storeCertificate.StoreCertResDTO; import com.ruoyi.xkt.dto.storeCertificate.StoreCertStepResDTO; @@ -53,6 +55,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { final StoreProductMapper storeProdMapper; final DailySaleProductMapper dailySaleProdMapper; final ISysUserService userService; + final VoucherSequenceMapper vsMapper; /** * 新增档口认证 @@ -69,9 +72,22 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { .setStoreId(store.getId()); // 新增档口认证的文件列表 this.handleStoreCertFileList(certDTO, storeCert); - return this.storeCertMapper.insert(storeCert); + int count = this.storeCertMapper.insert(storeCert); + // 新增档口的单据编号初始化 销售出库、采购入库、需求单、订单 + List vsList = new ArrayList<>(); + // 销售出库 + vsList.add(this.initVoucherSequence(store.getId(), Constants.VOUCHER_SEQ_STORE_SALE_TYPE, Constants.VOUCHER_SEQ_STORE_SALE_PREFIX)); + // 采购入库 + vsList.add(this.initVoucherSequence(store.getId(), Constants.VOUCHER_SEQ_STORAGE_TYPE, Constants.VOUCHER_SEQ_STORAGE_PREFIX)); + // 需求单 + vsList.add(this.initVoucherSequence(store.getId(), Constants.VOUCHER_SEQ_DEMAND_TYPE, Constants.VOUCHER_SEQ_DEMAND_PREFIX)); + // 代发订单 + vsList.add(this.initVoucherSequence(store.getId(), Constants.VOUCHER_SEQ_STORE_ORDER_TYPE, Constants.VOUCHER_SEQ_STORE_ORDER_PREFIX)); + this.vsMapper.insert(vsList); + return count; } + /** * 根据档口ID获取档口详情信息 * @@ -229,5 +245,18 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { this.storeMapper.updateById(store); } + /** + * 初始化各类单据情况 + * + * @param storeId 档口ID + * @param type 类型 + * @param prefix 前缀 + * @return + */ + private VoucherSequence initVoucherSequence(Long storeId, String type, String prefix) { + return new VoucherSequence().setStoreId(storeId).setType(type).setDateFormat(DateUtils.YYYY_MM_DD) + .setPrefix(prefix).setNextSequence(1).setSequenceFormat(Constants.VOUCHER_SEQ_FORMAT); + } + }