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 |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 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 79d683d..33c49a6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -172,7 +172,7 @@
             }
             if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
                 LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
-                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
+                if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo() , paramLocDetl.getPio()));
             }
         }
 
@@ -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("妫�绱㈡簮绔欏け璐�");
@@ -553,7 +559,7 @@
             wrkMast.setIoTime(now);
             wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
             wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
-            wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+            wrkMast.setIoPri(dto.getLocDetlDtos().get(0).getPio()); // 浼樺厛绾э細13
             wrkMast.setCrnNo(locMast.getCrnNo());
             wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
             wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -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+"宸ヤ綔妗ｄ笉瀛樺湪");
         }
         if (Cools.isEmpty(wrkMast.getLocNo()) && Cools.isEmpty(wrkMast.getSourceLocNo())){
@@ -1412,8 +1430,9 @@
             try{
                 wrkMastService.deleteById(wrkMast.getWrkNo());
                 List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-                if (!wrkDetls.isEmpty()){
-                    wrkDetlService.deleteById(wrkMast.getWrkNo());
+                if (!wrkDetls.isEmpty()) {
+//                    wrkDetlService.deleteById(wrkMast.getWrkNo());
+                    wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                 }
             }catch (Exception e){
                 throw new CoolException("鍙栨秷澶辫触锛屽紓甯�"+e);

--
Gitblit v1.9.1