From e47b30ba51de51df6210910e50d790614a9b30e1 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期四, 27 六月 2024 20:38:50 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | 5 +++++ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 34 +++++++++++++++++++--------------- src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | 2 ++ src/main/java/com/zy/asrs/service/WrkMastExecuteService.java | 2 ++ src/main/resources/mapper/WrkMastExecuteMapper.xml | 7 +++++++ 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java index 2e52a50..9546e56 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java @@ -29,6 +29,8 @@ Integer selectNoStart(@Param("jarRegin") Integer jarRegin); + Integer selectMoveStart(@Param("jarRegin") Integer jarRegin); + WrkMastExecute selectStart(@Param("jarRegin") Integer jarRegin); } diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java index 8883731..ddfbf00 100644 --- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java +++ b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java @@ -21,6 +21,8 @@ Integer selectNoStart(Integer jarRegin); + Integer selectMoveStart(Integer jarRegin); + WrkMastExecute selectStart(Integer jarRegin); } 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 c5a2c39..f9550bc 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -5118,10 +5118,10 @@ return false; } -// //鍒ゆ柇灏忚溅鐘舵�� -// if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){ -// return false; -// } + //鍒ゆ柇灏忚溅鐘舵�� + if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),2,SteStatusType.IDLE)){ + return false; + } //鍒ゆ柇RGV鐘舵�� JarSlave.RgvStn rgvStn = jarSlave.getJarOutRgv().get(0); @@ -5320,40 +5320,40 @@ if (jarWrkMastExecuteActionExecute1(wrkMastExecute,sign)){ break; } - return; + continue; case 2: case 4: if (jarWrkMastExecuteActionExecute2(wrkMastExecute,sign)){ break; } - return; + continue; case 5: if (jarWrkMastExecuteActionExecute5(wrkMastExecute,sign)){ break; } - return; + continue; case 6: if (jarWrkMastExecuteActionExecute6(wrkMastExecute,sign)){ break; } - return; + continue; case 7: case 8: if (jarWrkMastExecuteActionExecute7(wrkMastExecute,sign)){ break; } - return; + continue; case 9: if (jarWrkMastExecuteActionExecute9(wrkMastExecute,sign)){ break; } - return; + continue; case 10: case 11: if (jarWrkMastExecuteActionExecute10(wrkMastExecute,sign)){ break; } - return; + continue; } } } catch (Exception e){ @@ -6135,7 +6135,7 @@ */ public synchronized boolean jarWrkMastExecuteActionExecute7(WrkMastExecute wrkMastExecute,Integer sign) { try{ - List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.getWrkMastExecuteByJarNo(wrkMastExecute.getJarId()); + List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecute); if (wrkMastExecuteByJarNo.size()!=1 || !wrkMastExecuteByJarNo.get(0).getWrkNo().equals(wrkMastExecute.getWrkNo())){ return false; } @@ -6455,7 +6455,7 @@ */ public synchronized boolean jarWrkMastExecuteActionExecute10(WrkMastExecute wrkMastExecute,Integer sign) { try{ - List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.getWrkMastExecuteByJarNo(wrkMastExecute.getJarId()); + List<WrkMastExecute> wrkMastExecuteByJarNo = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecute); if (wrkMastExecuteByJarNo.size()!=1 || !wrkMastExecuteByJarNo.get(0).getWrkNo().equals(wrkMastExecute.getWrkNo())){ return false; } @@ -7074,8 +7074,12 @@ if (steProtocol == null) { continue; } - Integer integer = wrkMastExecuteService.selectNoStart(steSlave.getId()); - if (integer!=0){ + + if (wrkMastExecuteService.selectNoStart(steSlave.getId())!=0){ + continue; + } + + if (wrkMastExecuteService.selectMoveStart(steSlave.getId())!=0){ continue; } diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java index 7d16aea..0c34bb4 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java @@ -47,6 +47,11 @@ } @Override + public Integer selectMoveStart(Integer jarRegin) { + return this.baseMapper.selectMoveStart(jarRegin); + } + + @Override public WrkMastExecute selectStart(Integer jarRegin) { return this.baseMapper.selectStart(jarRegin); } diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml index f0c2360..22f7bf1 100644 --- a/src/main/resources/mapper/WrkMastExecuteMapper.xml +++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml @@ -108,6 +108,13 @@ and wrk_type != 0 </select> + <select id="selectMoveStart" resultType="Integer"> + select count(1) from jar_wrk_mast_execute + where 1=1 + and jar_regin = #{jarRegin} + and io_type in (7,8,10,11) + </select> + <select id="selectStart" resultMap="BaseResultMap"> select top 1 * from jar_wrk_mast_execute where 1=1 -- Gitblit v1.9.1