|
|
@ -242,14 +242,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { |
|
|
|
commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey()); |
|
|
|
commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey()); |
|
|
|
commodityCodeEntity.setSortId((long) i); |
|
|
|
commodityCodeEntity.setSortId((long) i); |
|
|
|
commodityCodeEntity.setXmmc(reqBO.getDESC1()); // 商品名称
|
|
|
|
commodityCodeEntity.setXmmc(reqBO.getDESC1()); // 商品名称
|
|
|
|
commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
|
|
|
|
|
|
|
|
commodityCodeEntity.setXmdw(reqBO.getDESC5()); |
|
|
|
|
|
|
|
commodityCodeEntity.setCreateTime(new Date()); |
|
|
|
|
|
|
|
commodityCodeEntity.setBz(reqBO.getDESCSHORT()); |
|
|
|
|
|
|
|
commodityCodeEntity.setUUID(reqBO.getUUID()); |
|
|
|
|
|
|
|
commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); |
|
|
|
|
|
|
|
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); |
|
|
|
|
|
|
|
commodityCodeEntity.setDataSource("4"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 维护税编和商品编码
|
|
|
|
// 维护税编和商品编码
|
|
|
|
if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSsflMc())) { |
|
|
|
if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSsflMc())) { |
|
|
@ -264,6 +256,14 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { |
|
|
|
|
|
|
|
|
|
|
|
// 进行物料匹配
|
|
|
|
// 进行物料匹配
|
|
|
|
matchCommodityCode(commodityCodeEntity); |
|
|
|
matchCommodityCode(commodityCodeEntity); |
|
|
|
|
|
|
|
commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
|
|
|
|
|
|
|
|
commodityCodeEntity.setXmdw(reqBO.getDESC5()); |
|
|
|
|
|
|
|
commodityCodeEntity.setCreateTime(new Date()); |
|
|
|
|
|
|
|
commodityCodeEntity.setBz(reqBO.getDESCSHORT()); |
|
|
|
|
|
|
|
commodityCodeEntity.setUUID(reqBO.getUUID()); |
|
|
|
|
|
|
|
commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); |
|
|
|
|
|
|
|
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); |
|
|
|
|
|
|
|
commodityCodeEntity.setDataSource("4"); |
|
|
|
|
|
|
|
|
|
|
|
if (commodityMapper.insertCommodityOnDuplicateKey(commodityCodeEntity) > 0) { |
|
|
|
if (commodityMapper.insertCommodityOnDuplicateKey(commodityCodeEntity) > 0) { |
|
|
|
commodityCodeEntity.setSuccess(true); |
|
|
|
commodityCodeEntity.setSuccess(true); |
|
|
|