Browse Source

opt:修改正式环境相关

test-20240527
gongbx 7 months ago
parent
commit
870124ee86
  1. 13
      nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/EasOutInBillDetailServiceImpl.java
  2. 4
      nlsso-server/src/main/java/org/nl/wms/schedule/EasBillSchedule.java

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

@ -72,27 +72,28 @@ public class EasOutInBillDetailServiceImpl extends ServiceImpl<EasOutInBillDetai
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()) { if (bill.getWlbm() != null && !bill.getWlbm().isEmpty()) {
isMatched &= Objects.equals(inventory.getWlbm(), bill.getWlbm()); isMatched = Objects.equals(inventory.getWlbm(), bill.getWlbm());
} }
// 批次 // 批次
if (bill.getPc() != null && !bill.getPc().isEmpty()) { if (bill.getPc() != null && !bill.getPc().isEmpty()) {
isMatched &= Objects.equals(inventory.getPc(), bill.getPc()); isMatched = Objects.equals(inventory.getPc(), bill.getPc());
} }
// 跟踪号 // 跟踪号
if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) { if (bill.getTrackno() != null && !bill.getTrackno().isEmpty()) {
isMatched &= Objects.equals(inventory.getTrackno(), bill.getTrackno()); isMatched = Objects.equals(inventory.getTrackno(), bill.getTrackno());
} }
return isMatched; return isMatched;
}) })

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

@ -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();

Loading…
Cancel
Save