From e4b98b893b7287120018d60ee7f2d824940280e9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 九月 2025 09:57:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 44a69da..596db23 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -72,7 +72,11 @@
@Autowired
private WrkMastMapper wrkMastMapper;
@Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@Autowired
private WaitPakinMapper waitPakinMapper;
@Autowired
@@ -91,8 +95,6 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private WrkMastService wrkMastService;
- @Autowired
- private WrkMastLogService wrkMastLogService;
@Autowired
private ConfigService configService;
@Autowired
@@ -2081,7 +2083,17 @@
WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
// if (null == wrkMast || wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) { continue; }
if (null == wrkMast) {
- continue;
+ List<WrkMastLog> wrkMastLogs = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>()
+ .eq("wrk_no", staProtocol.getWorkNo())
+ .orderBy("modi_time", false)
+ );
+ if (wrkMastLogs.isEmpty()) {
+ continue;
+ }
+
+ WrkMastLog wrkMastLog = wrkMastLogs.get(0);
+ wrkMast = new WrkMast();
+ wrkMast.sync(wrkMastLog);
}
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�:鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�");
wrkMasts.add(wrkMast);
@@ -2203,6 +2215,48 @@
// , wrkDetl.getOrderNo()
// , wrkDetl.getCstateid$()
// )));
+ }else {
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkMast.getWrkNo());
+ if(!wrkDetlLogs.isEmpty()) {
+ WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);
+
+ double anfme = 0D;
+ double weight = 0D;
+ for (WrkDetlLog detl : wrkDetlLogs) {
+ anfme += detl.getAnfme();
+ weight += detl.getWeight();
+ wrkDetlLog.setAnfme(anfme);
+ wrkDetlLog.setWeight(weight);
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", wrkMast.getSourceLocNo()));
+ double totalAnfme = 0D;
+ double totalWeight = 0D;
+ for (LocDetl locDetl : locDetls) {
+ totalAnfme += locDetl.getAnfme();
+ totalWeight += locDetl.getWeight();
+ }
+ wrkDetlLog.setStockNum(totalAnfme);
+ wrkDetlLog.setStockNum2(totalWeight);
+
+ ledCommand.getMatDtos().add(new MatDto(
+ wrkDetlLog.getMatnr()
+ , wrkDetlLog.getMaktx()
+ , wrkDetlLog.getAnfme()
+ , wrkDetlLog.getWeight()
+ , wrkDetlLog.getStockNum()
+ , wrkDetlLog.getStockNum2()
+ , wrkDetlLog.getSpecs()
+ , wrkDetlLog.getSku()
+ , wrkDetlLog.getZpallet()
+ , wrkDetlLog.getModel()
+ , wrkDetlLog.getSupp()
+ , wrkDetlLog.getKpCstmrName()
+ , wrkDetlLog.getOrderNo()
+ , wrkDetlLog.getCstateid$()
+ ));
+ }
}
}
--
Gitblit v1.9.1