|
|
@ -619,15 +619,22 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj()); |
|
|
|
commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj()); |
|
|
|
commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); |
|
|
|
commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); |
|
|
|
commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); |
|
|
|
commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); |
|
|
|
R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false); |
|
|
|
Map<String,String> map = new HashMap<>(); |
|
|
|
if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) { |
|
|
|
map.put("productName", xmmc); |
|
|
|
|
|
|
|
map.put("zxbm", receiveSpxxReq.getZxbm()); |
|
|
|
|
|
|
|
map.put("entId",commodityCodeCheckQuery.getDeptId()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map); |
|
|
|
|
|
|
|
List<CommodityCodeEntity> commodityCodeEntityList = commodityMapper.queryProductList(map, null); |
|
|
|
|
|
|
|
//R r = commodityService.checkRepeat(commodityCodeCheckQuery, NsrsbhUtils.transShListByNsrsbh(receiveSpxxReq.getXhfNsrsbh()), false);
|
|
|
|
|
|
|
|
if(commodityCodeEntityList.isEmpty()){ |
|
|
|
|
|
|
|
//if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 从缓存中取税编信息 |
|
|
|
* 从缓存中取税编信息 |
|
|
|
* |
|
|
|
* |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); |
|
|
|
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(receiveSpxxReq.getSpbm()); |
|
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { |
|
|
|
if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { |
|
|
|
CommodityCodeEntity commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); |
|
|
|
CommodityCodeEntity commodityCodeEntity = transCommodityCode(receiveSpxxReq, taxClassCodeEntity); |
|
|
|
commodityMapper.insertCommodity(commodityCodeEntity); |
|
|
|
commodityMapper.insertCommodity(commodityCodeEntity); |
|
|
|