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/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/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 tbProductSkus = tbProductSkuRepository.saveAll(skuList); 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");