From b17e2a3f2bd85d18630cb447d65368e430c887f8 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <xltys1995> Date: 星期四, 24 九月 2020 10:08:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/CrnController.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 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 5bde266..79fda80 100644 --- a/src/main/java/com/zy/asrs/controller/CrnController.java +++ b/src/main/java/com/zy/asrs/controller/CrnController.java @@ -207,6 +207,7 @@ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + staNoProcess(param, command); return crnControl(command)?R.ok():R.error(); } @@ -224,6 +225,7 @@ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + staNoProcess(param, command); return crnControl(command)?R.ok():R.error(); } @@ -241,6 +243,7 @@ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + staNoProcess(param, command); return crnControl(command)?R.ok():R.error(); } @@ -258,6 +261,7 @@ command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺� command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� + staNoProcess(param, command); return crnControl(command)?R.ok():R.error(); } @@ -309,6 +313,7 @@ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺� command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒� command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞� + staNoProcess(param, command); return crnControl(command)?R.ok():R.error(); } @@ -422,4 +427,30 @@ return false; } + private void staNoProcess(CrnOperatorParam param, CrnCommand command){ + if (param.getSourceStaNo()!=null) { + if (param.getSourceStaNo() == 5) { + command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 + } else if (param.getSourceStaNo() == 6) { + command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓 + command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪 + command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰 + } + } + if (param.getStaNo()!=null) { + if (param.getStaNo() == 5) { + command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� + } else if (param.getStaNo() == 6) { + command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺� + command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒� + command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞� + } + } + } + + } -- Gitblit v1.9.1