修改耗材代码生成规则

This commit is contained in:
韩鹏辉
2024-07-12 09:01:33 +08:00
parent b6df6fd74d
commit 5226b1719a
3 changed files with 210 additions and 12 deletions

View File

@@ -18,10 +18,7 @@ import cn.ysk.cashier.repository.product.TbProductStockOperateRepository;
import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
import cn.ysk.cashier.repository.shop.TbShopPurveyorRepository;
import cn.ysk.cashier.repository.shop.TbShopPurveyorTransactRepository;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.PageUtil;
import cn.ysk.cashier.utils.QueryHelp;
import cn.ysk.cashier.utils.ValidationUtil;
import cn.ysk.cashier.utils.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -44,6 +41,8 @@ import java.math.RoundingMode;
import java.sql.Timestamp;
import java.util.*;
import static cn.ysk.cashier.utils.StringCodeUtil.TYPE.LETTER_CAPITAL_NUMBER;
/**
* @author admin
* @website https://eladmin.vip
@@ -115,7 +114,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
// }
resources.setConCode(UUID.randomUUID().toString());
resources.setConCode(StringCodeUtil.getRandom(8,LETTER_CAPITAL_NUMBER));
resources.setConTypeName(tbConsType.getConTypeName());
resources.setLasterInStock(BigDecimal.ZERO);
resources.setStockNumber(BigDecimal.ZERO);
@@ -391,7 +390,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
TbConsInfo consInfo = tbConsInfoRepository.findByConCode(cell0.toString());
if (ObjectUtil.isEmpty(consInfo) || ObjectUtil.isNull(consInfo)) {
consInfo = new TbConsInfo();
consInfo.setConCode(UUID.randomUUID().toString());
consInfo.setConCode(StringCodeUtil.getRandom(8,LETTER_CAPITAL_NUMBER));
consInfo.setShopId(Integer.valueOf(shopId));
consInfo.setConTypeId(tbConsType.getId());
consInfo.setConTypeName(tbConsType.getConTypeName());
@@ -447,7 +446,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
}
} else {
TbConsInfo consInfo = new TbConsInfo();
consInfo.setConCode(UUID.randomUUID().toString());
consInfo.setConCode(StringCodeUtil.getRandom(8,LETTER_CAPITAL_NUMBER));
consInfo.setShopId(Integer.valueOf(shopId));
consInfo.setConTypeId(tbConsType.getId());
consInfo.setConTypeName(tbConsType.getConTypeName());

View File

@@ -3,10 +3,7 @@ package cn.ysk.cashier.cons.service.impl;
import cn.ysk.cashier.cons.domain.TbConsInfo;
import cn.ysk.cashier.cons.domain.TbConsType;
import cn.ysk.cashier.cons.repository.TbConsInfoRepository;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.PageUtil;
import cn.ysk.cashier.utils.QueryHelp;
import cn.ysk.cashier.utils.ValidationUtil;
import cn.ysk.cashier.utils.*;
import lombok.RequiredArgsConstructor;
import cn.ysk.cashier.cons.repository.TbConsTypeRepository;
import cn.ysk.cashier.cons.service.TbConsTypeService;
@@ -22,6 +19,8 @@ import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import static cn.ysk.cashier.utils.StringCodeUtil.TYPE.LETTER_CAPITAL_NUMBER;
/**
* @website https://eladmin.vip
* @description 服务实现
@@ -61,7 +60,7 @@ public class TbConsTypeServiceImpl implements TbConsTypeService {
public TbConsTypeDto create(TbConsType resources) throws Exception {
resources.setConTypeCode(UUID.randomUUID().toString());
resources.setConTypeCode(StringCodeUtil.getRandom(8,LETTER_CAPITAL_NUMBER));
return tbConsTypeMapper.toDto(tbConsTypeRepository.save(resources));
}