From 2a610a7b1d04df61768567a5651fd34e7c99cde9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 三月 2024 12:55:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 54b3fff..56c67d2 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -217,9 +217,12 @@
}
Integer outSta = staNo.getDevNo();
- //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
+ //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负103
if(locMast.getCrnNo()==2){
- outSta = ioType == 101 ? 204 : 202;
+ outSta = 103;
+ //鍑哄簱绔欑偣涓�205锛�
+ }else if(staNo.getDevNo()==205){
+
}
// 鑾峰彇璺緞
@@ -517,12 +520,14 @@
LocMast loc = locMastService.selectById(locNo);
if (Cools.isEmpty(loc)){
throw new CoolException("鏈壘鍒板簱浣�");
- }
- if (loc.getPackStatus()==2){
+ }else if (sourceLoc.getPackStatus()==2){
throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
- }
- if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
- throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
+// }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
+// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
+ }else if(sourceLoc.getPackStatus()!=3){
+ if(sourceLoc.getLocType1()==loc.getLocType1()){
+ throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬬浉鍚�");
+ }
}
Date now = new Date();
// 鑾峰彇宸ヤ綔鍙�
@@ -533,8 +538,8 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(10D);
- wrkMast.setCrnNo(sourceLoc.getCrnNo());
+ wrkMast.setIoPri(sourceLoc.getPackStatus()==4? 9D:10D);
+ wrkMast.setCrnNo(1);
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
--
Gitblit v1.9.1