root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge:冲突处理

Browse Source
This commit is contained in:
zhangzq
2024-06-07 16:59:20 +08:00
parent c33ffe440b
commit 91e0ce0752
15 changed files with 64 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
View File

@@ -14,12 +14,14 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.nl.modules.common.config.FileProperties;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.tools.domain.LocalStorage;
import org.nl.modules.tools.repository.LocalStorageRepository;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.system.service.tools.IToolLocalStorageService;
import org.nl.system.service.tools.dao.ToolLocalStorage;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
@@ -39,7 +41,7 @@ public class AutoSaveIvtExcel {
private final FileProperties properties;
private final LocalStorageRepository localStorageRepository;
private final IToolLocalStorageService iToolLocalStorageService;
@SneakyThrows
public void run() {
@@ -106,14 +108,14 @@ public class AutoSaveIvtExcel {
String nowStr = format.format(date) + "-";
String path = properties.getPath().getPath() + type + File.separator + nowStr + "0库存报表.xls";
FileOutputStream fileOut = new FileOutputStream(path);
LocalStorage localStorage = new LocalStorage(
ToolLocalStorage localStorage = new ToolLocalStorage(
nowStr + "0库存报表.xls",
nowStr + "0库存报表",
"xls",
path,
type,
"");
localStorageRepository.save(localStorage);
iToolLocalStorageService.save(localStorage);
workbook.write(fileOut);
fileOut.close();

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcelTwo.java
View File

@@ -12,9 +12,11 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.nl.modules.common.config.FileProperties;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.tools.domain.LocalStorage;
import org.nl.modules.tools.repository.LocalStorageRepository;
import org.nl.modules.wql.WQL;
import org.nl.system.service.tools.IToolLocalStorageService;
import org.nl.system.service.tools.dao.ToolLocalStorage;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
@@ -34,7 +36,7 @@ public class AutoSaveIvtExcelTwo {
private final FileProperties properties;
private final LocalStorageRepository localStorageRepository;
private final IToolLocalStorageService iToolLocalStorageService;
@SneakyThrows
public void run() {
@@ -101,14 +103,14 @@ public class AutoSaveIvtExcelTwo {
String nowStr = format.format(date) + "-";
String path = properties.getPath().getPath() + type + File.separator + nowStr + "8库存报表.xls";
FileOutputStream fileOut = new FileOutputStream(path);
LocalStorage localStorage = new LocalStorage(
ToolLocalStorage localStorage = new ToolLocalStorage(
nowStr + "8库存报表.xls",
nowStr + "8库存报表",
"xls",
path,
type,
"");
localStorageRepository.save(localStorage);
iToolLocalStorageService.save(localStorage);
workbook.write(fileOut);
fileOut.close();

23
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendIvtExcel.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -16,12 +17,14 @@ import org.hibernate.criterion.Example;
import org.nl.modules.common.config.FileProperties;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.common.utils.ValidationUtil;
import org.nl.modules.tools.domain.LocalStorage;
import org.nl.modules.tools.repository.LocalStorageRepository;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.system.service.tools.IToolLocalStorageService;
import org.nl.system.service.tools.dao.ToolLocalStorage;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
@@ -44,7 +47,7 @@ public class AutoSendIvtExcel {
private final FileProperties properties;
private final LocalStorageRepository localStorageRepository;
private final IToolLocalStorageService iToolLocalStorageService;
private final LmsToMesService lmsToMesService;
@@ -113,22 +116,22 @@ public class AutoSendIvtExcel {
String nowStr = format.format(date);
String path = properties.getPath().getPath() + type + File.separator + "当天库存报表.xls";
FileOutputStream fileOut = new FileOutputStream(path);
LocalStorage localStorage1 = new LocalStorage();
ToolLocalStorage localStorage1 = new ToolLocalStorage();
localStorage1.setName("当天库存报表");
LocalStorage local = localStorageRepository.findByName("当天库存报表");
ToolLocalStorage local = iToolLocalStorageService.getOne(new QueryWrapper<ToolLocalStorage>().eq("name","当天库存报表"));
if (ObjectUtil.isNotEmpty(local)){
local.setUpdateTime(DateUtil.date().toTimestamp());
localStorageRepository.save(local);
local.setUpdate_time(DateUtil.now());
iToolLocalStorageService.save(local);
}else {
LocalStorage localStorage = new LocalStorage(
ToolLocalStorage localStorage = new ToolLocalStorage(
"当天库存报表.xls",
"当天库存报表",
"xls",
path,
type,
"");
localStorageRepository.save(localStorage);
iToolLocalStorageService.save(localStorage);
}
workbook.write(fileOut);

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendSalesIvt.java
View File

@@ -21,12 +21,12 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.config.FileProperties;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.tools.domain.LocalStorage;
import org.nl.modules.tools.repository.LocalStorageRepository;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.system.service.tools.IToolLocalStorageService;
import org.nl.wms.createmsg.CreateMsg;
import org.nl.wms.ext.mes.service.LmsToMesService;
import org.redisson.api.RLock;
@@ -50,7 +50,7 @@ public class AutoSendSalesIvt {
private final FileProperties properties;
private final LocalStorageRepository localStorageRepository;
private final org.nl.system.service.tools.IToolLocalStorageService IToolLocalStorageService;
private final LmsToMesService lmsToMesService;
@@ -269,7 +269,7 @@ public class AutoSendSalesIvt {
.map(row -> row.getDoubleValue("canuse_qty"))
.reduce(Double::sum).orElse(0.000);
resultJson.put("day5", NumberUtil.round(qty90, 3));
// 合计
double day_sum = NumberUtil.add(qty15, qty15_30, qty31_60, qty61_90, qty90).doubleValue();
resultJson.put("day_sum", NumberUtil.round(day_sum, 3));
@@ -495,7 +495,7 @@ public class AutoSendSalesIvt {
path,
type,
"");
localStorageRepository.save(localStorage);*/
IToolLocalStorageService.save(localStorage);*/
// 调用接口传送图片名称
JSONObject resultParam = lmsToMesService.sendSalesIvtMsg(fileName);

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -16,10 +16,10 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;