From 04908371e0955028fadedfa73d94cbe270474344 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 31 七月 2025 15:19:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 7db3935..33c49a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -219,6 +219,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -290,6 +293,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -782,6 +788,9 @@
                     .eq("stn_no", param.getOutSite())
                     .eq("crn_no", locMast.getCrnNo());
             StaDesc staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+            }
             Integer sourceStaNo = staDesc.getCrnStn();
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -841,6 +850,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -912,6 +924,9 @@
                         .eq("stn_no", param.getOutSite())
                         .eq("crn_no", locMast.getCrnNo());
                 StaDesc staDesc = staDescService.selectOne(wrapper);
+                if (Cools.isEmpty(staDesc)) {
+                    throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+                }
                 Integer sourceStaNo = staDesc.getCrnStn();
                 if (Cools.isEmpty(sourceStaNo)) {
                     throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -1090,6 +1105,9 @@
                     .eq("stn_no", param.getOutSite())
                     .eq("crn_no", locMast.getCrnNo());
             StaDesc staDesc = staDescService.selectOne(wrapper);
+            if (Cools.isEmpty(staDesc)) {
+                throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+            }
             Integer sourceStaNo = staDesc.getCrnStn();
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -1401,7 +1419,7 @@
     public void cancelWrkMast(String workNo, Long userId) {
         Date now = new Date();
         WrkMast wrkMast = wrkMastService.selectById(workNo);
-        if (Cools.isEmpty(wrkMast)){
+        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()>12 || (wrkMast.getWrkSts()>3 && wrkMast.getWrkSts()<5)){
             throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪");
         }
         if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){

--
Gitblit v1.9.1