From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
index 6ab4f2a..2766cf0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
@@ -76,8 +76,9 @@
}
if (complete) {
for (OrderDetl orderDetl : orderDetls) {
- //鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
- if (orderDetl.getBatch().equals("")){
+ if (Cools.isEmpty(orderDetl.getBatch())){
+ orderDetlService.updateById(orderDetl);
+ }else if (orderDetl.getBatch().equals("")){//鐢熸垚鍗曟嵁鍜屽叆搴撻�氱煡妗ｆ椂锛岀粰batch涓虹┖鐨勬槑缁嗚祴浜嗕竴涓� =""锛� 鐜板湪鏀逛负null锛屽洖浼犵敤
orderDetl.setBatch(null);
orderDetlService.updateById(orderDetl);
}
@@ -166,9 +167,8 @@
}
@Override
- public List<OrderCheck> selectToBeHistoryOrder(boolean isERP) {
- int settle = isERP ? 6 : 4;
- return this.baseMapper.selectToBeHistoryOrder(settle);
+ public List<OrderCheck> selectToBeHistoryOrder() {
+ return this.baseMapper.selectToBeHistoryOrder();
}
@Override
--
Gitblit v1.9.1