From 577ba7f365c4dcb94053618681280150086d3c17 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 19 七月 2024 22:27:47 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 97c0c6d..0583f34 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -4958,6 +4958,17 @@ if (basJarMastList.size()!=integer){ log.error("{}鍙风~鍖栫綈纭寲瀹屾垚鍚庡紑闂ㄥ畬鎴愪慨鏀圭~鍖栨。妗堢姸鎬佺粨鏋滄暟閲忎笉涓�鑷达紒锛侊紒鏌ヨ璧勬枡鏁伴噺={}锛屾洿鏂拌繑鍥炴暟閲�={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer); } + } else if (wrkMastExecute.getIoType()==2 && jarMastByWrkNo.getStatus()==5){ + List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarMastByWrkNo.getJarId(), new ArrayList<Integer>() {{ + add(4);//纭寲瀹屾垚 + }}); + if (basJarMastList.isEmpty()){ + continue; + } + Integer integer = basJarMastService.updateStatus(jarMastByWrkNo.getJarId(), 4, 5); + if (basJarMastList.size()!=integer){ + log.error("{}鍙风~鍖栫綈纭寲瀹屾垚鍚庡紑闂ㄥ畬鎴愪慨鏀圭~鍖栨。妗堢姸鎬佺粨鏋滄暟閲忎笉涓�鑷达紒锛侊紒鏌ヨ璧勬枡鏁伴噺={}锛屾洿鏂拌繑鍥炴暟閲�={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer); + } } else { if (!basJarMastService.updateById(jarMastByWrkNo)){ log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触"); @@ -5314,7 +5325,7 @@ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{ add(4); }}); - if (basJarMastList.size() != 7){ + if (basJarMastList.size() != jarMaxLoc){ return false; } @@ -5353,7 +5364,7 @@ log.error("{}鍙风~鍖栫綈鏌ヨ璁惧妗f鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo()); return false; } - if (basJar.getJarCount()!=7){ + if (!basJar.getJarCount().equals(jarMaxLoc)){ log.error("{}鍙风~鍖栫綈鏌ヨ璁惧搴撳瓨鏁板紓甯革紒锛侊紒搴撳瓨寰呭叆鏁帮細{}",jarProtocol.getJarNo(),basJar.getJarCount()); return false; } @@ -5391,7 +5402,7 @@ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{ add(6); }}); - if (basJarMastList.size() != 7){ + if (basJarMastList.size() != jarMaxLoc){ return false; } if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0){ @@ -8080,7 +8091,7 @@ } public synchronized Integer jarGetStartStaNo(Integer staNo) { try { - int[] jarNos=new int[]{1,2,3,4};//(607鍒嗛厤纭寲缃�) + int[] jarNos=new int[]{4,2,3,1};//(607鍒嗛厤纭寲缃�) ArrayList<Integer> staNos = new ArrayList<Integer>() {{ add(607);add(608);add(609);add(610);add(611);add(612); add(613);add(614);add(615);add(616);add(617);add(618); @@ -8099,7 +8110,7 @@ if (basJarMastList.isEmpty()){ continue; } - if (basJarMastList.size()>0 && basJarMastList.size()<7){ + if (basJarMastList.size()>0 && basJarMastList.size()<jarMaxLoc){ jarNoList.add(jarNo); } } @@ -8153,7 +8164,7 @@ } } } - if (count<7){ + if (count<jarMaxLoc){ return basJar.getEntStaNo$(); } } -- Gitblit v1.9.1