From cafc5d7abdb72aa8a0a6a50e04aee509d5fe159a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 10:18:02 +0800
Subject: [PATCH] #合格数记录
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 242 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 226 insertions(+), 16 deletions(-)
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 e4b5bf4..9569b66 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -38,6 +38,7 @@
import com.zy.core.thread.SiemensCrnThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
@@ -50,6 +51,7 @@
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -128,10 +130,9 @@
} else {
staProtocol = staProtocol.clone();
}
-
+ //staProtocol.setPakMk(true);
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if ( inSta.getStaNo()==180 && devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
-
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -152,7 +153,7 @@
// }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
- WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode.substring(0,6));
if (wrkMast != null) {
log.error("宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
continue;
@@ -165,7 +166,20 @@
// }
try {
-
+ String pack =null;//pack鐮�
+ if(barcode.length()>6){
+ pack=barcode.substring(6);
+ if(pack.equals("00000000000000000000")){
+ log.error("娌℃湁鑾峰緱Pack鐮�",pack);
+ continue;
+ }
+ }
+ //String pack="MJY0136 0400";
+ barcode=barcode.substring(0,6);//鎵樼洏鐮�
+ if(barcode.equals("000000")){
+ log.error("娌℃湁鑾峰緱鏉＄爜",barcode);
+ continue;
+ }
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
locTypeDto.setLocType1((short)1);
SearchLocParam param = new SearchLocParam();
@@ -173,6 +187,7 @@
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+ param.setPackNo(pack);
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
@@ -182,7 +197,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(dto.getStaNo().shortValue());
@@ -194,16 +208,16 @@
} else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)201);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("url锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
}else {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo((short)201);
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
@@ -747,7 +761,8 @@
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞俓
+ crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -820,9 +835,24 @@
break;
// continue;
}
+ //鏌ヨ鍦ㄥ簱淇℃伅
+ LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","R")
+ .eq("loc_no",wrkMast.getSourceLocNo()));
+ if(Cools.isEmpty(locMast)){
+ log.error("鍑哄簱 ===>> 搴撲綅涓病鏈夎繖绗旇祫鏂�",wrkMast.getSourceLocNo());
+ continue;
+ }
+
+
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ //娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
+ if(wrkMast.getStaNo()==206 && locMast.getCtnKind()==0){
+ log.error("鍑哄簱 ===>> 绛夊緟鍚姩鍑哄簱鎸夐挳",wrkMast);
+ continue;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -890,6 +920,7 @@
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ crnCommand.setBarcode(wrkMast.getBarcode());
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -1066,6 +1097,12 @@
return;
}
+ //娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
+ if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
+ log.error("鍑哄簱 ===>> 绛夊緟鍚姩鎸夐挳",wrkMast);
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -1078,6 +1115,11 @@
crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 鐩爣搴撲綅灞�
+ if(!sta.getLocNo().equals("0102501")){
+ crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
+ }else {
+ crnCommand.setFireStaut((short) 1);
+ }
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -2021,7 +2063,7 @@
case 3://娴嬭瘯瀹屾垚
olsStatus = 4;//娴嬭瘯瀹屾垚
newStatus = 4;//娴嬭瘯瀹屾垚
- newSingle = 4;//娴嬭瘯瀹屾垚锛屽瘎瀛樺櫒鍦板潃锛�3===>>4
+ newSingle = 4;//锛圢G:4\OK:41锛夋祴璇曞畬鎴愶紝瀵勫瓨鍣ㄥ湴鍧�锛�3===>>4\41
break;
case 5://NG娴嬭瘯淇″彿
case 6://瀹屾垚娴嬭瘯淇″彿
@@ -2055,8 +2097,8 @@
newSingle = 0;//澶嶄綅锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
- break;
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
+ continue;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2065,11 +2107,26 @@
boolean sign=false;
switch (devpThread.startSignal[i][0]){
case 0:
+ if (!Cools.isEmpty(testMast)){
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
+ sign=true;
+ }
+ }
+ break;
case 3:
if (!Cools.isEmpty(testMast)){
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
sign=true;
+ if (locMast.getPackStatus()==3){//娴嬭瘯瀹屾垚
+ newSingle=41;
+ }else if (locMast.getPackStatus()==4){//娴嬭瘯澶辫触
+ newSingle=4;
+ }else {
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]+"閫氶亾搴撲綅pack鐘舵�佷俊鎭紓甯�"+locMast.getPackStatus());
+ sign=false;
+ }
}
}
break;
@@ -2174,7 +2231,7 @@
sign=true;
break;
default:
- log.error("璇诲彇娴嬭瘯搴撲綅淇″彿鍑洪敊");
+ log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]);
continue;
}
if (sign){
@@ -2184,6 +2241,14 @@
} else {
devpThread.startSignal[i][0] = newSingle;
}
+ }
+ try{
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
+ if(devpThread.startSignal[i][1]!=locMast.getFireStatus()){
+ messageQueueOffer2(i+1,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ }
+ }catch (Exception e){
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
}
}
@@ -2205,6 +2270,14 @@
return MessageQueue.offer(devp, id, new Task(3, staProtocol));
}
+ public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
+ return MessageQueue.offer(devp, id, new Task(5, staProtocol));
+ }
+
/**
* 灏嗙伀璀︽姤璀︿俊鍙峰啓鍏ュ埌鍫嗗灈鏈篜LC涓�
*/
@@ -2212,18 +2285,21 @@
public void fierCrn() {
try {
for (CrnSlave crn :slaveProperties.getCrn()) {
+ if(crn.getId()!=1){
+ continue;
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
if (!Cools.isEmpty(locMast)){
//鎶ヨ淇″彿鍐欏叆1
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)1))) {
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 1))) {
log.error("鐏 ===>> 缁欏爢鍨涙満鍙戦�佹姤璀︿俊鍙峰け璐�");
}
} else {
//鎶ヨ淇″彿娌℃湁鍚庯紝澶嶄綅鍦板潃
- if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)0))) {
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 0))) {
log.error("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
}
@@ -2235,4 +2311,138 @@
}
}
+ /**
+ * 103绔欑偣鏈夌墿涓嬪彂pack鐮�
+ */
+ @Transactional
+ public void packDevp() {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
+ if (Cools.isEmpty(basDevp)){
+ log.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
+ }
+ if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()>0 && basDevp.getLoading().equals("Y") ){
+ WrkDetl wrkDetl = wrkDetlService.devpPackNo(basDevp.getWrkNo());
+ if (Cools.isEmpty(wrkDetl)){
+ log.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
+ }
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4,wrkDetl.getMatnr()));
+ }
+ }
+ } catch (Exception e) {
+ log.error("103 ===>> 缁欒緭閫佺嚎鍙戦�丳ack鐮佸け璐�", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
+ /**
+ * 鏍规嵁PLC鎸夐挳娴嬭瘯銆佸畬鎴愩�佹殏鍋滀俊鍙凤紝鏇存柊testMast琛ㄤ腑status鍊硷紝浜ょ敱WMS绯荤粺澶勭悊
+ */
+ @Transactional
+ public void packTest1() {
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if(null != devpThread){
+ for (int i = 0; i < 48; i++){
+ //鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴�
+ LocMast locMast=locMastService.selectztgx("F","R",i);
+ if(!Cools.isEmpty(locMast)){
+ TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()));
+ if(Cools.isEmpty(testMast)){
+ continue;
+ }
+ //devpThread.startSignal[i][0]
+ //0:绌�,1:鍚姩涓�,2:宸ヤ綔涓�,3:鑷姩鏆傚仠,4:姝ｅ父瀹屾垚(OK),5:寮傚父鍋滄(NG),6:鍦ㄧ嚎,7:绂荤嚎,8:绌洪棽
+
+ //locMast.setPackStatus
+ // "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;9:鍦ㄧ嚎;10:绂荤嚎;11:绌洪棽;}"
+
+ //testMast.setStatus
+ //"鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3:娴嬭瘯涓� 4:瀹屾垚 5:绉诲簱 6:鐏"
+ if(devpThread.startSignal[i][0]==1){
+ testMast.setStatus(1);
+ testMast.setModiTime(new Date());
+ }else if(devpThread.startSignal[i][0]==2){
+ testMast.setStatus(3);
+ testMast.setModiTime(new Date());
+ }else if(devpThread.startSignal[i][0]==3){
+ locMast.setPackStatus(7);
+ testMast.setModiTime(new Date());
+ }else if(devpThread.startSignal[i][0]==4){
+ locMast.setPackStatus(3);
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(true,new Date());
+ }else if(devpThread.startSignal[i][0]==5){
+ locMast.setPackStatus(4);
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ testMastService.insertPackQualified(false,new Date());
+ }
+// else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
+// locMast.setPackStatus(devpThread.startSignal[i][0]+3);
+// }
+ //閫氶亾鍚姩鎸夐挳鐘舵�侊紝1:鍙互鍚姩鍑哄簱鎴栬�呯Щ搴擄紝0:涓嶈兘鍚姩鍑哄簱鎴栬�呯Щ搴�
+ locMast.setCtnKind(devpThread.startSignal[i][2]);
+ if(devpThread.startSignal[i][2]==1){
+ if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("loc_sts","R")
+ .eq("channel",i+1))){
+ log.error("淇敼鍚姩鎸夐挳鐘舵�侊紝娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
+ }
+ }else if(!locMast.getLocSts().equals("R")){
+ if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("loc_sts","F")
+ .eq("channel",i+1))){
+ log.error("淇敼娴嬭瘯搴撲綅鐘舵�佸け璐�"+locMast.getLocNo(),locMast);
+ }
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()))) {
+ log.error("淇敼娴嬭瘯妗ｇ姸鎬佸け璐�" + locMast.getLocNo(), locMast);
+ }
+ }
+ }
+ }
+ //缁橮LC鍐欐秷闃蹭俊鍙�
+ for (int i=0;i<48;i++){
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",i+1));
+ TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()));
+ try{
+ if(locMast.getFireStatus()!=devpThread.startSignal[i][1]){
+ messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ if(Cools.isEmpty(testMast)){
+ continue;
+ }
+ if(locMast.getFireStatus()==1){
+ testMast.setStatus(6);//鐏
+ if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
+ .eq("loc_no",locMast.getLocNo())
+ .eq("user_id",locMast.getBarcode()))) {
+ log.error("淇敼娴嬭瘯妗ｇ姸鎬佸け璐�" + locMast.getLocNo(), locMast);
+ }
+ }
+ }
+ }catch (Exception e){
+ log.error("鐏 ===>> 缁欒緭閫佺嚎鍙戦�佽鎶ュけ璐�,閫氶亾鍙凤細", i+1);
+ }
+ }
+
+ }
+
+ }
+ } catch (Exception e) {
+ log.error("鑾峰緱娴嬭瘯搴撲綅鐘舵�佸け璐�", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ }
+ }
}
--
Gitblit v1.9.1