feature:获取mdm数据设置公司代码为空

release
gaorl 2 years ago
parent 2d1c18407b
commit e7b62fc2a6
  1. 1
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEnum.java
  2. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
  3. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java

@ -17,6 +17,7 @@ public enum CommodityCodeEnum {
DATA_SOURCE_9("9", "引用集团库"),
DATA_SOURCE_10("10", "克隆公司库"),
DATA_SOURCE_11("11", "电商接口同步"),
DATA_SOURCE_12("12", "mdm同步"),
;

@ -662,7 +662,7 @@ public class CommodityServiceImpl implements CommodityService {
commodityCodeEntity.setModifyTime(new Date());
commodityCodeEntity.setModifyUserId(userInfoService.getUser() != null && userInfoService.getUser().getUserId() != null ? userInfoService.getUser().getUserId().toString():"");
if (commodityCodeEntity != null){
// commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map);
commodityMapper.updateCommodityByZxbm(commodityCodeEntity, map);
}
}
}

@ -13,6 +13,7 @@ import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail;
import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO;
import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper;
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEnum;
import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper;
import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper;
import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
@ -344,6 +345,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
String ggxh = StringUtils.isNotBlank(reqBO.getDESCSHORT())&& reqBO.getDESCSHORT().contains("_")? reqBO.getDESCSHORT().substring(reqBO.getDESCSHORT().indexOf("_") + 1) : "";
ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(ggxh);
//调整后不更新公司物料
commodityCodeEntity.setDataSource(CommodityCodeEnum.DATA_SOURCE_12.getKey());
if(collect != null && collect.size() > 0){
//matchCommodityCode(commodityCodeEntity);
commodityCodeEntity.setXmmc(reqBO.getDESC1());
@ -357,7 +359,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
}
commodityCodeEntity.setDataSource("4");
//matchCommodityCode(commodityCodeEntity);
List<String> ids = collect.stream().map(t -> t.getId()).collect(Collectors.toList());
int updateCommodity = commodityMapper.batchUpdateCommodity(commodityCodeEntity, ids);
@ -383,7 +384,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
}
commodityCodeEntity.setDataSource("4");
// sdenergyTaxCodeMatchDao.queryByWlflbm(requestBody.get)
commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey());
@ -422,6 +422,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
if (codeEntityForMatch != null) {
// 查找原codeEntityR
BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity);
commodityCodeEntity.setEntId("");
commodityCodeEntity.setXhfNsrsbh("-1");
commodityCodeEntity.setHsbz("1");
return;

Loading…
Cancel
Save