rev:任务与单据：下发任务更新单据与acs反馈任务更新单据 互斥导致超时

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");

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 + "'");

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");

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 -->