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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
GYJ 2024-07-11 16:59:15 +08:00
parent 134cb90a02 ed2440d2d5
commit 9590359f13
6 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java
View File

@ -4,6 +4,8 @@ import cn.ysk.cashier.cons.domain.TbConsInfo;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List;
/**
* @website https://eladmin.vip
* @author admin
@ -13,4 +15,6 @@ public interface TbConsInfoRepository extends JpaRepository<TbConsInfo, Integer>
int countByConCode(String conCode);
List<TbConsInfo> findByConTypeId(Integer typeId);
}

16
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@ -64,6 +64,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
private final TbProductStockOperateRepository tbProductStockOperateRepository;
@Override
public Map<String, Object> queryAll(TbConsInfoQueryCriteria criteria, Pageable pageable) {
Page<TbConsInfo> page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
@ -94,11 +95,13 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
}
int count = tbConsInfoRepository.countByConCode(resources.getConCode());
if (count > 0) {
throw new Exception("耗材代码不允许重复");
}
// int count = tbConsInfoRepository.countByConCode(resources.getConCode());
// if (count > 0) {
// throw new Exception("耗材代码不允许重复");
// }
resources.setConCode(UUID.randomUUID().toString());
resources.setConTypeName(tbConsType.getConTypeName());
resources.setLasterInStock(BigDecimal.ZERO);
resources.setStockNumber(BigDecimal.ZERO);
@ -118,7 +121,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
}
tbConsInfo.setConCode(resources.getConCode());
tbConsInfo.setConName(resources.getConName());
tbConsInfo.setPrice(resources.getPrice());
tbConsInfo.setConUnit(resources.getConUnit());
@ -302,8 +304,10 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
stockOperate.setBatchNumber("");
stockOperate.setStockSnap(array.toJSONString());
tbProductStockOperateRepository.save(stockOperate);
}
public static void main(String[] args){
System.out.println(UUID.randomUUID().toString());
}
}

26
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsTypeServiceImpl.java
View File

@ -1,6 +1,8 @@
package cn.ysk.cashier.cons.service.impl;
import cn.ysk.cashier.cons.domain.TbConsInfo;
import cn.ysk.cashier.cons.domain.TbConsType;
import cn.ysk.cashier.cons.repository.TbConsInfoRepository;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.PageUtil;
import cn.ysk.cashier.utils.QueryHelp;
@ -15,12 +17,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.LinkedHashMap;
/**
* @website https://eladmin.vip
@ -35,6 +35,8 @@ public class TbConsTypeServiceImpl implements TbConsTypeService {
private final TbConsTypeRepository tbConsTypeRepository;
private final TbConsTypeMapper tbConsTypeMapper;
private final TbConsInfoRepository tbConsInfoRepository;
@Override
public Map<String,Object> queryAll(TbConsTypeQueryCriteria criteria, Pageable pageable){
Page<TbConsType> page = tbConsTypeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
@ -59,11 +61,7 @@ public class TbConsTypeServiceImpl implements TbConsTypeService {
public TbConsTypeDto create(TbConsType resources) throws Exception {
int count= tbConsTypeRepository.countByConTypeCode(resources.getConTypeCode());
if(count>0){
throw new Exception("耗材类型代码不允许重复");
}
resources.setConTypeCode(UUID.randomUUID().toString());
return tbConsTypeMapper.toDto(tbConsTypeRepository.save(resources));
}
@ -74,6 +72,16 @@ public class TbConsTypeServiceImpl implements TbConsTypeService {
ValidationUtil.isNull( tbConsType.getId(),"TbConsType","id",resources.getId());
tbConsType.copy(resources);
tbConsTypeRepository.save(tbConsType);
List<TbConsInfo> tbConsInfos=tbConsInfoRepository.findByConTypeId(tbConsType.getId());
if(Objects.nonNull(tbConsInfos)){
tbConsInfos.stream().forEach(it->{
it.setConTypeName(resources.getConTypeName());
});
}
tbConsInfoRepository.saveAll(tbConsInfos);
}
@Override

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

@ -121,12 +121,18 @@ public class TbProductSku implements Serializable {
private Long updatedAt;
@Column(name = "`is_del`")
private Integer isDel;
private Integer isDel = 0;
@Column(name = "`is_pause_sale`")
@ApiModelProperty(value = "是否暂停销售")
private Integer isPauseSale = 0;
public void setIsDel(Integer isDel) {
if(isDel!=null){
this.isDel = isDel;
}
}
public void copy(TbProductSku source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
View File

@ -37,7 +37,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
@Transactional
@Modifying
@Query("update FROM TbProductSku sku set sku.isDel=1 WHERE sku.id = :skuId")
Integer deleteBySkuId(@Param("skuId") String skuId);
Integer deleteBySkuId(@Param("skuId") Integer skuId);
@Query("SELECT sku FROM TbProductSku sku WHERE sku.barCode = :barCode and sku.isDel=0")
TbProductSku searchBarCode(@Param("barCode")String barCode);

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

@ -480,7 +480,7 @@ public class TbProductServiceImpl implements TbProductService {
List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString());
for (TbProductSku productSkus : tbProductSkus) {
if (!collect.contains(productSkus.getId())) {
tbProductSkuRepository.deleteBySkuId(productSkus.getId().toString());
tbProductSkuRepository.deleteBySkuId(productSkus.getId());
}
}
}