From 34b2641f4a039d4e1dcf8f4a93dd7928616c4b11 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 15:17:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9420bc0..6026fd8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -343,6 +343,14 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ if (!Cools.isEmpty(param.getBatch())) {
+ wrkMast.setBatch(param.getBatch());
+ }
+
+ if (!Cools.isEmpty(param.getBatchSeq())) {
+ wrkMast.setBatchSeq(param.getBatchSeq());
+ }
+
if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
if(basCrnp == null) {
@@ -446,7 +454,7 @@
break;
}
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
return targetStationId;
@@ -478,7 +486,7 @@
break;
}
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
return finalSourceStationId;
--
Gitblit v1.9.1