From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index cac671e..4c3374f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -398,7 +398,7 @@
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
}
- return null;
+ return this.sourceLocNo;
}
public String getIoTime$(){
--
Gitblit v1.9.1