|
|
|
@ -325,6 +325,7 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
|
for (CommodityCodeEntity commodityCodeEntity : commodityCodeList) { |
|
|
|
|
commodityCodeEntity.setSpbm(StringUtil.fillZero(commodityCodeEntity.getSpbm(), ConfigureConstant.INT_19)); |
|
|
|
|
//ent_id + encoding + spmc
|
|
|
|
|
num++; |
|
|
|
|
int i1 = commodityMapper.queryCountByEntAndEncode(commodityCodeEntity.getZxbm(), "", commodityCodeEntity.getEntId()); |
|
|
|
|
if(i1>0){ |
|
|
|
|
Map<String, String> map = new HashMap<>(2); |
|
|
|
@ -379,7 +380,6 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
|
resultMap.add(map); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
num++; |
|
|
|
|
} |
|
|
|
|
R ok = R.ok(); |
|
|
|
|
if(resultMap.size() > 0){ |
|
|
|
|