|
|
|
@ -615,15 +615,18 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
|
|
|
|
|
|
CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); |
|
|
|
|
commodityCodeCheckQuery.setXmmc(xmmc); |
|
|
|
|
String zxbm = StringUtils.isNotBlank(receiveSpxxReq.getZxbm()) ? receiveSpxxReq.getZxbm() : baseService.getGenerateShotKey(); |
|
|
|
|
commodityCodeCheckQuery.setZxbm(zxbm); |
|
|
|
|
if(StringUtils.isBlank(receiveSpxxReq.getZxbm())){ |
|
|
|
|
receiveSpxxReq.setZxbm(baseService.getGenerateShotKey()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
commodityCodeCheckQuery.setZxbm(receiveSpxxReq.getZxbm()); |
|
|
|
|
commodityCodeCheckQuery.setGgxh(receiveSpxxReq.getGgxh()); |
|
|
|
|
commodityCodeCheckQuery.setXmdw(receiveSpxxReq.getXmdw()); |
|
|
|
|
commodityCodeCheckQuery.setXmdj(receiveSpxxReq.getXmdj()); |
|
|
|
|
commodityCodeCheckQuery.setSl(receiveSpxxReq.getSl()); |
|
|
|
|
commodityCodeCheckQuery.setDeptId(receiveSpxxReq.getEntId()); |
|
|
|
|
Map<String,String> map = new HashMap<>(); |
|
|
|
|
map.put("zxbm",zxbm); |
|
|
|
|
map.put("zxbm",receiveSpxxReq.getZxbm()); |
|
|
|
|
map.put("entId",receiveSpxxReq.getEntId()); |
|
|
|
|
|
|
|
|
|
if(StringUtils.isBlank(receiveSpxxReq.getEntId())){ |
|
|
|
|