| src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/TaskWrkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/MainProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/SiemensDevpThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/TaskWrkMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -16,6 +16,8 @@ TaskWrk selectByStartPoint(@Param("startPoint") String startPoint); TaskWrk selectByTargetPoint(@Param("targetPoint") String targetPoint); TaskWrk selectByBarcode(@Param("barcode") String barcode); TaskWrk selectByWrkNo(Integer wrkNo); src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -11,6 +11,8 @@ TaskWrk selectByStartPoint(String taskNo); TaskWrk selectByTargetPoint(String taskNo); TaskWrk selectByBarcode(String barcode); TaskWrk selectByWrkNo(Integer wrkNo); src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -874,14 +874,14 @@ } SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId()); for (DevpSlave.Sta inSta : devp.getInSta()) { WrkMast pakout = wrkMastMapper.selectWorkingPakout(inSta.getBackSta()); TaskWrk taskWrk = taskWrkService.selectByTargetPoint(inSta.getBackSta() + ""); switch (inSta.getBackSta()) { case 116: if (pakout != null) { case 101: if (taskWrk != null) { if (devpThread.ioModeOf1F1 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf1F1 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -894,12 +894,12 @@ devpThread.ioModeOf1F1 = IoModeType.PAKIN_MODE; } break; case 117: if (pakout != null) { case 104: if (taskWrk != null) { if (devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf1F2 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -912,12 +912,12 @@ devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE; } break; case 118: if (pakout != null) { case 107: if (taskWrk != null) { if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -930,12 +930,12 @@ devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE; } break; case 119: if (pakout != null) { case 110: if (taskWrk != null) { if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -948,12 +948,12 @@ devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE; } break; case 120: if (pakout != null) { case 113: if (taskWrk != null) { if (devpThread.ioModeOf1F5 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf1F5 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -967,11 +967,11 @@ } break; case 203: if (pakout != null) { if (taskWrk != null) { if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -986,11 +986,11 @@ break; case 207: if (pakout != null) { if (taskWrk != null) { if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { @@ -1005,11 +1005,11 @@ break; case 212: if (pakout != null) { if (taskWrk != null) { if (devpThread.ioModeOf2F3 != IoModeType.PAKOUT_MODE) { // 出库切换中 devpThread.ioModeOf2F3 = IoModeType.PAKOUT_BOOTING; WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo()); TaskWrk pakin = taskWrkService.selectByStartPoint(inSta.getStaNo() + ""); if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading() && !devpThread.getStation().get(inSta.getBackSta()).isLoading() && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) { src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -62,6 +62,11 @@ } @Override public TaskWrk selectByTargetPoint(String taskNo) { return this.baseMapper.selectByTargetPoint(taskNo); } @Override public TaskWrk selectByBarcode(String barcode) { return this.baseMapper.selectByBarcode(barcode); } src/main/java/com/zy/core/MainProcess.java
@@ -59,11 +59,11 @@ mainService.recCrnErr(); // 其他 ===>> // 入出库模式切换函数 // i++; // if (i > 1) { // mainService.ioConvert(); // i = 0; // } i++; if (i > 1) { mainService.ioConvert(); i = 0; } } catch (Exception e) { src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -223,6 +223,8 @@ * 读取状态 ====> 整块plc */ private void read() throws InterruptedException { // 更新入出库模式 updateIoMode(); ArrayList<Integer> staNos = getStaNo(); int staNoSize = staNos.size(); @@ -530,7 +532,7 @@ } int i = barcodeSite2.indexOf(staProtocol.getSiteId()); if (i != -1) { heightAddress = "DB104." + (i * 4); heightAddress = "DB104." + (i * 2); } OperateResult writeResult; @@ -733,27 +735,53 @@ // 更新入出库模式 private void updateIoMode() throws InterruptedException { if (slave.getId() == 1 && this.ioModeOf1F1 != null) { if (!siemensS7Net.Write("DB4.2", this.ioModeOf1F1.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线21F1入出库模式失败。输送线plc编号={2}", slave.getId())); if (!siemensS7Net.Write("DB105.0", this.ioModeOf1F1.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线21F1入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线1F1入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F2 != null) { if (!siemensS7Net.Write("DB105.2", this.ioModeOf1F2.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线1F2入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F3 != null) { if (!siemensS7Net.Write("DB105.4", this.ioModeOf1F3.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F1入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线1F3入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F4 != null) { if (!siemensS7Net.Write("DB105.6", this.ioModeOf1F4.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线1F4入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F5 != null) { if (!siemensS7Net.Write("DB105.8", this.ioModeOf1F5.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线1F5入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf2F1 != null) { if (!siemensS7Net.Write("DB105.10", this.ioModeOf2F1.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线2F1入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F2 != null) { if (!siemensS7Net.Write("DB4.4", this.ioModeOf1F2.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={3}", slave.getId())); if (slave.getId() == 1 && this.ioModeOf2F2 != null) { if (!siemensS7Net.Write("DB105.12", this.ioModeOf2F2.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F1入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线2F2入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F2 != null) { if (!siemensS7Net.Write("DB4.2", this.ioModeOf1F2.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F1入出库模式失败。输送线plc编号={2}", slave.getId())); log.error("写入输送线3F1入出库模式失败。输送线plc编号={}", slave.getId()); } } if (slave.getId() == 1 && this.ioModeOf1F2 != null) { if (!siemensS7Net.Write("DB4.4", this.ioModeOf1F2.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={3}", slave.getId())); log.error("写入输送线3F2入出库模式失败。输送线plc编号={}", slave.getId()); if (slave.getId() == 1 && this.ioModeOf2F3 != null) { if (!siemensS7Net.Write("DB105.14", this.ioModeOf2F3.id).IsSuccess) { OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={1}", slave.getId())); log.error("写入输送线2F3入出库模式失败。输送线plc编号={}", slave.getId()); } } } src/main/resources/mapper/TaskWrkMapper.xml
@@ -37,10 +37,16 @@ <select id="selectByStartPoint" resultMap="BaseResultMap"> select top 1 * from wcs_task_wrk where 1=1 and io_type=3 and start_point = #{startPoint} </select> <select id="selectByTargetPoint" resultMap="BaseResultMap"> select top 1 * from wcs_task_wrk where 1=1 and target_point = #{targetPoint} </select> <select id="selectByBarcode" resultMap="BaseResultMap"> select top 1 * from wcs_task_wrk where 1=1
