From 405b0a0392f74dd6e35c8a253a52e151106c9e32 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Thu, 10 Nov 2022 22:35:22 +0800
Subject: [PATCH] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java  | 2 ++
 .../src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql | 1 +
 .../org/nl/wms/sch/manage/buss/SendMaterialTask.java     | 9 +++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
index 59e9815..218d749 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
@@ -286,7 +286,9 @@ public class WmsToJnServiceImpl implements WmsToJnService {
         }
         String method = "/InsertPressInfo";
         String task_id = (String) whereJson.get("task_id");
+        String next_point_code = (String) whereJson.get("next_point_code");
         JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "1").addParam("task_id", task_id).process().uniqueResult(0);
+        jsonObject.put("LOCDESC",next_point_code);
         JSONObject obj = new JSONObject();
         obj.put("ticker", "WLXT");
         obj.put("stringData", jsonObject.toString());
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql
index 85da0d4..833b448 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql
@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					                         TYPEAS s_string
 	输入.task					                         TYPEAS s_string
+	输入.task_id					                         TYPEAS s_string
     输入.record_id					                     TYPEAS s_string
     输入.vehicle_code					                 TYPEAS s_string
 
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
index 8b116b8..f0f5c82 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
@@ -122,20 +122,21 @@ public class SendMaterialTask extends AbstractAcsTask {
             startPointObj.put("vehicle_code", "");
             pointTab.update(startPointObj);
             taskTab.update(jsonTask);
-            String point_type = endpointObj.getString("point_type");
+            String area_type = endpointObj.getString("area_type");
             //1压机下料货架调用接口反馈给嘉耐 搬运任务
             //2是出窑缓存货架，调用反馈入冷却缓冲区
             //3是木托盘缓存货架，调用反馈半木托入临时库区
             JSONObject jo = new JSONObject();
             jo.put("task_id", task_id);
+            jo.put("next_point_code", jsonTask.getString("next_point_code"));
             WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
-            if (StrUtil.equals(point_type,AreaEnum.RYHCHJ.getCode())){
+            if (StrUtil.equals(area_type,AreaEnum.RYHCHJ.getCode())){
                  wmsToJnServiceImpl.feedBackCarryRecord(jo);
             }
-            if (StrUtil.equals(point_type,AreaEnum.CYHCHJ.getCode())){
+            if (StrUtil.equals(area_type,AreaEnum.CYHCHJ.getCode())){
                  wmsToJnServiceImpl.feedBackInWait(jo);
             }
-            if (StrUtil.equals(point_type,AreaEnum.MTPQ.getCode())){
+            if (StrUtil.equals(area_type,AreaEnum.MTPQ.getCode())){
                  wmsToJnServiceImpl.feedBackInPartStock(jo);
             }