From 0a05bcf1064431e7f2ba84856d5d0dad0cf48ecc Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 21 五月 2024 15:59:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 90 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index f2d4d60..e10298d 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -177,38 +177,56 @@
}
sign = true;
// 鑾峰彇搴撲綅
- LocMast locMastS = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","D").eq("crn_no",crnNo));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
+ for (LocMast locMastS : locMasts){
- if (Cools.isEmpty(locMastS)) {
+ if (Cools.isEmpty(locMastS)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
- log.error(crnNo+"鍙峰爢鍨涙満鏃犵┖鏉匡紒");
- sign=false;
- }
- if (sign && !locMastS.getLocSts().equals("D")){
+ log.error(crnNo+"鍙峰爢鍨涙満鏃犵┖鏉匡紒");
+ sign=false;
+ break;
+ }
+ if (sign && !locMastS.getLocSts().equals("D")){
// throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
- log.error(crnNo+"鍙峰爢鍨涙満"+"鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMastS.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMastS.getLocSts()+"-"+locMastS.getLocSts$());
- sign=false;
- }
- locNoList.add(locMastS.getLocNo());
+ log.error(crnNo+"鍙峰爢鍨涙満"+"鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMastS.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMastS.getLocSts()+"-"+locMastS.getLocSts$());
+ sign=false;
+ }
+ locNoList.add(locMastS.getLocNo());
- //灏忔枡绠变即鐢熷嚭搴�
- if (Utils.getRow(locMastS.getLocNo())<=8){
- String locNoOther = staNoOther(locMastS.getLocNo());
- LocMast locMastOther = locMastService.selectById(locNoOther);
- if (locMastOther.getLocSts().equals("D")){
- locNoList.add(locNoOther);
+ //灏忔枡绠变即鐢熷嚭搴�
+ if (Utils.getRow(locMastS.getLocNo())<=8){
+ String locNoOther = staNoOther(locMastS.getLocNo());
+ LocMast locMastOther = locMastService.selectById(locNoOther);
+
+ if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
+ if (locMastOther.getLocSts().equals("D")){
+ locNoList.add(locNoOther);
+ }
+ }else {
+ sign=false;
+ }
+ }else if (Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
+ String locNoOther = staNoOther(locMastS.getLocNo());
+ LocMast locMastOther = locMastService.selectById(locNoOther);
+ if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
+ if (locMastOther.getLocSts().equals("D")){
+ locNoList.add(locNoOther);
+ }
+ }else {
+ sign=false;
+ }
}
- }
- if (sign) {
- EmptyPlateOutParam param = new EmptyPlateOutParam();
- param.setOutSite(staNo);
- param.setLocNos(locNoList);
- try{
- workService.emptyPlateOut(param, 9999L);
- }catch (Exception e){
- log.error("浜屾ゼ灏忔枡绠辫嚜鍔ㄨˉ绌烘澘澶辫触锛侊紒寮傚父鍘熷洜锛�"+e);
+ if (sign) {
+ EmptyPlateOutParam param = new EmptyPlateOutParam();
+ param.setOutSite(staNo);
+ param.setLocNos(locNoList);
+ try{
+ workService.emptyPlateOut(param, 9999L);
+ }catch (Exception e){
+ log.error("浜屾ゼ灏忔枡绠辫嚜鍔ㄨˉ绌烘澘澶辫触锛侊紒寮傚父鍘熷洜锛�"+e);
+ }
+ return SUCCESS;
}
- return SUCCESS;
}
}
if (!sign){
@@ -224,10 +242,20 @@
public String staNoOther(String locNo){
int row = Utils.getRow(locNo);
- if (row%4==0 || row%4==1){
- return getDeepLoc2(locNo,row);
+ if (row<=8){
+ if (row%4==0 || row%4==1){
+ return getDeepLoc2(locNo,row);
+ }else {
+ return getDeepLoc(locNo,row);
+ }
+ }else if (row>=21 && row<=27){
+ if (row==21 || row==24 || row==27){
+ return getDeepLoc2(locNo,row);
+ }else {
+ return locNo;
+ }
}else {
- return getDeepLoc(locNo,row);
+ return locNo;
}
}
@@ -235,9 +263,9 @@
* 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
*/
public static String getDeepLoc2(String shallowLoc,int row) {
- if (row == 1 || row == 5) {
+ if (row == 1 || row == 5 || row==21) {
return Utils.zerofill(String.valueOf(row+1), 2) + shallowLoc.substring(2);
- } else if (row == 4 || row == 8) {
+ } else if (row == 4 || row == 8 || row == 24 || row == 27) {
return Utils.zerofill(String.valueOf(row-1), 2) + shallowLoc.substring(2);
}else {
return null;
--
Gitblit v1.9.1