Merge branch 'refs/heads/dev' into gyj

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

@@ -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("规格已存在"));
                 }
             }
 

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

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