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 | 147 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 109 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 91d91dd..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;
@@ -93,7 +92,55 @@
@Value("${wms.url}")
private String wmsUrl;
- public Integer wrkNo = 9997;
+ 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);
+ }
+ }
+ }
/**
* 缁勬墭
@@ -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() == 9999 && staProtocol.isInEnable() && 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() == 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,12 +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.setLocType1((short)1);
+// param.setLocType2(locTypeDto.getLocType2());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -265,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) {
@@ -280,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));
@@ -317,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(""); // 婧愬簱浣嶆竻绌�
@@ -597,6 +646,9 @@
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
+ if(crnStn.getBay() == 1 && locMast.getBay1() >= 15) { // 鍏ュ簱 闀垮簱浣嶅垯鍙栬揣浣嶇疆涓�0鍒�
+ crnCommand.setSourcePosY((short) 0);
+ }
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
@@ -741,6 +793,9 @@
crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
+ if(crnStn.getBay() == 1 && sourceSta.getBay1() >= 15) { // 闀垮簱浣� 鍑哄簱鏀捐揣鍒� 涓�0
+ crnCommand.setDestinationPosY((short) 0);
+ }
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
@@ -1022,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())) {
@@ -1038,17 +1106,19 @@
&& staProtocol.isInEnable()
&& staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
- && staProtocol.getWorkNo() == 9998 // 9997 鍥為�� 9998 绌� 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.setBarcode(barcode);
+ param.setLocType1((short)1);
+// param.setLocType2(locTypeDto.getLocType2());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -1056,6 +1126,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ log.info("绌烘墭鍏ュ簱璇锋眰wms鍘熷杩斿洖:" + jsonObject);
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
@@ -1067,7 +1138,7 @@
log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
if (!result) {
News.errorNoLog(""+mark+" - 1"+" - 鏇存柊plc绔欑偣淇℃伅澶辫触");
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ throw new CoolException("SiemensDevp - 5");
}
if (ledThread != null) {
@@ -1087,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绔欑偣淇℃伅澶辫触");
@@ -1613,8 +1684,8 @@
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo((short) 9999); // 宸ヤ綔鍙�
- crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 鍥炲師鐐�
- crnCommand.setSourcePosX((short) (crn.getId() == 1 ? 3 : 6)); // 婧愬簱浣嶆帓
+ crnCommand.setTaskMode((short)8); // 浠诲姟妯″紡: 鍥炲師鐐�
+ crnCommand.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) 1); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
--
Gitblit v1.9.1