From 4a0fae031779856d60c7366139fc8601e121d98a Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Mon, 3 Jul 2023 13:59:20 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E7=83=98=E7=AE=B1?= =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E6=9F=A5=E8=AF=A2=E5=AE=9A=E6=97=B6=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/manage/AutoQueryDeviceStatus.java | 10 ++++++---- .../src/main/java/org/nl/wms/sch/tasks/InHotTask.java | 2 +- .../src/main/java/org/nl/wms/sch/tasks/URLEnum.java | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java index 3d0af79f2..b34c8f1a9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryDeviceStatus.java @@ -12,6 +12,8 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.sch.tasks.URLEnum; import org.springframework.stereotype.Component; +import java.util.HashMap; + @Slf4j @Component @RequiredArgsConstructor @@ -33,8 +35,8 @@ public class AutoQueryDeviceStatus { for (int i = 0; i < de_rows.size(); i++) { JSONObject row = de_rows.getJSONObject(i); String device_code = row.getString("device_code"); - JSONObject point_jo = ivtTab.query("point_code = '" + device_code + "'").uniqueResult(0); - point_jo.put("temperature", row.getString("temperature")); + HashMap map = new HashMap<>(); + map.put("temperature", row.getString("temperature")); //获取倒计时,分,秒 String countdown_house = row.getString("countdown_house"); String countdown_min = row.getString("countdown_min"); @@ -50,8 +52,8 @@ public class AutoQueryDeviceStatus { countdown_sec = "0"; } String last_time = countdown_house + "小时" + countdown_min + "分钟"; - point_jo.put("last_time", last_time); - ivtTab.update(point_jo); + map.put("last_time", last_time); + ivtTab.update(map,"point_code = '"+device_code+"'"); } } catch (Exception e) { log.info(e.getMessage()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index 54a18ad61..40859e1fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -188,7 +188,7 @@ public class InHotTask extends AbstractAcsTask { log.info("入烘箱wql执行update语句!"); hotIvtTab.update(jsonHotIvt); - JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code3") + "'").uniqueResult(0); + JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); log.info("更新完后烘箱库存为:-----------------" + update_ivt.toString()); log.info("入烘箱mybatis执行update语句!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java index 5739cc8a8..7436f53a7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/URLEnum.java @@ -19,9 +19,9 @@ public enum URLEnum { ACS_URL_A4("A4", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A4").getValue()), ACS_URL_LK("LK", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_LK").getValue()); - private String product_area; + private final String product_area; - private Supplier acs_url; + private final Supplier acs_url; public static String find(String product_area) { for (URLEnum value : URLEnum.values()) {