|
|
|
@ -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; |
|
|
|
|