From f4be36f30a802e70038bde438d1689eb749032fd Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 22 十一月 2024 08:49:19 +0800
Subject: [PATCH] 采用定长的线程池,防止定时任务的异常导致大量线程被占用

---
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index d22feea..b847c98 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -284,8 +284,13 @@
         if (Cools.isEmpty(mat)) {
             throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�");
         }
+        OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), detlDto.getBatch(), detlDto.getCsocode());
         AgvWaitPakin waitPakin = new AgvWaitPakin();
         waitPakin.sync(mat);
+        if (orderDetl != null) {
+            waitPakin.setWeight(orderDetl.getWeight());
+            waitPakin.setVolume(orderDetl.getVolume());
+        }
         waitPakin.setOrderNo(orderNo);   // 鍗曟嵁缂栧彿
         waitPakin.setBatch(detlDto.getBatch());     // 搴忓垪鐮�
         //waitPakin.setZpallet(zpallet);   // 璐ф灦鐮�
@@ -844,7 +849,7 @@
                 throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
             }
             // 鍚屾璁㈠崟鏁伴噺
-            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).in("source",18,31,34));
+            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).eq("order_no",agvWrkDetl.getOrderNo()).in("source",18,31,34));
             orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
             if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderDetl.getOrderNo()).eq("matnr", orderDetl.getMatnr()).eq("three_code",orderDetl.getThreeCode()))){
                 throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+orderDetl.getOrderNo()+orderDetl.getMatnr());

--
Gitblit v1.9.1