From e63255bf33f3835e99e30efaf3c6a3fc7fc4d1ba Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 29 五月 2025 16:10:52 +0800
Subject: [PATCH] 修改自动化代码
---
lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java
index 5847936..5c649d2 100644
--- a/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java
+++ b/lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java
@@ -134,43 +134,49 @@
if (itemMap.containsKey("runningStatus")) {
sql = sql + "'" + itemMap.get("runningStatus").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
}
//spindleSpeed
if (itemMap.containsKey("spindleSpeed")) {
sql = sql + "'" + itemMap.get("spindleSpeed").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
+ }
+ //feedRatio
+ if (itemMap.containsKey("feedRatio")) {
+ sql = sql + "'" + itemMap.get("feedRatio").getItemValue() + "', ";
+ }else {
+ sql = sql + "NULL, ";
}
//runDuration
if (itemMap.containsKey("runDuration")) {
sql = sql + "'" + itemMap.get("runDuration").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
}
//spindleDuration
if (itemMap.containsKey("spindleDuration")) {
sql = sql + "'" + itemMap.get("spindleDuration").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
}
//progName
- if (itemMap.containsKey("spindleSpeed")) {
- sql = sql + "'" + itemMap.get("spindleSpeed").getItemValue() + "', ";
+ if (itemMap.containsKey("progName")) { // 淇涓� "progName"
+ sql = sql + "'" + itemMap.get("progName").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
}
//progStatus
if (itemMap.containsKey("progStatus")) {
sql = sql + "'" + itemMap.get("progStatus").getItemValue() + "', ";
} else {
- sql = sql + null + ", ";
+ sql = sql + "NULL, ";
}
//toolNo
if (itemMap.containsKey("toolNo")) {
- sql = sql + "'" + itemMap.get("toolNo").getItemValue() + "' ";
+ sql = sql + "'" + itemMap.get("toolNo").getItemValue() + "' ";
} else {
- sql = sql + null;
+ sql = sql + "NULL";
}
sql = sql + "); \n";
--
Gitblit v1.9.3