From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0
---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 7d038fe..aeed90b 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -652,7 +652,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWeight(crnProtocol.getWeight());
if (wrkMastService.updateById(wrkMast)) {
- CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getCrnNo(), crnProtocol.getTaskNo());
+ CrnCommand resetCommand = crnThread.getResetCommand(crnProtocol.getTaskNo(), crnProtocol.getCrnNo());
if (i>-1){
resetCommand.setLocNo(locNo);
resetCommand.setIndex(i);
--
Gitblit v1.9.1