linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add bit sample product metadata

Browse Source
besure_bit
ck-chenkang 3 weeks ago
parent 5987645a86
commit fd654978e0
10 changed files with 227 additions and 4 deletions
Show Stats Download Patch File Download Diff File

22
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
Unescape Escape View File

@ -116,6 +116,28 @@ public class ErpProductController {
public CommonResult<PageResult<ErpProductRespVO>> getProductPage(@Valid ErpProductPageReqVO pageReqVO) {
return success(productService.getProductVOPage(pageReqVO));
}
@GetMapping("/sample-page")
@Operation(summary = "获得 BIT 样品分页")
@PreAuthorize("@ss.hasPermission('erp:bit-wms-sample:query')")
public CommonResult<PageResult<ErpProductRespVO>> getSamplePage(@Valid ErpProductPageReqVO pageReqVO) {
pageReqVO.setIsSample(true);
pageReqVO.setBizUnit("BIT");
return success(productService.getProductVOPage(pageReqVO));
}
@GetMapping("/sample-simple-list")
@Operation(summary = "获得 BIT 样品精简列表")
@PreAuthorize("@ss.hasPermission('erp:bit-wms-sample:query')")
public CommonResult<List<ErpProductRespVO>> getSampleSimpleList(
@RequestParam(name = "categoryType", required = false) Integer categoryType) {
ErpProductListReqVO reqVO = new ErpProductListReqVO();
reqVO.setIsSample(true);
reqVO.setBizUnit("BIT");
reqVO.setCategoryType(categoryType);
return success(productService.getProductVOList(reqVO));
}
@GetMapping("/simple-list-all")
@Operation(summary = "获得所有精简列表", description = "只包含被开启的产品，主要用于前端的下拉选项")
public CommonResult<List<ErpProductRespVO>> getAllSimpleList(@RequestParam(name = "categoryId", required = false) Integer categoryId) {

15
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductListReqVO.java
Unescape Escape View File

@ -24,6 +24,21 @@ public class ErpProductListReqVO {
@Schema(description = "产品规格", example = "红色")
private String standard;
@Schema(description = "是否样品", example = "true")
private Boolean isSample;
@Schema(description = "样品分类", example = "CUSTOMER_SAMPLE")
private String sampleCategory;
@Schema(description = "所属事业部", example = "BIT")
private String bizUnit;
@Schema(description = "客户ID", example = "1001")
private Long customerId;
@Schema(description = "客户名称", example = "ACME HK")
private String customerName;
@Schema(description = "产品 id 集合")
private List<Long> ids;
}

15
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java
Unescape Escape View File

@ -33,6 +33,21 @@ public class ErpProductPageReqVO extends PageParam {
@Schema(description = "产品编码", example = "P-001")
private String barCode;
@Schema(description = "是否样品", example = "true")
private Boolean isSample;
@Schema(description = "样品分类", example = "CUSTOMER_SAMPLE")
private String sampleCategory;
@Schema(description = "所属事业部", example = "BIT")
private String bizUnit;
@Schema(description = "客户ID", example = "1001")
private Long customerId;
@Schema(description = "客户名称", example = "ACME HK")
private String customerName;
@Schema(description = "产品规格", example = "红色")
private String standard;

15
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java
Unescape Escape View File

@ -31,6 +31,21 @@ public class ErpProductRespVO extends ErpProductDO {
@ExcelProperty("产品条码")
private String barCode;
@Schema(description = "是否样品", example = "true")
private Boolean isSample;
@Schema(description = "样品分类", example = "CUSTOMER_SAMPLE")
private String sampleCategory;
@Schema(description = "所属事业部", example = "BIT")
private String bizUnit;
@Schema(description = "客户ID", example = "1001")
private Long customerId;
@Schema(description = "客户名称", example = "ACME HK")
private String customerName;
@Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11161")
private Long categoryId;

15
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java
Unescape Escape View File

@ -28,6 +28,21 @@ public class ProductSaveReqVO {
// @NotEmpty(message = "产品条码不能为空")
private String barCode;
@Schema(description = "是否样品", example = "true")
private Boolean isSample;
@Schema(description = "样品分类", example = "CUSTOMER_SAMPLE")
private String sampleCategory;
@Schema(description = "所属事业部", example = "BIT")
private String bizUnit;
@Schema(description = "客户ID", example = "1001")
private Long customerId;
@Schema(description = "客户名称", example = "ACME HK")
private String customerName;
@Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11161")
@NotNull(message = "产品分类编号不能为空")
private Long categoryId;

20
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java
Unescape Escape View File

@ -40,6 +40,26 @@ public class ErpProductDO extends BaseDO {
* 产品条码
*/
private String barCode;
/**
* 是否样品
*/
private Boolean isSample;
/**
* 样品分类
*/
private String sampleCategory;
/**
* 所属事业部
*/
private String bizUnit;
/**
* 客户ID
*/
private Long customerId;
/**
* 客户名称快照
*/
private String customerName;
/**
* 产品分类编号
*

8
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java
Unescape Escape View File

@ -42,6 +42,10 @@ public interface ErpProductMapper extends BaseMapperX<ErpProductDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<ErpProductDO>()
.likeIfPresent(ErpProductDO::getName, reqVO.getName())
.likeIfPresent(ErpProductDO::getBarCode, resolveCode(reqVO))
.eqIfPresent(ErpProductDO::getIsSample, reqVO.getIsSample())
.eqIfPresent(ErpProductDO::getBizUnit, reqVO.getBizUnit())
.eqIfPresent(ErpProductDO::getSampleCategory, reqVO.getSampleCategory())
.eqIfPresent(ErpProductDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ErpProductDO::getCategoryId, reqVO.getCategoryId())
.inIfPresent(ErpProductDO::getCategoryId, categoryIds)
.betweenIfPresent(ErpProductDO::getCreateTime, reqVO.getCreateTime())
@ -67,6 +71,10 @@ public interface ErpProductMapper extends BaseMapperX<ErpProductDO> {
.inIfPresent(ErpProductDO::getId, reqVO.getIds())
.likeIfPresent(ErpProductDO::getName, reqVO.getName())
.likeIfPresent(ErpProductDO::getBarCode, reqVO.getCode())
.eqIfPresent(ErpProductDO::getIsSample, reqVO.getIsSample())
.eqIfPresent(ErpProductDO::getBizUnit, reqVO.getBizUnit())
.eqIfPresent(ErpProductDO::getSampleCategory, reqVO.getSampleCategory())
.eqIfPresent(ErpProductDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ErpProductDO::getCategoryId, reqVO.getCategoryId())
.inIfPresent(ErpProductDO::getCategoryId, categoryIds)
.likeIfPresent(ErpProductDO::getStandard, reqVO.getStandard())

1
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductService.java
Unescape Escape View File

@ -76,6 +76,7 @@ public interface ErpProductService {
List<ErpProductRespVO> getProductVOListByStatus(Integer status,Integer categoryId);
List<ErpProductRespVO> getProductVOListByCategory(Integer categoryId);
List<ErpProductRespVO> getProductVOListByCategory(Integer categoryId, Integer categoryType);
List<ErpProductRespVO> getProductVOList(ErpProductListReqVO reqVO);
List<ErpProductRespVO> buildProductVOList(List<ErpProductDO> list);
/**
* 获得产品 VO 列表

18
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
Unescape Escape View File

@ -72,6 +72,9 @@ import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
@Slf4j
public class ErpProductServiceImpl implements ErpProductService {
private static final String PRODUCT_CODE_RULE = "PRODUCT_CODE_GENERATE";
private static final String BIT_SAMPLE_CODE_RULE = "BIT_SAMPLE_CODE";
@Resource
private ErpProductMapper productMapper;
@ -125,6 +128,8 @@ public class ErpProductServiceImpl implements ErpProductService {
String code = createReqVO.getBarCode();
boolean autoGeneratedCode = StringUtils.isBlank(code);
boolean sample = Boolean.TRUE.equals(createReqVO.getIsSample());
String ruleCode = sample ? BIT_SAMPLE_CODE_RULE : PRODUCT_CODE_RULE;
validateProductUnitRelation(createReqVO.getUnitId(), createReqVO.getPurchaseUnitId(), createReqVO.getPurchaseUnitConvertQuantity());
@ -137,7 +142,7 @@ public class ErpProductServiceImpl implements ErpProductService {
}
if (autoGeneratedCode) {
code = autoCodeUtil.genSerialCode("PRODUCT_CODE_GENERATE", null);
code = autoCodeUtil.genSerialCode(ruleCode, null);
} else {
if (productMapper.selectOne(Wrappers.<ErpProductDO>lambdaQuery()
.eq(ErpProductDO::getBarCode, code)) != null) {
@ -166,7 +171,7 @@ public class ErpProductServiceImpl implements ErpProductService {
// 自动生成才拼接 分类编码-流水号；手工输入则原样保存
if (autoGeneratedCode) {
product.setBarCode(productCategory.getCode() + "-" + code);
product.setBarCode(sample ? code : productCategory.getCode() + "-" + code);
} else {
product.setBarCode(code);
}
@ -214,9 +219,9 @@ public class ErpProductServiceImpl implements ErpProductService {
saveProductSuppliers(product.getId(), createReqVO.getSuppliers(), createReqVO.getDefaultSupplierId());
// 生成二维码
CodeTypeEnum codeType = autoCodeUtil.queryCodeType("PRODUCT_CODE_GENERATE");
CodeTypeEnum codeType = autoCodeUtil.queryCodeType(ruleCode);
if (codeType==null){
log.warn("[创建产品物料]未配置码类型，跳过生产，ruleCode={}","PRODUCT_CODE_GENERATE");
log.warn("[创建产品物料]未配置码类型，跳过生成，ruleCode={}", ruleCode);
return product.getId();
}
@ -541,6 +546,11 @@ public class ErpProductServiceImpl implements ErpProductService {
ErpProductListReqVO reqVO = new ErpProductListReqVO();
reqVO.setCategoryId(categoryId == null ? null : categoryId.longValue());
reqVO.setCategoryType(categoryType);
return getProductVOList(reqVO);
}
@Override
public List<ErpProductRespVO> getProductVOList(ErpProductListReqVO reqVO) {
List<ErpProductDO> list = productMapper.selectList(reqVO);
return buildProductVOList(list);
}

102
yudao-module-erp/yudao-module-erp-biz/src/test/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImplTest.java
Unescape Escape View File

@ -0,0 +1,102 @@
package cn.iocoder.yudao.module.erp.service.product;
import cn.iocoder.yudao.module.common.enums.CodeTypeEnum;
import cn.iocoder.yudao.module.common.enums.QrcodeBizTypeEnum;
import cn.iocoder.yudao.module.common.service.qrcordrecord.QrcodeRecordService;
import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil;
import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ProductSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductUnitDO;
import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductCategoryMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductMapper;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* {@link ErpProductServiceImpl} 的单元测试类
*/
@ExtendWith(MockitoExtension.class)
class ErpProductServiceImplTest {
@InjectMocks
private ErpProductServiceImpl productService;
@Mock
private ErpProductMapper productMapper;
@Mock
private ErpProductCategoryMapper productCategoryMapper;
@Mock
private ErpProductUnitService productUnitService;
@Mock
private QrcodeRecordService qrcodeService;
@Mock
private AutoCodeUtil autoCodeUtil;
@Test
void createProduct_whenBitSampleAndNoCode_generatesSampleCodeAndStoresMetadata() throws Exception {
ProductSaveReqVO reqVO = new ProductSaveReqVO();
reqVO.setName("BIT 样品");
reqVO.setBarCode(null);
reqVO.setIsSample(true);
reqVO.setSampleCategory("CUSTOMER_SAMPLE");
reqVO.setBizUnit("BIT");
reqVO.setCustomerId(1001L);
reqVO.setCustomerName("ACME HK");
reqVO.setCategoryId(10L);
reqVO.setUnitId(20L);
reqVO.setStatus(0);
reqVO.setStandard("STD-1");
ErpProductUnitDO unit = new ErpProductUnitDO();
unit.setId(20L);
unit.setName("PCS");
when(productUnitService.getProductUnit(20L)).thenReturn(unit);
ErpProductCategoryDO category = new ErpProductCategoryDO();
category.setId(10L);
category.setName("测试分类");
category.setCode("CAT");
when(productCategoryMapper.selectById(10L)).thenReturn(category);
when(productMapper.selectProductExist(any(ErpProductDO.class))).thenReturn(false);
when(autoCodeUtil.genSerialCode("BIT_SAMPLE_CODE", null)).thenReturn("SP202606220001");
when(autoCodeUtil.queryCodeType("BIT_SAMPLE_CODE")).thenReturn(CodeTypeEnum.QR);
when(productMapper.insert(any(ErpProductDO.class))).thenAnswer(invocation -> {
ErpProductDO product = invocation.getArgument(0);
product.setId(100L);
return 1;
});
Long id = productService.createProduct(reqVO);
assertEquals(100L, id);
ArgumentCaptor<ErpProductDO> productCaptor = ArgumentCaptor.forClass(ErpProductDO.class);
verify(productMapper).insert(productCaptor.capture());
ErpProductDO product = productCaptor.getValue();
assertTrue(product.getIsSample());
assertEquals("CUSTOMER_SAMPLE", product.getSampleCategory());
assertEquals("BIT", product.getBizUnit());
assertEquals(1001L, product.getCustomerId());
assertEquals("ACME HK", product.getCustomerName());
assertEquals("SP202606220001", product.getBarCode());
verify(qrcodeService).generateOrRefresh(
eq(QrcodeBizTypeEnum.PRODUCT),
eq(100L),
eq("SP202606220001"),
eq("DETAIL"),
eq(CodeTypeEnum.QR));
}
}
Write Preview
Loading…
Cancel
Save