From f16930b8d6b1b4f4c6de7638b40e2d65872aa094 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 3 Jul 2023 08:57:27 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=87=BA=E5=85=A5=E7=83=98=E7=AE=B1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/sch/tasks/InHotTask.java    | 17 +++++++++++++----
 .../java/org/nl/wms/sch/tasks/OutHotTask.java   | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

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 65e2437a9..54a18ad61 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
@@ -185,13 +185,22 @@ public class InHotTask extends AbstractAcsTask {
                 jsonHotIvt.put("update_optid", currentUserId);
                 jsonHotIvt.put("update_optname", currentUsername);
                 jsonHotIvt.put("update_time", DateUtil.now());
-                //hotIvtTab.update(jsonHotIvt);
-                log.info("mybatis执行update语句！");
-                HotMapper hotMapper = SpringContextHolder.getBean(HotMapper.class);
-                hotMapper.updateHotByObject(jsonHotIvt);
+
+                log.info("入烘箱wql执行update语句！");
+                hotIvtTab.update(jsonHotIvt);
                 JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code3") + "'").uniqueResult(0);
                 log.info("更新完后烘箱库存为：-----------------" + update_ivt.toString());
 
+                log.info("入烘箱mybatis执行update语句！");
+                HotMapper hotMapper = SpringContextHolder.getBean(HotMapper.class);
+                hotMapper.updateHotByObject(jsonHotIvt);
+                JSONObject update_ivt2 = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code3") + "'").uniqueResult(0);
+                log.info("更新完后烘箱库存为：-----------------" + update_ivt2.toString());
+
+                if (!update_ivt2.getString("container_name").equals(update_ivt.getString("container_name"))){
+                    log.info("入烘箱WQL更新不成功！");
+                }
+
                 hot_point_code = jsonHotIvt.getString("ext_code");
             }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
index 23a7eafb6..1a600ad49 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
@@ -14,7 +14,9 @@ import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
+import org.nl.wms.pda.mps.service.mapper.HotMapper;
 import org.nl.wms.sch.AcsTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -127,7 +129,21 @@ public class OutHotTask extends AbstractAcsTask {
             jsonHotIvt.put("update_optid", currentUserId);
             jsonHotIvt.put("update_optname", currentUsername);
             jsonHotIvt.put("update_time", DateUtil.now());
+
+            log.info("出烘箱wql执行update语句！");
             hotIvtTab.update(jsonHotIvt);
+            JSONObject update_ivt = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+            log.info("更新完后烘箱库存为：-----------------" + update_ivt.toString());
+
+            log.info("出烘箱mybatis执行update语句！");
+            HotMapper hotMapper = SpringContextHolder.getBean(HotMapper.class);
+            hotMapper.updateHotByObject(jsonHotIvt);
+            JSONObject update_ivt2 = hotIvtTab.query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
+            log.info("更新完后烘箱库存为：-----------------" + update_ivt2.toString());
+
+            if (!update_ivt2.getString("container_name").equals(update_ivt.getString("container_name"))){
+                log.info("出烘箱WQL更新不成功！");
+            }
 
             // 将出烘箱信息发送给mes
             JSONObject param = new JSONObject();