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

Merge remote-tracking branch 'origin/zstmp' into gyj

Browse Source
This commit is contained in:
GYJ
2024-07-30 11:11:53 +08:00
parent 68ed64849a 6521464900
commit 8486461224
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockCountDTO.java
View File

@@ -16,4 +16,5 @@ public class StockCountDTO {
private String unitName; private String unitName;
private Integer stockCount; private Integer stockCount;
private Integer stockNumber; private Integer stockNumber;
private String specSnap;
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
View File

@@ -129,7 +129,7 @@ public class TbProductSku implements Serializable {
@Column(name = "`is_grounding`") @Column(name = "`is_grounding`")
@ApiModelProperty(value = "是否上架") @ApiModelProperty(value = "是否上架")
private Integer isGrounding = 0; private Integer isGrounding = 1;
public void setIsDel(Integer isDel) { public void setIsDel(Integer isDel) {
if(isDel!=null){ if(isDel!=null){

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/StockCountRepository.java
View File

@@ -45,7 +45,7 @@ public interface StockCountRepository extends JpaRepository<StockCountDTO, Integ
"\n" + "\n" +
"WHEN pro.is_distribute = 0 THEN\n" + "WHEN pro.is_distribute = 0 THEN\n" +
"sku.stock_number ELSE pro.stock_number \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" + "FROM\n" +
"tb_order_detail info\n" + "tb_order_detail info\n" +
"LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" + "LEFT JOIN tb_order_info orders ON orders.id = info.order_id\n" +

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

@@ -387,6 +387,7 @@ public class TbProductServiceImpl implements TbProductService {
sku.setShopId(save.getShopId()); sku.setShopId(save.getShopId());
sku.setCreatedAt(Instant.now().toEpochMilli()); sku.setCreatedAt(Instant.now().toEpochMilli());
sku.setUpdatedAt(Instant.now().toEpochMilli()); sku.setUpdatedAt(Instant.now().toEpochMilli());
sku.setIsGrounding(1);
skuList.add(sku); skuList.add(sku);
} }
List<TbProductSku> tbProductSkus = tbProductSkuRepository.saveAll(skuList); List<TbProductSku> tbProductSkus = tbProductSkuRepository.saveAll(skuList);

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

@@ -193,7 +193,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
// productStockDetail.setSkuId(s.getSkuId().toString()); // productStockDetail.setSkuId(s.getSkuId().toString());
productStockDetail.setIsStock(s.getIsStock());//是否开启库存 productStockDetail.setIsStock(s.getIsStock());//是否开启库存
productStockDetail.setLeftNumber(s.getStockNumber()+s.getStockCount());//原库存 productStockDetail.setLeftNumber(s.getStockNumber()+s.getStockCount());//原库存
// productStockDetail.setSpecSnap(s.getSkuName()); productStockDetail.setSpecSnap(s.getSpecSnap());
productStockDetail.setUnitName(s.getUnitName()); productStockDetail.setUnitName(s.getUnitName());
productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount())); productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount()));
productStockDetail.setSourcePath("NORMAL"); productStockDetail.setSourcePath("NORMAL");