From 9dd3b9931d4fdf76de7d1989ef32ed00ec952c9a Mon Sep 17 00:00:00 2001
From: lsh <s>
Date: 星期四, 16 五月 2024 09:55:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 5 ++
src/main/webapp/views/deviceOperate/devpOperate.html | 84 +++++++++++++++++++++---------------------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 2 +
4 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index e9cb0fb..58e5cde 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -119,6 +119,11 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setFullPlt(staProtocol.isFullPlt()?"Y":"N");
+ vo.setLow(staProtocol.isLow()?"Y":"N");
+ vo.setCar(staProtocol.isCar()?"Y":"N");
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
vo.setBarcode(staProtocol.getBarcode());
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index 6771134..d2d798e 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -39,4 +39,6 @@
private String locType1 = "-";
private String car = "-";
private String barcode = "-";
+ private String fullPlt = "-";
+ private String low = "-";
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3b7faa8..ab91620 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -48,7 +48,7 @@
// mainService.RGVDemoShow1();
mainService.RGVDemoShow2();
//鏈烘鑷傚厑璁稿彇璐с�佸厑璁告斁璐�
- mainService.ExtTaskAndPut();
+// mainService.ExtTaskAndPut();
} catch (Exception e) {
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index b3a6b63..d8b1506 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -30,39 +30,39 @@
</div>
<div style="width: 100%;display: flex;justify-content: center;margin-top: 10px;">
- <div style="width: 55%;margin-right: 10px;">
- <el-card class="box-card">
- <div slot="header" class="clearfix">
- <span>璁惧璋冭瘯</span>
- </div>
- <div>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="宸ヤ綔鍙�">
- <el-input v-model="formParam.workNo" placeholder="宸ヤ綔鍙�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣绔�">
- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�"></el-input>
- </el-form-item>
- <el-form-item label="鍏ュ簱鏍囪">
- <el-input v-model="formParam.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>
- </el-form-item>
- </el-form>
- <el-form label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="">
- <el-checkbox v-model="formParam.inEnable">鍙叆</el-checkbox>
- </el-form-item>
- <el-form-item label="">
- <el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>
- </el-form-item>
- </el-form>
- <div>
- <el-button @click="requestOperate('update')" type="primary">鏇存柊</el-button>
- <el-button @click="requestOperate('out')" type="warning">鍙栬揣瀹屾垚</el-button>
- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>
- </div>
- </div>
- </el-card>
- </div>
+<!-- <div style="width: 55%;margin-right: 10px;">-->
+<!-- <el-card class="box-card">-->
+<!-- <div slot="header" class="clearfix">-->
+<!-- <span>璁惧璋冭瘯</span>-->
+<!-- </div>-->
+<!-- <div>-->
+<!-- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">-->
+<!-- <el-form-item label="宸ヤ綔鍙�">-->
+<!-- <el-input v-model="formParam.workNo" placeholder="宸ヤ綔鍙�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鐩爣绔�">-->
+<!-- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鍏ュ簱鏍囪">-->
+<!-- <el-input v-model="formParam.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <el-form label-position="top" :inline="true" class="demo-form-inline">-->
+<!-- <el-form-item label="">-->
+<!-- <el-checkbox v-model="formParam.inEnable">鍙叆</el-checkbox>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="">-->
+<!-- <el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <div>-->
+<!-- <el-button @click="requestOperate('update')" type="primary">鏇存柊</el-button>-->
+<!-- <el-button @click="requestOperate('out')" type="warning">鍙栬揣瀹屾垚</el-button>-->
+<!-- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </el-card>-->
+<!-- </div>-->
<div style="width: 45%;">
<el-card class="box-card">
<div slot="header" class="clearfix">
@@ -73,27 +73,27 @@
<el-empty description="璇烽�夋嫨璁惧"></el-empty>
</div>
<div v-else>
- <el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
+ <el-descriptions :title="currentTitle" direction="vertical" :column="2" border>
<el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}
</el-descriptions-item>
<el-descriptions-item label="宸ヤ綔鍙�">
{{ tableData[currentIndex].workNo }}
</el-descriptions-item>
- <el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }}
+ <el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵1">{{ tableData[currentIndex].autoing }}
</el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }}
+ <el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵2">{{ tableData[currentIndex].loading }}
</el-descriptions-item>
- <el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }}
+ <el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵3">{{ tableData[currentIndex].inEnable }}
</el-descriptions-item>
- <el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
+ <el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵4">{{ tableData[currentIndex].outEnable }}
</el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
+ <el-descriptions-item label="姘皵1 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].emptyMk }}
</el-descriptions-item>
- <el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }}
+ <el-descriptions-item label="姘皵2 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].fullPlt }}
</el-descriptions-item>
- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
+ <el-descriptions-item label="姘皵3 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].car }}
</el-descriptions-item>
- <el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }}
+ <el-descriptions-item label="姘皵4 ==銆� 涓嬫枡浣�">{{ tableData[currentIndex].low }}
</el-descriptions-item>
</el-descriptions>
</div>
--
Gitblit v1.9.1