From 275b781f4827e6ba55ada5c7de75cc9fb490cb64 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 26 Jul 2024 18:05:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E9=BB=98=E8=AE=A4=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java | 2 +-
 .../cashier/service/impl/productimpl/TbProductServiceImpl.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
index b19fe427..a108fafc 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
@@ -129,7 +129,7 @@ public class TbProductSku implements Serializable {
 
     @Column(name = "`is_grounding`")
     @ApiModelProperty(value = "是否上架")
-    private Integer isGrounding = 0;
+    private Integer isGrounding = 1;
 
     public void setIsDel(Integer isDel) {
         if(isDel!=null){
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index 489982b2..566b0e5b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -387,6 +387,7 @@ public class TbProductServiceImpl implements TbProductService {
                 sku.setShopId(save.getShopId());
                 sku.setCreatedAt(Instant.now().toEpochMilli());
                 sku.setUpdatedAt(Instant.now().toEpochMilli());
+                sku.setIsGrounding(1);
                 skuList.add(sku);
             }
             List<TbProductSku> tbProductSkus = tbProductSkuRepository.saveAll(skuList);

From 6521464900c2abd5999ed7f2f4d03ed693df3630 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 26 Jul 2024 18:07:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java | 1 +
 .../cn/ysk/cashier/repository/order/StockCountRepository.java   | 2 +-
 .../impl/productimpl/TbProductStockDetailServiceImpl.java       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
index c342314d..c27b489d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
@@ -16,4 +16,5 @@ public class StockCountDTO {
     private String unitName;
     private Integer stockCount;
     private Integer stockNumber;
+    private String specSnap;
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
index 3db7a6d9..929bf2e0 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
@@ -45,7 +45,7 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
             "\n" +
             "WHEN pro.is_distribute = 0 THEN\n" +
             "sku.stock_number ELSE pro.stock_number \n" +
-            "END AS stock_number\n" +
+            "END AS stock_number, ifnull(sku.spec_snap, '')\n" +
             "FROM\n" +
             "tb_order_detail info\n" +
             "LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
index 4556c637..f5445202 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
@@ -193,7 +193,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
 //            productStockDetail.setSkuId(s.getSkuId().toString());
                 productStockDetail.setIsStock(s.getIsStock());//是否开启库存
                 productStockDetail.setLeftNumber(s.getStockNumber()+s.getStockCount());//原库存
-//            productStockDetail.setSpecSnap(s.getSkuName());
+            productStockDetail.setSpecSnap(s.getSpecSnap());
                 productStockDetail.setUnitName(s.getUnitName());
                 productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount()));
                 productStockDetail.setSourcePath("NORMAL");