From eb309a4d81a3b4ca666a403e4f8dfd8ecaec609a Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期六, 28 六月 2025 12:55:33 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 3f263f5..cd335fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1423,7 +1423,7 @@
                                         (int) crnProtocol.getAlarm(),    // 寮傚父鐮�
                                         errName,    // 寮傚父
                                         1,    // 寮傚父鎯呭喌
-                                        now,    // 娣诲姞鏃堕棿
+                                        taskWrk.getCreateTime(),    // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
                                         null,    // 娣诲姞浜哄憳
                                         now,    // 淇敼鏃堕棿
                                         null,    // 淇敼浜哄憳
@@ -1690,7 +1690,10 @@
             if (taskWrk != null) {
                 Integer stano = staProtocol.getStaNo();
                 if (staProtocol.getSiteId() == 1004 || staProtocol.getSiteId()==1020){
-
+                    // 鍒ゆ柇鏄惁婊¤冻鍙栬揣鏉′欢
+                    if (!staProtocol.isLoading()) {
+                        return null;
+                    }
                     // 灏哄妫�娴嬪紓甯�
                     boolean back = false;
                     String errMsg = "-";

--
Gitblit v1.9.1