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

修改供应商为非必填

This commit is contained in:
牛叉闪闪 2024-08-05 10:18:34 +08:00
parent e9b0301eb9
commit 9de0c594cd
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsSuppFlow.java
View File

@ -59,7 +59,7 @@ public class TbConsSuppFlow implements Serializable {
@ApiModelProperty(value = "productId")
private Integer productId;
@Column(name = "`supplier_id`",nullable = false)
@Column(name = "`supplier_id`")
@ApiModelProperty(value = "supplierId")
private Integer supplierId;

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

@ -2,6 +2,8 @@ package cn.ysk.cashier.cons.service.impl;
import cn.ysk.cashier.cons.domain.TbConCheck;
import cn.ysk.cashier.cons.domain.TbConsInfo;
import cn.ysk.cashier.cons.domain.TbConsInfoFlow;
import cn.ysk.cashier.cons.repository.TbConsInfoFlowRepository;
import cn.ysk.cashier.cons.repository.TbConsInfoRepository;
import cn.ysk.cashier.utils.FileUtil;
import cn.ysk.cashier.utils.PageUtil;
@ -39,6 +41,8 @@ public class TbConCheckServiceImpl implements TbConCheckService {
private final TbConsInfoRepository tbConsInfoRepository;
public final TbConsInfoFlowRepository tbConsInfoFlowRepository;
@Override
public Map<String,Object> queryAll(TbConCheckQueryCriteria criteria, Pageable pageable){
Page<TbConCheck> page = tbConCheckRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
@ -65,6 +69,17 @@ public class TbConCheckServiceImpl implements TbConCheckService {
if(Objects.isNull(consInfo)){
throw new Exception("耗材信息不存在");
}
TbConsInfoFlow flow=new TbConsInfoFlow();
if(consInfo.getStockNumber().compareTo(resources.getStockNumber())>=0){
flow.setBizCode("checkStockOut");
flow.setBizName("盘点出库");
flow.setBizType("-");
}else {
flow.setBizCode("checkStockIn");
flow.setBizName("盘点入库");
flow.setBizType("+");
}
consInfo.setStockConsume(BigDecimal.ZERO);
@ -72,6 +87,21 @@ public class TbConCheckServiceImpl implements TbConCheckService {
consInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
tbConsInfoRepository.save(consInfo);
flow.setConsId(consInfo.getId());
flow.setShopId(consInfo.getShopId());
flow.setConName(consInfo.getConName());
flow.setAmount(consInfo.getStockNumber());
flow.setBalance(consInfo.getStockNumber());
flow.setCreateTime(new Timestamp(System.currentTimeMillis()));
tbConsInfoFlowRepository.save(flow);
TbConCheck conCheck=new TbConCheck();
conCheck.setConInfoId(consInfo.getId());

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

@ -235,7 +235,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
suppFlow.setConInfoId(info.getConTypeId());
suppFlow.setShopId(resources.getShopId());
suppFlow.setSupplierId(resources.getSupplierId());
suppFlow.setSupplierId(Objects.isNull(resources.getSupplierId())?0: resources.getSupplierId());
suppFlow.setType(resources.getType());
suppFlow.setStockNumber(conInfos.getStockNumber());