From 0157c39c88d79ea85b584f47570bab6bc0c2cdc5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 13:24:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 33 +++++++---
src/main/java/com/zy/core/enums/CrnStatusType.java | 27 ++++----
src/main/webapp/views/console.html | 6 +-
src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java | 102 ++++-----------------------------
4 files changed, 51 insertions(+), 117 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 983c5da..ae31894 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -203,21 +203,32 @@
@PostMapping("/crn/detail")
@ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam String crnNo){
+ public R crnDetail(@RequestParam Integer crnNo){
if (Cools.isEmpty(crnNo)){
return R.parse(CodeRes.EMPTY);
}
CrnDetailVo vo = new CrnDetailVo();
- vo.setCrnNo(crnNo);
- vo.setWorkNo("3387");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStock("");
- vo.setStock("05050040");
- vo.setCrnStatus("鍙栬揣涓�");
- vo.setError("0");
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ if (crnSlave.getId().equals(crnNo)) {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo(crnProtocol.getTaskNo());
+ if (crnProtocol.getTaskNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+ vo.setError(""); // todo
+ }
+ }
+ }
+ }
return R.ok().add(vo);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
index 40d80f9..434cedc 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
@@ -1,118 +1,42 @@
package com.zy.asrs.domain.vo;
+import lombok.Data;
+
/**
* 鍫嗗灈鏈鸿鎯呰鍥惧璞�
* Created by vincent on 2020-06-03
*/
+@Data
public class CrnDetailVo {
// 鍫嗗灈鏈哄彿
- private String crnNo;
+ private Integer crnNo;
// 宸ヤ綔鍙�
- private String workNo;
+ private Short workNo;
// 婧愮珯
- private String sourceStaNo;
+ private String sourceStaNo = "";
// 鐩爣绔�
- private String staNo;
+ private String staNo = "";
// 宸ヤ綔鐘舵��
- private String workStatus;
+ private String wrkSts = "";
// 鍑哄叆绫诲瀷
- private String ioType;
+ private String ioType = "";
// 婧愬簱浣�
- private String sourceStock;
+ private String sourceLocNo = "";
// 鐩爣搴撲綅
- private String stock;
+ private String locNo = "";
// 鍫嗗灈鏈虹姸鎬�
- private String crnStatus;
+ private String crnStatus = "";
// 寮傚父
- private String error;
+ private String error = "";
- public String getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(String crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getWorkNo() {
- return workNo;
- }
-
- public void setWorkNo(String workNo) {
- this.workNo = workNo;
- }
-
- public String getSourceStaNo() {
- return sourceStaNo;
- }
-
- public void setSourceStaNo(String sourceStaNo) {
- this.sourceStaNo = sourceStaNo;
- }
-
- public String getStaNo() {
- return staNo;
- }
-
- public void setStaNo(String staNo) {
- this.staNo = staNo;
- }
-
- public String getWorkStatus() {
- return workStatus;
- }
-
- public void setWorkStatus(String workStatus) {
- this.workStatus = workStatus;
- }
-
- public String getIoType() {
- return ioType;
- }
-
- public void setIoType(String ioType) {
- this.ioType = ioType;
- }
-
- public String getSourceStock() {
- return sourceStock;
- }
-
- public void setSourceStock(String sourceStock) {
- this.sourceStock = sourceStock;
- }
-
- public String getStock() {
- return stock;
- }
-
- public void setStock(String stock) {
- this.stock = stock;
- }
-
- public String getCrnStatus() {
- return crnStatus;
- }
-
- public void setCrnStatus(String crnStatus) {
- this.crnStatus = crnStatus;
- }
-
- public String getError() {
- return error;
- }
-
- public void setError(String error) {
- this.error = error;
- }
}
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index c8c8010..6f8531b 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -2,24 +2,23 @@
public enum CrnStatusType {
- IDLE(0), // 绌洪棽
- FETCH_POSITION(1), // 鍙栬揣瀹氫綅涓�
-// FETCH_REQUEST(2), // 鍙栬揣璇锋眰
- FETCHING(2), // 鍙栬揣涓�
- PUT_POSITION(3), // 鏀捐揣瀹氫綅涓�
-// PUT_REQUEST(5), // 鏀捐揣璇锋眰
- PUTTING(4), //鏀捐揣涓�
- TO_ORIGIN(5), // 鍥炲師鐐逛腑
- ORIGIN(6), // 鍙嶅師鐐�
- LOC_MOVE(7), // 搴撲綅绉讳綅
- WAITING(90), // 浠诲姟瀹屾垚绛夊緟WCS纭
-// REPAIR(98), // 缁翠慨
- SOS(99), // 鎶ヨ
+ IDLE(0, "绌洪棽"),
+ FETCH_POSITION(1, "鍙栬揣瀹氫綅涓�"),
+ FETCHING(2, "鍙栬揣涓�"),
+ PUT_POSITION(3, "鏀捐揣瀹氫綅涓�"),
+ PUTTING(4, "鏀捐揣涓�"),
+ TO_ORIGIN(5, "鍥炲師鐐逛腑"),
+ ORIGIN(6, "鍙嶅師鐐�"),
+ LOC_MOVE(7, "搴撲綅绉讳綅"),
+ WAITING(90, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ SOS(99, "鎶ヨ"),
;
public Integer id;
- CrnStatusType(Integer id) {
+ public String desc;
+ CrnStatusType(Integer id, String desc) {
this.id = id;
+ this.desc = desc;
}
public static CrnStatusType get(Short id) {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 840a747..5514d63 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -341,7 +341,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="wrkSts" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -359,7 +359,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -367,7 +367,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
--
Gitblit v1.9.1