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

opt:修改正式环境相关

Browse Source
This commit is contained in:
gongbx
2024-05-10 18:22:38 +08:00
parent 0004feebf4
commit 870124ee86
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
View File

@@ -70,30 +70,31 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
List<InventoryInfo> matchedInventory = inventoryInfoList.stream() List<InventoryInfo> matchedInventory = inventoryInfoList.stream()
.filter(inventory -> { .filter(inventory -> {
boolean isMatched = true; boolean isMatched = true;
//去向部门 //去向部门
if (bill.getZzbm() != null && !bill.getZzbm().isEmpty()) { if (bill.getZzbm() != null && !bill.getZzbm().isEmpty()) {
isMatched &= Objects.equals(inventory.getZzbm(), bill.getZzbm()); isMatched = Objects.equals(inventory.getZzbm(), bill.getZzbm());
} }
//仓库编码 //仓库编码
if (bill.getCkbm() != null && !bill.getCkbm().isEmpty()) { if (bill.getCkbm() != null && !bill.getCkbm().isEmpty()) {
isMatched &= Objects.equals(inventory.getCkbm(), bill.getCkbm()); isMatched = Objects.equals(inventory.getCkbm(), bill.getCkbm());
} }
//库位编码 //库位编码
if (bill.getTjkwbm() != null && !bill.getTjkwbm().isEmpty()) { if (bill.getTjkwbm() != null && !bill.getTjkwbm().isEmpty()) {
isMatched &= Objects.equals(inventory.getTjkwbm(), bill.getTjkwbm()); isMatched = Objects.equals(inventory.getTjkwbm(), bill.getTjkwbm());
} }
//物料编码
if (bill.getWlbm() != null && !bill.getWlbm().isEmpty()) { //物料编码
isMatched &= Objects.equals(inventory.getWlbm(), bill.getWlbm()); if (bill.getWlbm() != null && !bill.getWlbm().isEmpty()) {
} isMatched = Objects.equals(inventory.getWlbm(), bill.getWlbm());
// 批次 }
if (bill.getPc() != null && !bill.getPc().isEmpty()) { // 批次
isMatched &= Objects.equals(inventory.getPc(), bill.getPc()); if (bill.getPc() != null && !bill.getPc().isEmpty()) {
} isMatched = Objects.equals(inventory.getPc(), bill.getPc());
// 跟踪号 }
if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) { // 跟踪号
isMatched &= Objects.equals(inventory.getTrackno(), bill.getTrackno()); if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) {
} isMatched = Objects.equals(inventory.getTrackno(), bill.getTrackno());
}
return isMatched; return isMatched;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());

4
nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java
View File

@@ -136,7 +136,7 @@ public class EasBillSchedule {
* 定时清空单据 * 定时清空单据
*/ */
@Async("taskExecutor") @Async("taskExecutor")
// @Scheduled(cron = "0/86400 * * * * *") //@Scheduled(cron = "0/86400 * * * * *")
public void autoDeleteTask() { public void autoDeleteTask() {
LocalDate threeMonthsAgo = LocalDate.now().minusMonths(3); LocalDate threeMonthsAgo = LocalDate.now().minusMonths(3);
String days = threeMonthsAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String days = threeMonthsAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
@@ -158,7 +158,7 @@ public class EasBillSchedule {
* 首页信息推送 * 首页信息推送
*/ */
@Async("taskExecutor") @Async("taskExecutor")
@Scheduled(cron = "0/4 * * * * *") //@Scheduled(cron = "0/4 * * * * *")
public void sendHomeInfoTask() { public void sendHomeInfoTask() {
//StopWatch stopWatch = new StopWatch(); //StopWatch stopWatch = new StopWatch();
//stopWatch.start(); //stopWatch.start();