From bdd676ea0246acd555fff9c98c8d0bf24865437c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 19 一月 2026 17:42:50 +0800
Subject: [PATCH] WCS功能完善
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 +
src/main/java/com/zy/controller/SiteController.java | 15 +++
src/main/java/com/zy/service/impl/MainServiceImpl.java | 136 +++++++++++++++++++++++++--------
src/main/webapp/static/js/console.map.js | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 21 +++++
src/main/resources/application.yml | 7 +
6 files changed, 148 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
index 3fe8c23..4495b0a 100644
--- a/src/main/java/com/zy/controller/SiteController.java
+++ b/src/main/java/com/zy/controller/SiteController.java
@@ -152,8 +152,21 @@
return R.error("plc宸叉帀绾�");
}
+ @PostMapping("/startScan")
+ @ManagerAuth(memo = "瑙﹀彂鎵爜",value = ManagerAuth.Auth.NONE)
+ public R startScan(@RequestParam Integer siteId){
+ SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = siemensDevpThread.getStation().get(siteId).clone();
+ boolean offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ if (!offer) {
+ return R.parse("瑙﹀彂鎵爜鍛戒护涓嬪彂澶辫触");
+ }
+
+ return R.ok("瑙﹀彂鎵爜涓嬪彂鎴愬姛");
+ }
+
@PostMapping("/detl/update")
- @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁",value = ManagerAuth.Auth.NONE)
public R siteDetlUpdate(@RequestParam Integer siteId,
@RequestParam Integer workNo,
@RequestParam Short staNo,
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 6986acf..cb3f5a8 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -199,7 +199,7 @@
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- News.info("{}鍙峰爢鍨涙満锛屾敹鍒颁换鍔}瀹屾垚淇″彿",crnProtocol.getCrnNo(),crnProtocol.getTaskNo());
+ News.info("{}鍙峰爢鍨涙満锛屾敹鍒颁换鍔}瀹屾垚淇″彿,resetFlag:{}",crnProtocol.getCrnNo(),crnProtocol.getTaskNo(),resetFlag);
if (resetFlag) {
if(crnProtocol.getTaskNo()==9999){
backHpFlag = false;
@@ -217,6 +217,8 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnNo(slave.getId());
+ basCrnp.setHpMk(String.valueOf(crnProtocol.getYSpeed())); // 鍨傜洿閫熷害
+ basCrnp.setRetrieveMk(String.valueOf(crnProtocol.getXSpeed())); // 姘村钩閫熷害
basCrnp.setCrnSts((int)crnProtocol.getMode());
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
News.error("SiemensCrn"+" - 3"+" - 鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
@@ -298,7 +300,7 @@
}
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
- Thread.sleep(200);
+ Thread.sleep(500);
try{
OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
if (resultRead.IsSuccess) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9c3c08c..9b06e15 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -99,6 +99,9 @@
write((StaProtocol)task.getData());
// log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
+ case 3:
+ write1((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -340,6 +343,24 @@
}
/**
+ * 鎵爜鍣ㄨЕ鍙�
+ */
+ private void write1(StaProtocol staProtocol) {
+ if (null == staProtocol) {
+ return;
+ }
+ OperateResult writeResult1 = siemensS7Net.Write("DB100.500", true); // 鎵爜鍣ㄨЕ鍙�
+ if (!writeResult1.IsSuccess) {
+
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
+ log.error("鍐欏叆鎵爜鍣ㄨЕ鍙戞暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ log.info("鎵爜鍣ㄨЕ鍙戜笅鍙� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
+ }
+
+ /**
* 蹇冭烦
*/
private void heartbeat(){
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 54b1d2e..b1a9bda 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -154,7 +154,7 @@
back = true;
}
// 閫�鍥�
- if (back && (staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) && staProtocol.isLoading() && staProtocol.isPakMk()) {
+ if (back && (staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995 || staProtocol.getWorkNo() == 9997) && staProtocol.isLoading() && staProtocol.isPakMk()) {
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
staProtocol.setWorkNo(wrkNo);
News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
@@ -169,9 +169,11 @@
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && !staProtocol.isEmptyMk()
- && staProtocol.isPakMk() && staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) { // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
- if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+// && !staProtocol.isEmptyMk()
+ && staProtocol.isPakMk()
+ && (staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995|| staProtocol.getWorkNo() == 9997)) { // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
+ log.info("鍏ュ簱璇锋眰锛�" + staProtocol);
+ if(Cools.isEmpty(barcode) || barcode.endsWith("NG") || "NoRead".equals(barcode) || barcode.startsWith("00000000")) {
News.info("{}鏉＄爜鎵弿閿欒锛歿}",barcodeThread.getSlave().getId(),barcode);
staProtocol.setWorkNo(wrkNo);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -257,7 +259,7 @@
}
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
- if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ if(barcode.endsWith("NG") || barcode.equals("NoRead")) {
continue;
}
} else {
@@ -274,7 +276,7 @@
}
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()
- && staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995) {
+ && (staProtocol.getWorkNo() >= 9993 && staProtocol.getWorkNo() <= 9995 || staProtocol.getWorkNo() == 9997)) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�");
WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
if (wrkMast == null) {
@@ -327,7 +329,7 @@
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
wrkMast.setSourceStaNo(staProtocol.getSiteId()); // 婧愮珯
- wrkMast.setStaNo(staNo); // 鐩爣绔�
+ wrkMast.setStaNo(staProtocol.getSiteId()); // 鐩爣绔�
wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
wrkMast.setModiTime(now);
@@ -354,7 +356,7 @@
staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂5锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
+ log.info("杈撻�佺嚎涓嬪彂5锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
if (!result) {
News.error(""+mark+" - 3"+" - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
}
@@ -458,30 +460,46 @@
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
- && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
+ && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0 && wrkMastMapper.selectWorking(crn.getId()) == null) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛屽爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙�");
+ boolean success;
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
if (basCrnp.getInEnable().equals("Y")) {
//mark - 1 - ....
- this.crnStnToLoc(crn, crnProtocol,mark); // 鍏ュ簱
- crnProtocol.setLastIo("O");
- } else if (basCrnp.getOutEnable().equals("Y")) {
+ success = this.crnStnToLoc(crn, crnProtocol,mark); // 鍏ュ簱
+ if(success) {
+ crnProtocol.setLastIo("O");
+ continue;
+ }
+ }
+ if (basCrnp.getOutEnable().equals("Y")) {
//mark - 2 - ....
- this.locToCrnStn(crn, crnProtocol,mark); // 鍑哄簱
- crnProtocol.setLastIo("I");
+ success = this.locToCrnStn(crn, crnProtocol,mark); // 鍑哄簱
+ if(success) {
+ crnProtocol.setLastIo("I");
+ continue;
+ }
}
}
// 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
else if (crnProtocol.getLastIo().equals("O")) {
if (basCrnp.getOutEnable().equals("Y")) {
- this.locToCrnStn(crn, crnProtocol,mark); // 鍑哄簱
- crnProtocol.setLastIo("I");
- } else if (basCrnp.getInEnable().equals("Y")) {
- this.crnStnToLoc(crn, crnProtocol,mark); // 鍏ュ簱
- crnProtocol.setLastIo("O");
+ success = this.locToCrnStn(crn, crnProtocol,mark); // 鍑哄簱
+ if(success) {
+ crnProtocol.setLastIo("I");
+ continue;
+ }
+ }
+ if (basCrnp.getInEnable().equals("Y")) {
+ success = this.crnStnToLoc(crn, crnProtocol,mark); // 鍏ュ簱
+ if(success) {
+ crnProtocol.setLastIo("O");
+ continue;
+ }
}
}
+// log.info("鍫嗗灈鏈哄垏鎹㈠嚭鍏ュ簱妯″紡涓猴細{}",crnProtocol.getLastIo().equals("I") ? "鍏ュ簱" : "鍑哄簱");
}
// 搴撲綅绉昏浆
//mark - 3 - ....
@@ -493,7 +511,7 @@
/**
* 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
*/
- public synchronized void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
+ public synchronized boolean crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
News.warnNoLog(""+mark+" - 1"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽叆搴�");
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
boolean flag = false;
@@ -626,20 +644,25 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error(""+mark+" - 1"+" - 17"+" - 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
+ return true;
}
}
News.infoNoLog(""+mark+" - 1"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 锛� 鍏ュ簱鎵ц瀹屾瘯");
+ return false;
}
@Resource
+ private BasDevpMapper basDevpMapper;
+
+ @Resource
private ConfigService configService;
+
/**
* 鍑哄簱 ===>> 搴撲綅鍒板爢鍨涙満绔�
* 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
*/
- public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
+ public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
News.warnNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
-
// 鎺у埗鏄惁鍏佽杩炵画鍑哄簱锛屼笉鍒ゆ柇鍑哄簱绔欑偣鐘舵��(鏍规嵁鐘舵�佸惎鐢�)
boolean crnAvailableOut = false;
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","removeCrnAvailableOut"));
@@ -647,6 +670,15 @@
crnAvailableOut = true;
}
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
+ // 鍑哄叆搴撲换鍔℃帶鍒讹紝鏈夊叆搴撲换鍔′笉缁欏爢鍨涙満涓嬪彂鍛戒护
+ if (crnStn.getStaNo() == 205) {
+ BasDevp basDevp = basDevpMapper.selectById(crnStn.getStaNo());
+ Integer inQty = basDevp.getInQty();
+ if (inQty != 0) {
+ log.warn("璇ュ嚭搴撶珯鐐�:{},瀛樺湪鎵ц鐨勫叆搴撲换鍔�:{}鏉�", crnStn.getStaNo(), inQty);
+ continue;
+ }
+ }
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
for (WrkMast wrkMast : wrkMasts) {
@@ -685,7 +717,7 @@
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
- && (crnAvailableOut || !staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable())) {
+ && (crnAvailableOut || !staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable())) {
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
// continue;
@@ -743,7 +775,7 @@
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
if (wrkMastMapper.selectWorking(slave.getId()) != null) {
- break;
+ return false;
// return;
}
@@ -778,12 +810,13 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
News.error(""+mark+" - 2"+" - 14"+" - 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
- break;
+ return true;
}
}
}
}
News.infoNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 锛� 鍑哄簱鎵ц瀹屾瘯");
+ return false;
}
/**
@@ -1040,6 +1073,7 @@
for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
// 鑾峰彇绌烘澘鍏ュ簱绔欎俊鎭�
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, emptyInSta.getBarcode());
StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
if (staProtocol == null) {
continue;
@@ -1055,17 +1089,50 @@
if (!staProtocol.isLoading()){
continue;
}
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ // 灏哄妫�娴嬪紓甯�
+ boolean back = false;
+ String errMsg = "";
+ if (staProtocol.isFrontErr()) {
+ errMsg = "鍓嶈秴闄�";
+ back = true;
+ }
+ if (!back && (staProtocol.isBarcodeErr()||Cools.isEmpty(barcode))) {
+ errMsg = "鎵爜澶辫触";
+ back = true;
+ }
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
- && staProtocol.isEmptyMk()
- && staProtocol.isPakMk()
- && staProtocol.getWorkNo() >= 9990 && staProtocol.getWorkNo() <= 9992 // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
+// && staProtocol.isEmptyMk()
+// && staProtocol.isPakMk()
+ && ((staProtocol.getWorkNo() >= 9990 && staProtocol.getWorkNo() <= 9992) || staProtocol.getWorkNo() == 9996) // 9990-9992绌烘墭锛�9993-9995 婊℃墭锛�9999鍥為��
) {
+ if(back){
+ MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, errMsg));
+ staProtocol.setWorkNo(wrkNo);
+ News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", emptyInSta.getStaNo(), errMsg,wrkNo);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+emptyInSta.getBackSta());
+ return;
+ }
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
-
+ if(Cools.isEmpty(barcode) || barcode.endsWith("NG") || barcode.equals("NoRead") || barcode.startsWith("00000000") || barcode.contains("ERROR")) {
+ News.info("{}鏉＄爜鎵弿閿欒锛歿}",barcodeThread.getSlave().getId(),barcode);
+ staProtocol.setWorkNo(wrkNo);
+ staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(3, "鏉＄爜鎵弿閿欒"));
+ return;
+ }
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -1074,6 +1141,7 @@
param.setSourceStaNo(emptyInSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
param.setLocType2(locTypeDto.getLocType2());
+ param.setBarcode(barcode);
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -1090,7 +1158,7 @@
staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
+ log.info("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
if (!result) {
News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
throw new CoolException("SiemensDevp - 5");
@@ -1110,6 +1178,7 @@
MessageQueue.offer(SlaveType.Led, emptyInSta.getLed(), new Task(1, commands));
// ledThread.errorReset();
}
+ Thread.sleep(2000);
} else {
staProtocol.setWorkNo(wrkNo);
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
@@ -1128,6 +1197,7 @@
}
// News.error(""+mark+" - 3"+" - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}
+ Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1362,7 +1432,7 @@
ledCommand.setEmptyMk(true);
break;
default:
- News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
+// News.error("浠诲姟鍏ュ嚭搴撶被鍨嬮敊璇紒锛侊紒[宸ヤ綔鍙凤細{}] [鍏ュ嚭搴撶被鍨嬶細{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
break;
}
ledCommand.setLocNo(wrkMast.getLocNo());
@@ -1610,7 +1680,7 @@
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
// 鍒ゆ柇鏄笉鏄凡鍦ㄥ師鐐�
- if(crnProtocol.getBay() == 1 && crnProtocol.getLevel() == 1) {
+ if(crnProtocol.getBay() == 3 && crnProtocol.getLevel() == 1) {
continue;
}
// 鍒ゆ柇鏄笉鏄┖闂蹭笁鍒嗛挓
@@ -1641,7 +1711,7 @@
crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
crnCommand.setTaskMode((short)8); // 浠诲姟妯″紡: 鍥炲師鐐�
crnCommand.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) 1); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosY((short) 3); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b82ada6..669960f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -74,7 +74,7 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 205
row: 1
- bay: 9
+ bay: 12
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
@@ -88,7 +88,7 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 205
row: 1
- bay: 9
+ bay: 12
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
@@ -116,6 +116,7 @@
staNo: 205
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[2].id}
+ backSta: 205
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 203
@@ -133,6 +134,7 @@
staNo: 205
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[2].id}
+ backSta: 205
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 203
@@ -150,6 +152,7 @@
staNo: 205
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[2].id}
+ backSta: 205
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 203
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 1f24ab0..2d32dc7 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -145,7 +145,7 @@
"id": "site-205",
"text": "205",
"top": 325,
- "left": 945,
+ "left": 692,
"width": 83,
"height": 30
}
--
Gitblit v1.9.1