From 3ba1c6b6591f5949cbad37192f411eb388f8fba7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 17:10:24 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/java/com/zy/service/impl/MainServiceImpl.java | 134 ++++++++---
src/main/webapp/static/js/console.map.js | 193 ++++++++++------
src/main/java/com/zy/core/MainProcess.java | 18 +
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/common/model/LocTypeDto.java | 33 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 42 +-
src/main/resources/application.yml | 220 ++++++++++----------
src/main/java/com/zy/core/ServerBootstrap.java | 14
9 files changed, 384 insertions(+), 274 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1579f5a..ff134fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>jgwcs</finalName>
+ <finalName>djwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index a1224cf..2bd06ab 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,7 +1,6 @@
package com.zy.common.model;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.utils.News;
import lombok.Data;
/**
@@ -31,22 +30,22 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow() || staProtocol.isChang() == staProtocol.isDuan()) {
- News.error("plc楂樹綆/闀跨煭妫�娴嬪紓甯�,high:{},low:{}锛宑hang:{},duan:{}",staProtocol.isHigh(),staProtocol.isLow(),staProtocol.isChang(),staProtocol.isDuan());
- return;
- }
-
- if (staProtocol.isHigh()) {
- this.locType1 = 2;
- } else {
- this.locType1 = 1;
- }
-
- if (staProtocol.isChang()) {
- this.locType2 = 2; // 闀垮簱浣�
- } else {
- this.locType2 = 1; // 鐭簱浣�
- }
+// if (staProtocol.isHigh() == staProtocol.isLow() || staProtocol.isChang() == staProtocol.isDuan()) {
+// News.error("plc楂樹綆/闀跨煭妫�娴嬪紓甯�,high:{},low:{}锛宑hang:{},duan:{}",staProtocol.isHigh(),staProtocol.isLow(),staProtocol.isChang(),staProtocol.isDuan());
+// return;
+// }
+//
+// if (staProtocol.isHigh()) {
+// this.locType1 = 2;
+// } else {
+// this.locType1 = 1;
+// }
+//
+// if (staProtocol.isChang()) {
+// this.locType2 = 2; // 闀垮簱浣�
+// } else {
+// this.locType2 = 1; // 鐭簱浣�
+// }
}
/**
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 8823dba..5b5c9c0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -40,23 +40,29 @@
continue;
}
+ // 璇诲彇宸ヤ綔妗ｇ姸鎬佷负1鐨勪换鍔★紝缁欒緭閫佺嚎涓嬪彂鍛戒护鐘舵�佹敼2
+// mainService.devFlow();
+
+ // 鍏ュ簱璐х墿鍒颁綅106锛宮k鏇存柊涓篩
+ mainService.flowEnd();
+
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-// mainService.stnToCrnStnPick(3);
+ mainService.stnToCrnStnPick(3);
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn(4);
+// mainService.crnStnToOutStn(4);
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute(5);
+// mainService.crnIoExecute(5);
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- mainService.storeFinished(6);
+// mainService.storeFinished(6);
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr(7);
+// mainService.recCrnErr(7);
// 杈撻�佺嚎寮傚父淇℃伅璁板綍
mainService.recDevpErr();
@@ -73,7 +79,7 @@
mainService.outOfDevp(11);
// 鍫嗗灈鏈哄洖鍘熺偣
- mainService.originGo();
+// mainService.originGo();
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index b37b6b3..b0dda94 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,13 +3,11 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
-import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
@@ -87,12 +85,12 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
- }
+// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// CrnThread crnThread = new SiemensCrnThread(crn);
+// new Thread((Runnable) crnThread).start();
+// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+// }
// 鍒濆鍖栫┛姊溅绾跨▼
// log.info("鍒濆鍖朢GV绾跨▼...................................................");
// for (RgvSlave rgv : slaveProperties.getRgv()) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9c3c08c..7181d32 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,20 +45,20 @@
private short heartBeatVal = 1;
private StaError1 staError1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(201);add(202);add(203);add(204);add(205);
+ add(101);add(102);add(103);add(104);add(105);add(106);
}};
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);add(3);
+ add(1);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(201); add(203); add(205);
+// add(201); add(203); add(205);
}};
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 3;
+ private int barcodeSize = 1;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -233,23 +233,23 @@
}
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.700", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
- if (resultErr.IsSuccess){
- for (int i = 0;i<staNosErrList.size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 1);
- StaProtocol staProtocol = station.get(staNosErrList.get(i));
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
-// staProtocol.setGroupSupportErr(status[5]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
-// short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
-// staProtocol.setGoodsHeight(goodsHeight);
- }
- }
+// OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.700", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+// if (resultErr.IsSuccess){
+// for (int i = 0;i<staNosErrList.size();i++){
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 1);
+// StaProtocol staProtocol = station.get(staNosErrList.get(i));
+// staProtocol.setFrontErr(status[0]);
+// staProtocol.setBackErr(status[1]);
+// staProtocol.setHighErr(status[2]);
+// staProtocol.setLeftErr(status[3]);
+// staProtocol.setRightErr(status[4]);
+//// staProtocol.setGroupSupportErr(status[5]);
+// staProtocol.setWeightErr(status[5]);
+// staProtocol.setBarcodeErr(status[6]);
+//// short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
+//// staProtocol.setGoodsHeight(goodsHeight);
+// }
+// }
// 鏁呴殰淇℃伅鍙嶉
OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.400", (short) (staNos.size() * 4));
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 24f466a..f15f2e4 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
import com.zy.common.model.StartupDto;
@@ -95,6 +94,54 @@
public Integer wrkNo = 9999;
+ public synchronized void devFlow() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,1);
+ StaProtocol staProtocol = devpThread.getStation().get(104);
+ if (staProtocol == null) {
+ return;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1).orderBy("io_time"));
+ if(wrkMast != null) {
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ if (result) {
+// log.info("鍏ュ簱杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
+ News.info("鍏ュ簱杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
+ wrkMast.setWrkSts(2L);
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }else {
+// log.error("鍏ュ簱杈撻�佺嚎鍛戒护涓嬪彂澶辫触锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
+ News.error("鍏ュ簱杈撻�佺嚎鍛戒护涓嬪彂澶辫触锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
+ }
+ }
+ }
+ }
+
+ public synchronized void flowEnd() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,1);
+ StaProtocol staProtocol = devpThread.getStation().get(106);
+ if (staProtocol == null) {
+ return;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
+ if(wrkMast != null && Cools.isEmpty(wrkMast.getMk())) {
+// log.info("璐х墿娴佸姩鍒颁綅106锛�"+wrkMast.getWrkNo());
+ News.info("璐х墿娴佸姩鍒颁綅106锛�"+wrkMast.getWrkNo());
+ wrkMast.setMk("Y");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ }
+
/**
* 缁勬墭
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵�� 2
@@ -123,27 +170,27 @@
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
- if (staProtocol.isFrontErr()) {
- errMsg = "鍓嶈秴闄�";
- back = true;
- }
- if (!back && staProtocol.isBackErr()) {
- errMsg = "鍚庤秴闄�";
- back = true;
- }
- if (!back && staProtocol.isHighErr()) {
- errMsg = "楂樿秴闄�";
- back = true;
- }
- if (!back && staProtocol.isLeftErr()) {
- errMsg = "宸﹁秴闄�";
- back = true;
- }
- if (!back && staProtocol.isRightErr()) {
- errMsg = "鍙宠秴闄�";
- back = true;
- }
- if (!back && staProtocol.isWeightErr()) {
+// if (staProtocol.isFrontErr()) {
+// errMsg = "鍓嶈秴闄�";
+// back = true;
+// }
+// if (!back && staProtocol.isBackErr()) {
+// errMsg = "鍚庤秴闄�";
+// back = true;
+// }
+// if (!back && staProtocol.isHighErr()) {
+// errMsg = "楂樿秴闄�";
+// back = true;
+// }
+// if (!back && staProtocol.isLeftErr()) {
+// errMsg = "宸﹁秴闄�";
+// back = true;
+// }
+// if (!back && staProtocol.isRightErr()) {
+// errMsg = "鍙宠秴闄�";
+// back = true;
+// }
+ if (staProtocol.isWeightErr()) {
errMsg = "瓒呴噸";
back = true;
}
@@ -152,7 +199,7 @@
back = true;
}
// 閫�鍥�
- if (back && (staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) && staProtocol.isLoading() && staProtocol.isPakMk()) {
+ if (back && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isPakMk()) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
staProtocol.setWorkNo(wrkNo);
News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
@@ -168,7 +215,7 @@
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
- && staProtocol.isPakMk() && staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) { // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
+ && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) { // 9997绌烘墭锛�9998婊℃墭/鎹℃枡锛�9999鍥為��
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
News.info("{}鏉＄爜鎵弿閿欒锛歿}",barcodeThread.getSlave().getId(),barcode);
continue;
@@ -185,13 +232,13 @@
continue;
}
try {
- LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
- param.setLocType1(locTypeDto.getLocType1());
- param.setLocType2(locTypeDto.getLocType2());
+ param.setLocType1((short)1);
+// param.setLocType2(locTypeDto.getLocType2());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -266,7 +313,8 @@
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�");
WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
if (wrkMast == null) {
@@ -281,13 +329,13 @@
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", pickSta.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", pickSta.getStaNo() + 1) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
staProtocol.setWorkNo(wrkNo);
- staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
+ staProtocol.setStaNo((short)103);
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂4锛�"+wrkNo+","+(pickSta.getStaNo().shortValue()-(short)1));
@@ -318,7 +366,7 @@
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
+ wrkMast.setSourceStaNo(wrkMast.getStaNo()+1); // 婧愮珯
wrkMast.setStaNo(staNo); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
@@ -1029,6 +1077,19 @@
} else {
staProtocol = staProtocol.clone();
}
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, emptyInSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ continue;
+ }
+ } else {
+ continue;
+ }
LedThread ledThread = null;
if (!Cools.isEmpty(emptyInSta.getLed())) {
@@ -1045,18 +1106,19 @@
&& staProtocol.isInEnable()
&& staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
- && staProtocol.getWorkNo() >= 9990 && staProtocol.getWorkNo() <= 9992 // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
+ && staProtocol.getWorkNo() == 9997
) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
try {
- LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
+// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
SearchLocParam param = new SearchLocParam();
param.setIoType(10);
param.setSourceStaNo(emptyInSta.getStaNo());
- param.setLocType1(locTypeDto.getLocType1());
- param.setLocType2(locTypeDto.getLocType2());
+ param.setBarcode(barcode);
+ param.setLocType1((short)1);
+// param.setLocType2(locTypeDto.getLocType2());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -1096,7 +1158,7 @@
} else {
staProtocol.setWorkNo(wrkNo);
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
+ devpThread.setPakMk(emptyInSta.getBackSta(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
News.errorNoLog(""+mark+" - 2"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5dcb7a0..c61bea5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jgwms
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=djwms
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8089/jgwms
+ url: 127.0.0.1:8088/djwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -46,98 +46,98 @@
groupCount: 2
# 鍫嗗灈鏈�1
- crn[0]:
- id: 1
- ip: 172.26.11.31
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 205
- row: 1
- bay: 9
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 2
- bay: 1
- lev: 1
+# crn[0]:
+# id: 1
+# ip: 172.26.11.31
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 201
+# row: 2
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+# crnInStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 203
+# row: 1
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 203
+# row: 1
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+# crnOutStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 205
+# row: 1
+# bay: 9
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+# crnOutStn[2]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 201
+# row: 2
+# bay: 1
+# lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 172.26.11.41
+ ip: 172.26.11.42
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 201
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 202
+ backSta: 103
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 205
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- backSta: 204
+# # 鍏ュ簱鍙�2
+# inSta[1]:
+# staNo: 205
+# barcode: ${wcs-slave.barcode[2].id}
+# led: ${wcs-slave.led[2].id}
+# # 鍏ュ簱鍙�3
+# inSta[2]:
+# staNo: 203
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# backSta: 204
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 201
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 202
+ backSta: 103
led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 205
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 203
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 204
- led: ${wcs-slave.led[1].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 104
-# barcode: ${wcs-slave.barcode[0].id}
-# backSta: 103
+# emptyInSta[1]:
+# staNo: 205
+# barcode: ${wcs-slave.barcode[2].id}
+# led: ${wcs-slave.led[2].id}
+# # 绌烘澘鍏ュ簱鍙�3
+# emptyInSta[2]:
+# staNo: 203
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 204
# led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[0].id}
# # 鎷ｆ枡鍏ュ簱鍙�2
# pickSta[1]:
# staNo: 106
@@ -146,16 +146,16 @@
# led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 204
- led: ${wcs-slave.led[1].id}
+ staNo: 101
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
- outSta[1]:
- staNo: 205
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 202
- led: ${wcs-slave.led[1].id}
+# outSta[1]:
+# staNo: 205
+# led: ${wcs-slave.led[2].id}
+# # 鍑哄簱鍙�3
+# outSta[2]:
+# staNo: 202
+# led: ${wcs-slave.led[1].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -163,15 +163,15 @@
ip: 172.26.11.43
port: 51236
# 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 172.26.11.44
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 172.26.11.45
- port: 51236
+# barcode[1]:
+# id: 2
+# ip: 172.26.11.44
+# port: 51236
+# # 鏉＄爜鎵弿浠�3
+# barcode[2]:
+# id: 3
+# ip: 172.26.11.45
+# port: 51236
# LED1
led[0]:
@@ -182,18 +182,18 @@
staArr: 202
crnId: 1
# LED2
- led[1]:
- id: 2
- ip: 192.168.5.105
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 204
- crnId: 1
- # LED3
- led[2]:
- id: 3
- ip: 192.168.5.106
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 205
- crnId: 1
\ No newline at end of file
+# led[1]:
+# id: 2
+# ip: 192.168.5.105
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 204
+# crnId: 1
+# # LED3
+# led[2]:
+# id: 3
+# ip: 192.168.5.106
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 205
+# crnId: 1
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e69beac..426ccdf 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jgwcs";
+var baseUrl = "/djwcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 1f24ab0..a963d3f 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -3,7 +3,7 @@
"rackCount": 8,
"crnCount": 2,
"stbCount": 18,
- "hpPosition": 1,
+ "hpPosition": 0,
"minBayNo": 1,
"floors": 1,
"racks": [
@@ -11,79 +11,115 @@
"type": "rack",
"id": "rack1",
"top": 250,
- "left": 270,
- "width": 1350,
+ "left": 500,
+ "width": 1000,
"height": 30,
- "minBayNo": 2,
- "maxBayNo": 17
+ "minBayNo": 1,
+ "maxBayNo": 22
}, {
"type": "rack",
"id": "rack2",
"top": 325,
- "left": 270,
- "width": 1350,
+ "left": 500,
+ "width": 1200,
"height": 30,
- "minBayNo": 2,
- "maxBayNo": 17
+ "minBayNo": 1,
+ "maxBayNo": 28
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 375,
+ "left": 500,
+ "width": 1200,
+ "height": 30,
+ "minBayNo": 1,
+ "maxBayNo": 28
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 450,
+ "left": 500,
+ "width": 1200,
+ "height": 30,
+ "minBayNo": 1,
+ "maxBayNo": 28
}
],
"rackDescs": [
{
"type": "rackDescs",
"id": "lb_desc13",
- "text": "銆嬨�嬨�嬪嚭搴�",
- "top": 360,
- "left": 1600,
+ "text": "銆嬨�嬨�嬪叆搴�",
+ "top": 280,
+ "left": 330,
"width": 100,
"height": 23
},
{
"type": "rackDescs",
"id": "lb_desc12",
- "text": "銆娿�娿�� 鍏ュ簱",
- "top": 220,
- "left": 1600,
+ "text": "銆娿�娿�� 鍑哄簱",
+ "top": 435,
+ "left": 330,
"width": 100,
"height": 23
},
{
"type": "rackDescs",
- "id": "lb_desc2",
- "text": "#1",
- "top": 330,
- "left": 233,
- "width": 33,
- "height": 23
- },
- {
- "type": "rackDescs",
"id": "lb_desc1",
- "text": "#2",
- "top": 255,
- "left": 235,
+ "text": "#1",
+ "top": 250,
+ "left": 1500,
"width": 33,
"height": 23
}
+ , {
+ "type": "rackDescs",
+ "id": "lb_desc2",
+ "text": "#2",
+ "top": 330,
+ "left": 1700,
+ "width": 33,
+ "height": 23
+ }
+ , {
+ "type": "rackDescs",
+ "id": "lb_desc3",
+ "text": "#3",
+ "top": 380,
+ "left": 1700,
+ "width": 33,
+ "height": 23
+ }
+ , {
+ "type": "rackDescs",
+ "id": "lb_desc4",
+ "text": "#4",
+ "top": 450,
+ "left": 1700,
+ "width": 33,
+ "height": 23
+ }
],
"crns": [
- {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 285,
- "left": 270,
- "width": 100,
- "height": 32
- },
- {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 302,
- "left": 270,
- "width": 1350,
- "height": 1
- }
+ // {
+ // "type": "crane",
+ // "id": "crn-1",
+ // "text": "1",
+ // "top": 285,
+ // "left": 270,
+ // "width": 100,
+ // "height": 32
+ // },
+ // {
+ // "type": "track",
+ // "id": "lb_track3",
+ // "text": "",
+ // "top": 302,
+ // "left": 270,
+ // "width": 1350,
+ // "height": 1
+ // }
],
"areas": [
{
@@ -106,47 +142,56 @@
"stns": [
{
"type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 250,
- "left": 1620,
+ "id": "site-101",
+ "text": "101",
+ "top": 400,
+ "left": 350,
"width": 70,
"height": 30
- },
- {
+ }
+ , {
"type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 250,
- "left": 1691,
+ "id": "site-102",
+ "text": "102",
+ "top": 400,
+ "left": 279,
"width": 70,
"height": 30
- },
- {
+ }
+ , {
"type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 325,
- "left": 1620,
+ "id": "site-103",
+ "text": "103",
+ "top": 369,
+ "left": 279,
"width": 70,
"height": 30
- },
- {
+ }
+ , {
"type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 325,
- "left": 1691,
+ "id": "site-104",
+ "text": "104",
+ "top": 338,
+ "left": 279,
"width": 70,
"height": 30
- },
- {
+ }
+ , {
"type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 325,
- "left": 945,
- "width": 83,
+ "id": "site-105",
+ "text": "105",
+ "top": 307,
+ "left": 279,
+ "width": 70,
+ "height": 30
+ }
+ , {
+ "type": "stn",
+ "id": "site-106",
+ "text": "106",
+ "top": 307,
+ "left": 350,
+ "width": 70,
"height": 30
}
]
--
Gitblit v1.9.1