From e00d5d46e95e74087feb71c6cc8cec69d073f050 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 08:36:06 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 651a4e5..3afaa70 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -58,10 +58,10 @@
         if (!Cools.isEmpty(order1)){
             return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗f姝e湪杞巻鍙叉。妗堬紒锛侊紒");
         }
-        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-        if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
-            return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗f姝e湪杞巻鍙叉。妗堬紒锛侊紒");
-        }
+//        List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+//        if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
+//            return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗f姝e湪杞巻鍙叉。妗堬紒锛侊紒");
+//        }
 
         // 鍗曟嵁鏄庣粏妗�
         List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -200,7 +200,7 @@
                     continue;
                 }
                 if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
-                    settle = 99L;//浜屾鐢熸垚鍗曟嵁
+                    settle = 98L;//浜屾鐢熸垚鍗曟嵁鍓嶇疆  鎵嬪姩鐢熸垚
                 }
                 String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
                 pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getQty()));

--
Gitblit v1.9.1