From 22094a20a803866201e0b2dd7ff7c266871ffe52 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 10:18:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 32d69a1..7ffad1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -55,7 +55,13 @@
@Override
public WrkDetl devpPackNo(Integer workNo) {
- return this.baseMapper.devpPackNo(workNo);
+ WrkDetl wrkDetl=this.baseMapper.devpPackNo1(workNo);
+ if(Cools.isEmpty(wrkDetl)){
+ return this.baseMapper.devpPackNo(workNo);
+ }else {
+ return wrkDetl;
+ }
+
}
@Override
--
Gitblit v1.9.1