From d3cb0e841e6585aa84a45f18bb30965db8d1a6aa Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 15:48:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 977a63a..ddde299 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -73,7 +73,7 @@
         if (complete) {
             for (OrderDetl orderDetl : orderDetls) {
                 //鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗f椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
-                if (orderDetl.getBatch().equals("")){
+                if (!Cools.isEmpty(orderDetl.getBatch()) && orderDetl.getBatch().equals("")){
                     orderDetl.setBatch(null);
                     orderDetlService.updateById(orderDetl);
                 }
@@ -119,6 +119,7 @@
                 throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
             }
             for (DetlDto detlDto : detlDtos) {
+                if (detlDto.getMatnr().substring(0,1).equals("B")) continue;
                 // 淇敼璁㈠崟鏄庣粏鏁伴噺
                 if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");

--
Gitblit v1.9.1