From 020f48adb61a0350924783c1b397bd381d20ddc8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs

---
 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