|
|
@ -483,7 +483,7 @@ public class CommodityController { |
|
|
|
commodityCodeEntity.setXhfMc(xhfMc); |
|
|
|
commodityCodeEntity.setXhfMc(xhfMc); |
|
|
|
commodityCodeEntity.setXmmc(commodityExcel.getXmmc()); |
|
|
|
commodityCodeEntity.setXmmc(commodityExcel.getXmmc()); |
|
|
|
|
|
|
|
|
|
|
|
if(StringUtils.isBlank(commodityCodeEntity.getZxbm())){ |
|
|
|
if(StringUtils.isBlank(commodityExcel.getZxbm())){ |
|
|
|
commodityCodeEntity.setZxbm(baseService.getGenerateShotKey()); |
|
|
|
commodityCodeEntity.setZxbm(baseService.getGenerateShotKey()); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
commodityCodeEntity.setZxbm(String.format("%18s", commodityExcel.getZxbm()).replace(' ', '0')); |
|
|
|
commodityCodeEntity.setZxbm(String.format("%18s", commodityExcel.getZxbm()).replace(' ', '0')); |
|
|
|