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

Merge branch 'ww' into test 

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
This commit is contained in:
wangw 2024-10-15 15:51:45 +08:00
parent 9e8d74845a c105c8d0ff
commit 7de19ffb1f
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
View File

@ -1,7 +1,6 @@
package cn.ysk.cashier.cons.domain;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

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

@ -43,12 +43,6 @@ import java.util.*;
import static cn.ysk.cashier.utils.StringCodeUtil.TYPE.LETTER_CAPITAL_NUMBER;
/**
* @author admin
* @website https://eladmin.vip
* @description 服务实现
* @date 2024-06-22
**/
@Service
@RequiredArgsConstructor
@Slf4j
@ -81,10 +75,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
public List<TbConsInfoDto> queryAll(TbConsInfoQueryCriteria criteria) {
List<TbConsInfoDto> list = tbConsInfoMapper.toDto(tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)));
if (Objects.nonNull(list) && list.size() > 0) {
list.parallelStream().forEach(it -> {
it.setContypeCode(tbConsTypeRepository.findById(it.getConTypeId()).orElseGet(TbConsType::new).getConTypeCode());
});
if (Objects.nonNull(list) && !list.isEmpty()) {
list.parallelStream().forEach(it -> it.setContypeCode(tbConsTypeRepository.findById(it.getConTypeId()).orElseGet(TbConsType::new).getConTypeCode()));
}
return list;
}
@ -215,7 +207,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
stockOperate.setShopId(tbShopInfo.getId().toString());
stockOperate.setStockSnap("");
stockOperate.setType(resources.getType().equals("in") ? "cons_in" : "cons_out");
stockOperate.setType("in".equals(resources.getType()) ? "cons_in" : "cons_out");
Map<String, String> operatorSnapMap = new HashMap<>();
operatorSnapMap.put("name", tbShopInfo.getShopName());
operatorSnapMap.put("account", tbShopInfo.getAccount());
@ -365,7 +357,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
XSSFRow row = null;
List<TbConsInfo> consInfos = new ArrayList<>();
for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
row = sheet.getRow(i);
if (row != null) {