From fffb817cc80e3a20913e1c8073e39daaa8c58f63 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 16:09:56 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 14 +++++++-------
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 2 +-
rsf-server/src/main/resources/application-dev.yml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index b986c84..30b654a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -226,13 +226,13 @@
}
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.asnOrderService.removeById(order.getId())) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
+// if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+// .eq(WkOrderItem::getOrderId, order.getId()))) {
+// throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+// }
+// if (!this.asnOrderService.removeById(order.getId())) {
+// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+// }
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 8765df6..abf41be 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -220,7 +220,7 @@
BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
.in(BasStation::getStationName, stationSet)
- .eq(BasStation::getSType, sType)
+// .eq(BasStation::getSType, sType)
.notIn(!stas.isEmpty(), BasStation::getStationName, stas)
.last("LIMIT 1"));
stations.add(basStation);
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 302cbfe..496df82 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
- url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
--
Gitblit v1.9.1