From 4c82a8e7f607ebbb82a8d9c44e5ea08e1c8b0419 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期三, 03 六月 2020 14:30:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/client/domain/vo/SiteDetailVo.java | 140 +++++++++++++++++
src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java | 30 +++
src/main/webapp/views/console.html | 91 +++++++---
src/main/webapp/static/css/console.css | 1
src/main/java/com/zy/client/domain/vo/CrnDetailVo.java | 118 ++++++++++++++
src/main/java/com/zy/client/controller/CrnController.java | 2
src/main/java/com/zy/client/controller/ConsoleController.java | 63 ++++++-
7 files changed, 406 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 7cce864..773b36d 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -6,15 +6,17 @@
import com.zy.client.constant.WcsSystemPropety;
import com.zy.client.domain.enums.SiteStatusType;
import com.zy.client.domain.param.SystemSwitchParam;
-import com.zy.client.domain.vo.CrnLatestDataVo;
-import com.zy.client.domain.vo.SiteLatestDataVo;
+import com.zy.client.domain.vo.*;
+import com.zy.common.CodeRes;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
@@ -23,6 +25,8 @@
@RestController
@RequestMapping("/console")
public class ConsoleController {
+
+ public static AtomicInteger integer = new AtomicInteger();
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -51,22 +55,54 @@
@PostMapping("/site/detail")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
- public R siteDetail(){
- return R.ok();
+ public R siteDetail(@RequestParam String siteId){
+ if (Cools.isEmpty(siteId)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ SiteDetailVo vo = new SiteDetailVo();
+ vo.setDevpNo(siteId);
+ vo.setWorkNo("9998");
+ vo.setWorkStatus("2.璁惧涓婄Щ鍔�");
+ vo.setAutoing("Y");
+ vo.setLoading("Y");
+ vo.setCanining("N");
+ vo.setCanouting("Y");
+ vo.setIoType("1.鍏ュ簱");
+ vo.setSourceStaNo("2303");
+ vo.setStaNo("2410");
+ vo.setSourceStock("");
+ vo.setStock("");
+ return R.ok().add(vo);
}
@PostMapping("/crn/detail")
@ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(){
- return R.ok();
+ public R crnDetail(@RequestParam String 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");
+ return R.ok().add(vo);
}
+ @Deprecated
@PostMapping("/site/update")
@ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
public R updateSite(){
return R.ok();
}
+ @Deprecated
@PostMapping("/crn/update")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
public R updateCrn(){
@@ -108,8 +144,19 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
-
- return R.ok();
+ integer.getAndIncrement();
+ List<BarcodeDataVo> list = new ArrayList<>();
+ for (int i=1;i<=1;i++){
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId("1");
+ if (integer.get()%5 != 0) {
+ vo.setCodeValue("0");
+ } else {
+ vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
+ }
+ list.add(vo);
+ }
+ return R.ok().add(list);
}
}
diff --git a/src/main/java/com/zy/client/controller/CrnController.java b/src/main/java/com/zy/client/controller/CrnController.java
index f0acb3e..b00e6d0 100644
--- a/src/main/java/com/zy/client/controller/CrnController.java
+++ b/src/main/java/com/zy/client/controller/CrnController.java
@@ -25,7 +25,7 @@
@RequestMapping("/crn")
public class CrnController {
- private AtomicInteger integer = new AtomicInteger();
+ public static AtomicInteger integer = new AtomicInteger();
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@PostMapping("/command/ongoing")
diff --git a/src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java
new file mode 100644
index 0000000..f6e8669
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/vo/BarcodeDataVo.java
@@ -0,0 +1,30 @@
+package com.zy.client.domain.vo;
+
+/**
+ * 鎵爜鍣ㄥ疄鏃舵暟鎹鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+public class BarcodeDataVo {
+
+ // 鎵爜鍣ㄧ紪鍙�
+ private String barcodeId;
+
+ // 鎵爜鍣ㄥ唴瀹�
+ private String codeValue;
+
+ public String getBarcodeId() {
+ return barcodeId;
+ }
+
+ public void setBarcodeId(String barcodeId) {
+ this.barcodeId = barcodeId;
+ }
+
+ public String getCodeValue() {
+ return codeValue;
+ }
+
+ public void setCodeValue(String codeValue) {
+ this.codeValue = codeValue;
+ }
+}
diff --git a/src/main/java/com/zy/client/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/client/domain/vo/CrnDetailVo.java
new file mode 100644
index 0000000..a2abd16
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/vo/CrnDetailVo.java
@@ -0,0 +1,118 @@
+package com.zy.client.domain.vo;
+
+/**
+ * 鍫嗗灈鏈鸿鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+public class CrnDetailVo {
+
+ // 鍫嗗灈鏈哄彿
+ private String crnNo;
+
+ // 宸ヤ綔鍙�
+ private String workNo;
+
+ // 婧愮珯
+ private String sourceStaNo;
+
+ // 鐩爣绔�
+ private String staNo;
+
+ // 宸ヤ綔鐘舵��
+ private String workStatus;
+
+ // 鍑哄叆绫诲瀷
+ private String ioType;
+
+ // 婧愬簱浣�
+ private String sourceStock;
+
+ // 鐩爣搴撲綅
+ private String stock;
+
+ // 鍫嗗灈鏈虹姸鎬�
+ private String crnStatus;
+
+ // 寮傚父
+ 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/client/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/client/domain/vo/SiteDetailVo.java
new file mode 100644
index 0000000..02e24ce
--- /dev/null
+++ b/src/main/java/com/zy/client/domain/vo/SiteDetailVo.java
@@ -0,0 +1,140 @@
+package com.zy.client.domain.vo;
+
+/**
+ * 杈撻�佽澶囪鎯呰鍥惧璞�
+ * Created by vincent on 2020-06-03
+ */
+public class SiteDetailVo {
+
+ // 绔欑偣缂栧彿
+ private String devpNo;
+
+ // 宸ヤ綔鍙�
+ private String workNo;
+
+ // 宸ヤ綔鐘舵��
+ private String workStatus;
+
+ // 鑷姩
+ private String autoing;
+
+ // 鏈夌墿
+ private String loading;
+
+ // 鑳藉叆
+ private String canining;
+
+ // 鑳藉嚭
+ private String canouting;
+
+ // 鍑哄叆绫诲瀷
+ private String ioType;
+
+ // 婧愮珯
+ private String sourceStaNo;
+
+ // 鐩爣绔�
+ private String staNo;
+
+ // 婧愬簱浣�
+ private String sourceStock;
+
+ // 鐩爣搴撲綅
+ private String stock;
+
+ public String getDevpNo() {
+ return devpNo;
+ }
+
+ public void setDevpNo(String devpNo) {
+ this.devpNo = devpNo;
+ }
+
+ public String getWorkNo() {
+ return workNo;
+ }
+
+ public void setWorkNo(String workNo) {
+ this.workNo = workNo;
+ }
+
+ public String getWorkStatus() {
+ return workStatus;
+ }
+
+ public void setWorkStatus(String workStatus) {
+ this.workStatus = workStatus;
+ }
+
+ public String getAutoing() {
+ return autoing;
+ }
+
+ public void setAutoing(String autoing) {
+ this.autoing = autoing;
+ }
+
+ public String getLoading() {
+ return loading;
+ }
+
+ public void setLoading(String loading) {
+ this.loading = loading;
+ }
+
+ public String getCanining() {
+ return canining;
+ }
+
+ public void setCanining(String canining) {
+ this.canining = canining;
+ }
+
+ public String getCanouting() {
+ return canouting;
+ }
+
+ public void setCanouting(String canouting) {
+ this.canouting = canouting;
+ }
+
+ public String getIoType() {
+ return ioType;
+ }
+
+ public void setIoType(String ioType) {
+ this.ioType = ioType;
+ }
+
+ 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 getSourceStock() {
+ return sourceStock;
+ }
+
+ public void setSourceStock(String sourceStock) {
+ this.sourceStock = sourceStock;
+ }
+
+ public String getStock() {
+ return stock;
+ }
+
+ public void setStock(String stock) {
+ this.stock = stock;
+ }
+}
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 7e2d26c..f58cd3e 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -210,6 +210,7 @@
border-left: 1px solid #333!important;
border-right: 1px solid #333!important;
border-right: none;
+ cursor: inherit;
}
.stock-group .item:last-child {
/*border-right: 1px solid #333!important;*/
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 52d8f5f..6e7edc7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -203,7 +203,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn1" class="machine"></div>
+ <div id="crn-1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -342,7 +342,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn2" class="machine"></div>
+ <div id="crn-2" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -424,7 +424,7 @@
<span>璁惧鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="devpNo" value="12" disabled="disabled" style="width: 4rem">
+ <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -432,7 +432,7 @@
<span>宸ヤ綔鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 4rem">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -440,7 +440,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -450,7 +450,7 @@
<span>鑷姩</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="auto" disabled="disabled" style="width: 1rem" checked>
+ <input type="checkbox" name="autoing" disabled="disabled" style="width: 1rem">
</div>
</div>
<div class="form-item" style="width: 20%">
@@ -458,7 +458,7 @@
<span>鏈夌墿</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem" checked>
+ <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem">
</div>
</div>
<div class="form-item" style="width: 20%">
@@ -466,7 +466,7 @@
<span>鑳藉叆</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem" checked>
+ <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
</div>
</div>
<div class="form-item" style="width: 20%">
@@ -474,7 +474,7 @@
<span>鑳藉嚭</span>
</div>
<div class="form-item-input">
- <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem" checked>
+ <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
</div>
</div>
@@ -484,7 +484,7 @@
<span>鍑哄叆绫诲瀷</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 8rem">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -492,7 +492,7 @@
<span>婧愮珯</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -500,7 +500,7 @@
<span>鐩爣绔�</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
@@ -518,7 +518,7 @@
<span>鐩爣搴撲綅</span>
</div>
<div class="form-item-input">
- <input type="text" name="stock" value="" style="width: 8rem">
+ <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
</div>
</div>
</form>
@@ -533,7 +533,7 @@
<span>鍫嗗灈鏈哄彿</span>
</div>
<div class="form-item-input">
- <input type="text" name="crnNo" value="12" disabled="disabled" style="width: 3rem">
+ <input type="text" name="crnNo" value="" disabled="disabled" style="width: 3rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -541,7 +541,7 @@
<span>宸ヤ綔鍙�</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo" value="9998" disabled="disabled" style="width: 5rem">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 5rem">
</div>
</div>
<div class="form-item" style="width: 23%">
@@ -549,7 +549,7 @@
<span>婧愮珯</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo" value="2303" disabled="disabled" style="width: 4rem">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
<div class="form-item" style="width: 25%">
@@ -557,7 +557,7 @@
<span>鐩爣绔�</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo" value="2410" disabled="disabled" style="width: 4rem">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
</div>
</div>
@@ -567,7 +567,7 @@
<span>宸ヤ綔鐘舵��</span>
</div>
<div class="form-item-input">
- <input type="text" name="workStatus" value="2.璁惧涓婄Щ鍔�" disabled="disabled" style="width: 10rem">
+ <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
<div class="form-item" style="width: 45%">
@@ -575,7 +575,7 @@
<span>鍑哄叆绫诲瀷</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType" value="1.鍏ュ簱" disabled="disabled" style="width: 10rem">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 10rem">
</div>
</div>
@@ -626,10 +626,12 @@
getSitesInfo();
getCrnInfo();
getSystemRunningStatus();
+ getBarcodeInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
getSystemRunningStatus();
+ getBarcodeInfo()
}, 500);
setInterval(function () {
getSitesInfo();
@@ -760,7 +762,12 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
-
+ var barcodes = res.data;
+ for (var i = 0; i < barcodes.length; i++){
+ console.log(barcodes[i].barcodeId);
+ console.log(barcodes[i].codeValue);
+ $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ }
} else if (res.code === 403){
top.location.href = baseUrl+"/login";
} else {
@@ -774,11 +781,11 @@
function crnAnimate(id, leftVal) {
switch (id) {
case 1:
- $("#crn1").animate({left: leftVal+'px'}, 1000);
+ $("#crn-1").animate({left: leftVal+'px'}, 1000);
crn1Position = leftVal;
break;
case 2:
- $("#crn2").animate({left: leftVal+'px'}, 1000);
+ $("#crn-2").animate({left: leftVal+'px'}, 1000);
crn2Position = leftVal;
break;
default:
@@ -790,8 +797,9 @@
// 杈撻�佽澶囩偣鍑讳簨浠�
$('.site').on('click', function () {
+ var id = this.id.split("-")[1];
layer.open({
- title: "1204绔欑偣淇℃伅",
+ title: id + "绔欑偣淇℃伅璇︽儏",
closeBtn: 0,
skin: 'layui-layer-lan',
offset: '180px',
@@ -800,17 +808,29 @@
content: $('#siteWindow'),
area: ['35rem', '18rem'],
btn: ['纭畾', '鍏抽棴'],
- yes: function(index, layero){
- layer.close(index);
- alert(1);
+ success: function(layero, index){
+ http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
+ for (var val in res.data) {
+ var find = $("#siteWindow").find(":input[name='" + val + "']");
+ if (find[0].type==='text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
+ }
+ })
+ },
+ end: function () {
+ $(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
}
});
});
// 鍫嗗灈鏈虹偣鍑讳簨浠�
$('.machine').on('click', function () {
+ var id = this.id.split("-")[1];
layer.open({
- title: "1鍙峰爢鍨涙満",
+ title: id+"鍙峰爢鍨涙満",
skin: 'layui-layer-lan',
closeBtn: 0,
type: 1,
@@ -819,9 +839,20 @@
content: $("#crnWindow"),
area: ['40rem', '20rem'],
btn: ['纭畾', '鍏抽棴'],
- yes: function(index, layero){
- layer.close(index);
- alert(1);
+ success: function(layero, index){
+ http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
+ for (var val in res.data) {
+ var find = $("#crnWindow").find(":input[name='" + val + "']");
+ if (find[0].type==='text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
+ }
+ })
+ },
+ end: function () {
+ $(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
}
});
});
--
Gitblit v1.9.1