From 0de57810b956c28d911d01ee4c2cb0ccfab981ab Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 12 Dec 2023 10:59:43 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BB=BB=E5=8A=A1=E4=B8=8E=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8D=95=E6=8D=AE=E4=B8=8Eacs=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9B=B4=E6=96=B0=E5=8D=95=E6=8D=AE=20?=
 =?UTF-8?q?=E4=BA=92=E6=96=A5=E5=AF=BC=E8=87=B4=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java   | 1 -
 .../nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java  | 2 +-
 .../java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java     | 1 -
 mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml       | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
index 1632f9ee..8652dd49 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
@@ -111,7 +111,6 @@ public class FlourworkServiceImpl implements FlourworkService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void calledMater(JSONObject whereJson) {
         JSONObject dtlData = whereJson.getJSONObject("dtlData");
         String formuladtl_id = dtlData.getString("formuladtl_id");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
index 9a73872c..9dafe8c3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
@@ -929,7 +929,6 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void handdown(JSONObject whereJson) {
         //移库单主表
         WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv");
@@ -984,6 +983,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
                 throw new BadRequestException("任务下发失败，请稍后重试！");
             }
         }
+
         HashMap<String, String> map = new HashMap<>();
         map.put("bill_status", "20");
         wo_mst.update(map, "moveinv_id='" + moveinv_id + "'");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
index 6c4b7573..c965e72f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java
@@ -20,7 +20,6 @@ public class HandMoveStorAcsTask extends AbstractAcsTask {
      * @param status  代表wcs任务完成状态： //1:执行中,2:完成 ,3:acs取消
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void updateTaskStatus(JSONObject taskObj, String status) {
         //任务表
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
index 7bcceabf..bcc2752a 100644
--- a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
+++ b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml
@@ -3,7 +3,7 @@
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
-        <url>http://10.16.1.24:9200/_bulk</url>
+        <url>http://127.0.0.1:9200/_bulk</url>
         <index>${esIndex}</index>
         <type>whxr_log</type>
         <loggerName>es-logger</loggerName> <!-- optional -->