From a8df8ddebf3efc30b08af287b771d6db815bad63 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 12 八月 2025 10:44:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 5ccc4ad..4750a5d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
@@ -357,6 +358,8 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
+ }else {
+ log.info("鍗曟嵁鎵句笉鍒帮紝{}锛寋}",wrkDetl.getOrderNo(), JSON.toJSON(wrkDetl));
}
} catch (Exception ignore) {
log.error("fail", ignore);
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 3fe2ef9..82eae19 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -242,6 +242,8 @@
if (orderDetl.getQty() > orderDetl.getAnfme() && orderDetl.getQty() > orderDetl.getWorkQty()) {
log.info("淇閿欒鏁伴噺锛歿}", JSON.toJSON(orderDetl));
content.put("MainNum", orderDetl.getWorkQty());
+ } else if (orderDetl.getAnfme() == orderDetl.getWorkQty() && orderDetl.getQty() <= 0) {
+ content.put("MainNum", orderDetl.getWorkQty());
} else {
content.put("MainNum", orderDetl.getQty());
}
--
Gitblit v1.9.1