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

Merge branch 'refs/heads/dev' into gyj

Browse Source
This commit is contained in:
GYJ
2024-07-06 16:50:57 +08:00
parent 5e16de0bc8 6b6628afb6
commit fd8cc67578
2 changed files with 6 additions and 1 deletions
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("规格已存在"));
} }
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
View File

@@ -215,7 +215,7 @@ public class StockServiceImpl implements StockService {
continue; continue;
} }
TbProductDto product = productService.findById(sku.getId()); TbProductDto product = productService.findById(Integer.valueOf(sku.getProductId()));
TbShopUnit shopUnit = shopUnitRepository.searchUnit(product.getUnitId()); TbShopUnit shopUnit = shopUnitRepository.searchUnit(product.getUnitId());
stockDetail.setShopId(sku.getShopId()); stockDetail.setShopId(sku.getShopId());