From 174950e22040262b549dee634c90c84d2c590fcf Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期一, 29 八月 2022 10:19:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 18 ++++++++++++++++++ src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 +++- 2 files changed, 21 insertions(+), 1 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 7402b30..c71ab1b 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1893,6 +1893,24 @@ devpThread.ioModeOf2F = IoModeType.PAKIN_MODE; } break; + case 401://1F + if (pakout != null) { + if (devpThread.ioModeOf4F != IoModeType.PAKOUT_MODE) { + // 鍑哄簱鍒囨崲涓� + devpThread.ioModeOf4F = IoModeType.PAKOUT_BOOTING; + WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); + if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() + && !devpThread.getStation().get(inSta.getStaNo()+1).isLoading() + && devpThread.getStation().get(inSta.getStaNo()+1).getWorkNo()==0) { + // 鍑哄簱妯″紡 + devpThread.ioModeOf4F = IoModeType.PAKOUT_MODE; + } + } + } else { + // 鍏ュ簱妯″紡 + devpThread.ioModeOf4F = IoModeType.PAKIN_MODE; + } + break; } } diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java index bde3131..85da205 100644 --- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java +++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java @@ -44,7 +44,7 @@ public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{ add(101);add(102);add(103);add(104); add(201);add(202);add(203);add(204); - add(301);add(302);add(303);add(304);add(305);add(306); + add(301);add(302);add(303);add(304);add(305);add(306);add(401);add(402); }}; /** @@ -62,6 +62,8 @@ */ public IoModeType ioModeOf2F = IoModeType.NONE; // public IoModeType ioMode = IoModeType.NONE; + public IoModeType ioModeOf4F = IoModeType.NONE; +// public IoModeType ioMode = IoModeType.NONE; public SiemensDevpThread(DevpSlave slave) { this.slave = slave; -- Gitblit v1.9.1