From 432aa30874196937f6250b34c7ef6fb62dbaf984 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 29 三月 2025 15:52:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 9
src/main/webapp/static/images/logo-dark.png | 0
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 94 +----------
src/main/webapp/views/console.html | 2
src/main/webapp/views/pipeline.html | 4
src/main/webapp/static/js/console.map.js | 148 ++++++++++++-----
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 4
src/main/java/com/zy/asrs/controller/ConsoleController.java | 36 ++-
src/main/webapp/views/index.html | 2
src/main/webapp/static/js/console.js | 15 +
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 8 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 17 +
src/main/resources/application.yml | 112 +++++++++----
13 files changed, 256 insertions(+), 195 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..97501e2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -67,6 +67,11 @@
@Autowired
private BasRgvService basRgvService;
+ public static final ArrayList<Integer> barcodeNos = new ArrayList<Integer>() {{
+ add(1112);add(1114);add(1122);add(1124);
+
+ }};
+
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
public R systemRunningStatus(){
@@ -107,17 +112,12 @@
stations.putAll(devpThread.getStation());
}
}
- List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
+
for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
SiteLatestDataVo vo = new SiteLatestDataVo();
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
- for (BasRgv basRgv: basRgvs){
- if (basRgv.getRgvNo().equals(entry.getKey()) ){
- staProtocol.setWorkNo(basRgv.getWrkNo1());
- }
- }
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
@@ -173,16 +173,26 @@
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
List<BarcodeDataVo> list = new ArrayList<>();
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
- if (null == barcodeThread) {
+ List<SiteLatestDataVo> vos = new ArrayList<>();
+ Map<Integer, StaProtocol> stations = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ stations.putAll(devpThread.getStation());
+ }
+ }
+
+ for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
+ int index = barcodeNos.indexOf(entry.getValue().getSiteId());
+ if (index == -1) {
continue;
}
BarcodeDataVo vo = new BarcodeDataVo();
- vo.setBarcodeId(barcode.getId());
- vo.setCodeValue(barcodeThread.getBarcode());
+ vo.setBarcodeId(index);
+ vo.setCodeValue(entry.getValue().getBarcode());
list.add(vo);
}
+
return R.ok().add(list);
}
@@ -224,7 +234,7 @@
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
vo.setSiteId(siteId); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index acdda6d..fdc8fa0 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -77,6 +77,7 @@
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
+ vo.setWorkNo(staProtocol.getWorkNo().intValue());
vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
@@ -86,6 +87,10 @@
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setIn(staProtocol.isIn()?"Y":"N");
+ vo.setOut(staProtocol.isOut()?"Y":"N");
+ vo.setIdle(staProtocol.isIdle()?"Y":"N");
+ vo.setFinishWorkNo(staProtocol.getFinishWorkNo().toString());
}
return R.ok().add(list);
@@ -136,7 +141,7 @@
if (siteId.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
vo.setDevNo(entry.getKey()); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
@@ -170,7 +175,7 @@
staProtocol = staProtocol.clone();
}
if (workNo != null) {
- staProtocol.setWorkNo(workNo);
+ staProtocol.setWorkNo(workNo.shortValue());
}
if (staNo != null) {
staProtocol.setStaNo(staNo);
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 8512360..77fd04d 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -37,4 +37,12 @@
//楂樹綆搴撲綅
private String locType1 = "-";
+ //鍏ュ簱妯″紡
+ private String in = "-";
+ //鍑哄簱妯″紡
+ private String out = "-";
+ //绌洪棽
+ private String idle = "-";
+ //宸插畬鎴愬伐浣滃彿
+ private String finishWorkNo = "-";
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 93148e9..13f7fda 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -122,17 +122,6 @@
staProtocol = staProtocol.clone();
}
- if (barcodeThread == null) {
- continue;
- }
-
- if (barcodeThreadMat == null) {
- continue;
- }
-
- String barcode = barcodeThread.getBarcode();
-
- String barcodeMat = barcodeThreadMat.getBarcode();
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
@@ -167,9 +156,6 @@
}
// 閫�鍥�
if (back) {
-// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
-
if (!staProtocol.isLoading()){
continue;
}
@@ -180,13 +166,6 @@
if (ledThread != null) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
}
- staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- wrkNo++;
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
@@ -195,6 +174,7 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.isPakMk()) {
+ String barcode = staProtocol.getBarcode();
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
// led 寮傚父鏄剧ず
@@ -202,28 +182,7 @@
String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
- staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- wrkNo++;
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
continue;
- }
- if (staProtocol.getSiteId()!= 159){
- if( Cools.isEmpty(barcodeMat) || "NG".endsWith(barcodeMat) || "NoRead".equals(barcodeMat) || "00000000".equals(barcodeMat)) {
- News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcodeMat(), barcodeMat);
-
- staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- wrkNo++;
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
- continue;
- }
}
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
@@ -279,7 +238,6 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
- barcodeThread.setBarcode("");
staProtocol.setWorkNo(dto.getWorkNo().shortValue());
staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -294,45 +252,11 @@
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
- } else if (jsonObject.getInteger("code").equals(700)) {
- SearchLocParam param2 = new SearchLocParam();
- param2.setBarcode(barcode);
- param2.setBarcodeMat(barcodeMat);
- param2.setSourceStaNo(inSta.getStaNo());
- param2.setLocType1(locTypeDto.getLocType1());
- String response2 = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/pakin/yk/loc/v33")
- .setJson(JSON.toJSONString(param2))
- .build()
- .doPost();
- JSONObject jsonObject2 = JSON.parseObject(response2);
- if (jsonObject2.getInteger("code").equals(200)) {
- log.info("鑷姩缁勬墭鎴愬姛锛侊紒");
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "鑷姩缁勬墭鎴愬姛"));
- } else {
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "鑷姩缁勬墭澶辫触锛侊紒锛乥arcodeMat==>"+barcodeMat));
- News.error(methodName + "==>缁勬墭澶辫触:璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/yk/loc/v33", JSON.toJSONString(param), response2);
+ }else {
+ String errorMsg = jsonObject.getString("msg");
+ if (!Cools.isEmpty(errorMsg)) {
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
- try{
- Thread.sleep(500);
- } catch (Exception e){
-
- }
- } else {
- staProtocol.setWorkNo(wrkNo);
- wrkNo++;
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
-// if (ledThread != null) {
- String errorMsg = jsonObject.getString("msg");
- if (!Cools.isEmpty(errorMsg)) {
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
- }
-// }
-// News.error(methodName + ":璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
@@ -1029,7 +953,7 @@
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosX((short) (locMast.getRow1().shortValue()-13)); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setTraySize(locMast.getLocType1() == 2);
@@ -1196,7 +1120,7 @@
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosX((short) (sourceSta.getRow1().shortValue()-13)); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
@@ -1395,10 +1319,10 @@
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosX((short) (sourceSta.getRow1().shortValue()-13)); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosX((short) (sta.getRow1().shortValue()-13)); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 005a242..320a6ef 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -70,6 +70,10 @@
//lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
private Integer stamp = 0;
+ private boolean in = false;
+
+ private boolean out = false;
+
// 澶栧舰妫�娴� ------------------------------------------------------------------------
// 鍓嶈秴闄�
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 36053dd..d807363 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,6 +56,11 @@
add(1131);add(1132);add(1133);add(1134);add(1135);
}};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(1112);add(1114);add(1122);add(1124);add(1131);
+
+ }};
+
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1112); add(1122);
}};
@@ -205,8 +210,8 @@
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setIdle(status[1]); //绌洪棽
staProtocol.setLoading(status[2]); // 鏈夌墿
-// staProtocol.setInEnable(status[2]); // 鍙叆
-// staProtocol.setOutEnable(status[3]);// 鍙嚭
+ staProtocol.setIn(status[3]);
+ staProtocol.setOut(status[4]);
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
staProtocol.setRightErr(status[7]);
@@ -214,6 +219,9 @@
staProtocol.setWeightErr(status[9]);
staProtocol.setLow(status[10]);
staProtocol.setHigh(status[11]);
+
+ staProtocol.setInEnable(status[13]); // 鍙叆
+ staProtocol.setOutEnable(status[14]);// 鍙嚭
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*26+2)); // 宸ヤ綔鍙�
@@ -267,14 +275,13 @@
if (null == staProtocol) {
return;
}
- ArrayList<Integer> staNos = getStaNo();
- int index = staNos.indexOf(staProtocol.getSiteId());
+ int index = staNos2.indexOf(staProtocol.getSiteId());
OperateResult write = null;
OperateResult write1 = null;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB83." + index*8+6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write("DB83." + (index*8+6), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
write1 = siemensS7Net.Write("DB83." + (index*8+4), staProtocol.getStaNo()); // 鐩爣绔�
if(write.IsSuccess && write1.IsSuccess){
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6b4563b..4219aad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,20 +34,20 @@
enable: false
wms:
- url: 127.0.0.1:9090/ykwms
+ url: 127.0.0.1:8080/fyxcwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4
+ doubleLocs: 14,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 192.168.10.10
port: 102
rack: 0
slot: 0
@@ -61,27 +61,6 @@
row: 2
bay: 2
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1114
- row: 2
- bay: 2
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1122
- row: 2
- bay: 2
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1124
- row: 2
- bay: 2
- lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
@@ -89,37 +68,104 @@
row: 2
bay: 2
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1114
+ row: 3
+ bay: 30
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1114
+ row: 3
+ bay: 30
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1122
row: 2
bay: 2
- lev: 1
+ lev: 4
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1122
row: 2
bay: 2
- lev: 1
+ lev: 4
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1124
+ row: 3
+ bay: 30
+ lev: 4
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1124
- row: 2
- bay: 2
- lev: 1
+ row: 3
+ bay: 30
+ lev: 4
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1131
+ row: 3
+ bay: 30
+ lev: 8
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1131
+ row: 3
+ bay: 30
+ lev: 8
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.10.66
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
+ staNo: 1112
barcode: ${wcs-slave.barcode[0].id}
- barcodeMat: ${wcs-slave.barcode[3].id}
- backSta: 105
+ backSta: 1111
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 1114
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1113
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[2]:
+ staNo: 1122
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1121
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[3]:
+ staNo: 1124
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1123
+ led: ${wcs-slave.led[1].id}
+ outSta[0]:
+ staNo: 1111
+ led: ${wcs-slave.led[1].id}
+ outSta[1]:
+ staNo: 1121
+ led: ${wcs-slave.led[1].id}
+ outSta[2]:
+ staNo: 1113
+ led: ${wcs-slave.led[1].id}
+ outSta[3]:
+ staNo: 1123
led: ${wcs-slave.led[1].id}
diff --git a/src/main/webapp/static/images/logo-dark.png b/src/main/webapp/static/images/logo-dark.png
new file mode 100644
index 0000000..df4e153
--- /dev/null
+++ b/src/main/webapp/static/images/logo-dark.png
Binary files differ
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index e4b968c..45b3cfd 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -9,10 +9,12 @@
track = '',
tracks = '',
stn = '',
- stns = '',
barcode = '',
- barcodeArr = [],
+ hoist = '',
+ stns = '',
stnArr = [],
+ barcodeArr = [],
+ hoistArr = [],
floorBtn = '',
floorBtns = '',
floorBtnss = '',
@@ -141,8 +143,9 @@
var index = i
var n = 1
stnArr[index] = ''
- total[index] = ''
barcodeArr[index] = ''
+ hoistArr[index] = ''
+ total[index] = ''
for (let j = 0; j < stnss.length; j++) {
if (stnss[j].type == "stn") {
stn = "<div class='site' id='" + stnss[j].id +
@@ -164,7 +167,6 @@
"px'>" + stnss[j].text + "</div>"
stnArr[i] = stnArr[i] + stn
}
-
}
for (let k = 0; k < barcodes.length; k++) {
barcode = "<div class='barcode' id='" + barcodes[k].id +
@@ -175,9 +177,8 @@
"px;left: "+ barcodes[k].left + "px'>" + "</div>"
barcodeArr[i] = barcodeArr[i] + barcode
}
-
}
- floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss+ barcodeArr[0]
+ floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss + barcodeArr[0]
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
@@ -186,7 +187,7 @@
}
function changFloor(e) {
$(".main-part").empty() // 娓呯┖鑺傜偣
- floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss+ barcodeArr[0]
+ floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss + barcodeArr[e]
$(".main-part").append(floorInfo)
$("#line-total").empty()
$("#line-total").html(total[e])
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 656b620..584010a 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -13,8 +13,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack11",
@@ -22,8 +22,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack10",
@@ -31,8 +31,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}, {
"type": "rack",
"id": "rack9",
@@ -40,8 +40,8 @@
"left": 529,
"width": 1280,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 31
}],
"rackDescs": [{
"type": "rackDescs",
@@ -50,7 +50,7 @@
"top": 167,
"left": 1810,
"width": 30,
- "height": 23
+ "height": 0
}, {
"type": "rackDescs",
"id": "lb_desc2",
@@ -58,7 +58,7 @@
"top": 596,
"left": 1810,
"width": 30,
- "height": 23
+ "height": 0
}],
"crns": [{
"type": "track",
@@ -70,8 +70,8 @@
"height": 2
}, {
"type": "crane",
- "id": "crn-3",
- "text": "3",
+ "id": "crn-1",
+ "text": "1",
"top": 325,
"left": 490,
"width": 93,
@@ -95,59 +95,115 @@
"height": 668,
"stns": [{
"type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 239,
- "left": 468,
+ "id": "site-1112",
+ "text": "1112",
+ "top": 280,
+ "left": 580,
"width": 60,
- "height": 19
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1111",
+ "text": "1111",
+ "top": 238,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1114",
+ "text": "1114",
+ "top": 352,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1113",
+ "text": "1113",
+ "top": 394,
+ "left": 1740,
+ "width": 60,
+ "height": 40
}],
"barcode":[
{
"type": "barcode",
- "id": "barcode-1",
+ "id": "barcode-0",
"text": "",
- "top": 749,
- "left": 470,
+ "top": 210,
+ "left": 570,
"width": 80,
"height": 20
},
{
"type": "barcode",
- "id": "barcode-2",
+ "id": "barcode-1",
"text": "",
- "top": 684,
- "left": 470,
+ "top": 436,
+ "left": 1730,
"width": 80,
"height": 20
- } ,
+ }
+ ]
+ },{
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2搴�",
+ "top": 4,
+ "left": 22,
+ "width": 1819,
+ "height": 668,
+ "stns": [{
+ "type": "stn",
+ "id": "site-1122",
+ "text": "1122",
+ "top": 280,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1121",
+ "text": "1121",
+ "top": 238,
+ "left": 580,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1124",
+ "text": "1124",
+ "top": 352,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1123",
+ "text": "1123",
+ "top": 394,
+ "left": 1740,
+ "width": 60,
+ "height": 40
+ }],
+ "barcode":[
+ {
+ "type": "barcode",
+ "id": "barcode-2",
+ "text": "",
+ "top": 210,
+ "left": 570,
+ "width": 80,
+ "height": 20
+ },
{
"type": "barcode",
"id": "barcode-3",
"text": "",
- "top": 64.5,
- "left": 470,
+ "top": 436,
+ "left": 1730,
"width": 80,
- "height": 20
- }
- ,
- {
- "type": "barcode",
- "id": "barcode-4",
- "text": "",
- "top": 749,
- "left": 560,
- "width": 150,
- "height": 20
- }
- ,
- {
- "type": "barcode",
- "id": "barcode-5",
- "text": "",
- "top": 684,
- "left": 560,
- "width": 150,
"height": 20
}
]
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index dcbc329..81cdff3 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -21,7 +21,7 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+ <img src="../static/images/logo-dark.png" alt="涓壃" height="44">
</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 18a8c03..be04591 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -24,7 +24,7 @@
<li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>
+<!-- <li><a id="rgv" onclick="nav(this.id)" class="nav-unselect" href="#">RGV</a></li>-->
</ul>
</div>
</div>
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..beffbf3 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -114,7 +114,7 @@
<th>鍙嚭</th>
<th>鍏ュ簱鏍囪</th>
<th>绌烘澘淇″彿</th>
- <th>鐩爣绔�</th>
+ <th>宸插畬鎴愪换鍔�</th>
<th>楂樹綆搴撲綅</th>
</tr>
</thead>
@@ -302,7 +302,7 @@
setVal(tr.children("td").eq(5), table[i-1].outEnable);
setVal(tr.children("td").eq(6), table[i-1].pakMk);
setVal(tr.children("td").eq(7), table[i-1].emptyMk);
- setVal(tr.children("td").eq(8), table[i-1].staNo);
+ setVal(tr.children("td").eq(8), table[i-1].finishWorkNo);
setVal(tr.children("td").eq(9), table[i-1].locType1);
}
} else if (res.code === 403){
--
Gitblit v1.9.1