czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
韩鹏辉 2024-07-06 16:15:45 +08:00
parent c5ef3af946 9dd01bab24
commit f98cbb9def
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
View File

@ -100,6 +100,8 @@ public class TbProskuConServiceImpl implements TbProskuConService {
tbProskuCon.setStatus("1"); tbProskuCon.setStatus("1");
tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis())); tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis()));
list.add(tbProskuCon); list.add(tbProskuCon);
}else {
throw new Exception(product.getName().concat("对应的耗材信息已存在"));
} }
} }
} }
@ -117,6 +119,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
tbProskuCon.setStatus("1"); tbProskuCon.setStatus("1");
tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis())); tbProskuCon.setCreateTime(new Timestamp(System.currentTimeMillis()));
list.add(tbProskuCon); list.add(tbProskuCon);
}else {
TbProductSku sku= tbProductSkuRepository.getById(skuInfo.getSkuId());
throw new Exception(product.getName().concat("商品对应的").concat(Objects.nonNull(sku.getSpecSnap())?sku.getSpecSnap():"").concat("规格已存在"));
} }
} }