From 3008cbf144bd6f4cf80dcef9cf8246a31c3d8bc1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 16:50:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 8 ++++----
src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java | 8 ++++----
src/main/webapp/views/console.html | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 542a597..f04eeb6 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -147,18 +147,18 @@
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
- vo.setDevpNo(siteId); // 绔欑偣缂栧彿
+ vo.setSiteId(siteId); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
if (wrkMast != null) {
- vo.setWorkStatus(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
vo.setSourceStaNo(wrkMast.getSourceStaNo$());
vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceStock(wrkMast.getSourceLocNo$());
- vo.setStock(wrkMast.getLocNo$());
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
}
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
index 3c04b8e..7cdcf91 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -10,13 +10,13 @@
public class SiteDetailVo {
// 绔欑偣缂栧彿
- private Integer devpNo;
+ private Integer siteId;
// 宸ヤ綔鍙�
private Short workNo;
// 宸ヤ綔鐘舵��
- private String workStatus = "";
+ private String wrkSts = "";
// 鑷姩
private String autoing;
@@ -40,8 +40,8 @@
private String staNo = "";
// 婧愬簱浣�
- private String sourceStock = "";
+ private String sourceLocNo = "";
// 鐩爣搴撲綅
- private String stock = "";
+ private String locNo = "";
}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index b54b654..4c92f16 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -198,7 +198,7 @@
<span>璁惧鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
+ <input type="text" name="siteId;" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -214,7 +214,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>
@@ -284,7 +284,7 @@
<span>婧愬簱浣�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+ <input type="text" name="sourceLocNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
<div class="form-item" style="width: 40%">
@@ -292,7 +292,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
+ <input type="text" name="locNo" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
</form>
--
Gitblit v1.9.1