From 16441fe63adf04e0c434377f7da0fd05ba155eb6 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 21 十一月 2023 17:13:15 +0800 Subject: [PATCH] #联机 --- src/main/java/com/zy/asrs/controller/CrnController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java index b8e24d5..35a377a 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -1,5 +1,6 @@ package com.zy.asrs.controller; +import HslCommunication.Profinet.Siemens.SiemensS7Net; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -50,6 +51,8 @@ @Slf4j @RestController public class CrnController { + + @Autowired private SlaveProperties slaveProperties; @@ -576,6 +579,27 @@ return R.error(); } + @ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡") + @PostMapping("/crn/operator/auto") + public R crnAuto(CrnOperatorParam param){ + short[] array = new short[9]; + CrnCommand command = new CrnCommand(); + command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙� + command.setTaskNo((short) 0); // 宸ヤ綔鍙� +// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣� +// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡 +// command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓 +// command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪 +// command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰 +// command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� +// command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� +// command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + command.setAuto((short)1); + + return crnControl(command)?R.ok():R.error(); + } + + private boolean crnControl(CrnCommand command){ if (command.getCrnNo() == null) { throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�"); -- Gitblit v1.9.1