From dc8367b8e744f9f02b606597a2c3a3b0783afc19 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:44:47 +0800
Subject: [PATCH] 地图数据json文件改为常量存储
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 1e9f89b..60e9268 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -73,8 +73,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);
}
@@ -202,4 +203,15 @@
updateSettle(orderId,settle,1L);
}
+ @Override
+ public List<Order> selectToBeHistoryOrder(boolean isERP) {
+ int settle = isERP ? 6 : 4;
+ return this.baseMapper.selectToBeHistoryOrder(settle);
+ }
+
+ @Override
+ public List<OrderListDTO> selectAllorderNo() {
+ return this.baseMapper.selectAllorderNo();
+ }
+
}
--
Gitblit v1.9.1