From ea12b685190254228d88a0de261b1e399fcbf15b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydwcs_cs20251105
---
src/main/java/com/zy/asrs/controller/CrnController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 3fc7a9d..bf00e75 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -335,6 +335,10 @@
vo.setTaskComplete(crnThread.getResetFlag()? "浠诲姟瀹屾垚涓嬪彂绛夊緟":"-");
vo.setDemo(SystemProperties.WCS_RUNNING_STATUS_DEMO.get()? "寮�鍚�":"鍏抽棴");
vo.setDemoValue(SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE);
+ if (vo.getHpMk().equals("N")){
+ vo.setDemo("鏈紑鍚�");
+ vo.setDemoValue(0);
+ }
}
return R.ok().add(list);
}
--
Gitblit v1.9.1