From 3dd2b439ffa1eb8c3bad1fff9a71055138e0b957 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 31 十月 2023 10:56:02 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/common/service/CommonService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f5b703e..6419cc6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -344,6 +344,11 @@
break;
}
}
+
+ if (locMast == null) {
+ //鍗曞搧鎵句笉鍒板簱浣嶏紝鍏佽灏濊瘯浠庢贩鏀惧尯鍩熶腑杩涜鎼滅储
+ locMast = getLocNoStepMixed(matNos, locTypeDto, 1);
+ }
}
return locMast;
--
Gitblit v1.9.1