From 3885879e740b34868b7927a6b801e070843f2124 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 20 十一月 2024 11:37:42 +0800
Subject: [PATCH] mes对接

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |    4 ++--
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 55b88d9..8976c7f 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -82,7 +82,7 @@
 
     //@Scheduled(cron = "* 0/5 * * * ? ")
     @Scheduled(cron = "0/30 * * * * ? ")
-    @Async("orderThreadPool")
+    //@Async("orderThreadPool")
     public synchronized void  reportOrder() {
         List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
         orderList.forEach(order -> {
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 9c4da29..84951b7 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -746,9 +746,9 @@
 
             } else {
                 MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
-                mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
+                //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                 mesPakinReportParam.setBizType("0");
-                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getBatch(), agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
+                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
                 mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
 
                 doHttpRequest(mesPakinReportParam, getMesTokenInfo(), "涓婃姤mes鍏ュ簱淇℃伅", url, pakinReportPath, null, "127.0.0.1");

--
Gitblit v1.9.1