Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
f98cbb9def
|
|
@ -100,6 +100,8 @@ public class TbProskuConServiceImpl implements TbProskuConService {
|
|||
tbProskuCon.setStatus("1");
|
||||
tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
||||
list.add(tbProskuCon);
|
||||
}else {
|
||||
throw new Exception(product.getName().concat("对应的耗材信息已存在"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -117,6 +119,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
|
|||
tbProskuCon.setStatus("1");
|
||||
tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis()));
|
||||
list.add(tbProskuCon);
|
||||
}else {
|
||||
TbProductSku sku= tbProductSkuRepository.getById(skuInfo.getSkuId());
|
||||
throw new Exception(product.getName().concat("商品对应的").concat(Objects.nonNull(sku.getSpecSnap())?sku.getSpecSnap():"").concat("规格已存在"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue