From eb5e61b0f85c78455caa4e0ba54245aff982ba3d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 六月 2023 09:13:00 +0800
Subject: [PATCH] 孚能
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 168 +++++++++++++++++++++++++--
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 8 +
src/main/resources/mapper/LocMastMapper.xml | 4
src/main/webapp/views/console.html | 10
src/main/java/com/zy/core/model/command/CrnCommand.java | 3
src/main/resources/mapper/WrkDetlMapper.xml | 4
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 10 +
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 16 +-
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2
src/main/java/com/zy/core/MainProcess.java | 4
src/main/java/com/zy/asrs/entity/LocMast.java | 2
src/main/java/com/zy/asrs/service/LocMastService.java | 10 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 68 ++++++-----
15 files changed, 250 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
index 1d3265e..ee64cc1 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -33,16 +33,16 @@
if(fireStatus == 1){
return LOC_ERROR;
} else if (locSts.equals("F") || locSts.equals("R") || locSts.equals("D")){
- if (packStatus == 1){
- return LOC_WAIT_TESTINT;
+ if (packStatus == 1 || locSts.equals("F")){
+ return LOC_WAIT_TESTINT;//寰呮祴
} else if (packStatus == 2){
- return LOC_TESTING;
- } else if (packStatus == 5){
- return LOC_STAY;
- } else if (packStatus == 6){
- return LOC_STAY_OVER;
+ return LOC_TESTING; //娴嬭瘯涓�
+ } else if (packStatus == 3){
+ return LOC_STAY; //OK
+ } else if (packStatus == 4){
+ return LOC_STAY_OVER; //NG
}else {
- return LOC_EMPTY;
+ return LOC_EMPTY; //
}
} else if (locSts.equals("O") || locSts.equals("S")){
return LOC_EMPTY;
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index ed7f026..0d4f47a 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -186,7 +186,7 @@
*/
@ApiModelProperty(value= "娑堥槻鐘舵�亄0:姝ｅ父,1:鎶ヨ}")
@TableField("fire_status")
- private Integer fireStatus;
+ private Integer fireStatus=0;
/**
* 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 9fd1d06..aeba308 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -35,4 +35,6 @@
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+ LocMast selectztgx(@Param("sts1") String sts1,@Param("sts2") String sts2,@Param("count") Integer count);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 5e6a297..bfe7cc2 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -16,6 +16,8 @@
List<WrkDetl> findByWorkNo(Integer workNo);
WrkDetl devpPackNo(@Param("workNo")Integer workNo);
+ WrkDetl devpPackNo1(@Param("workNo")Integer workNo);
+
int updateIoTime(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bc45966..9b88ca4 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocMast;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -45,5 +46,12 @@
*/
Boolean checkEmptyCount(LocMast locMast);
-
+ /**
+ * 鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴撶殑娴嬭瘯搴撲綅
+ * @param sts1 F
+ * @param sts2 R
+ * @param count i
+ * @return
+ */
+ LocMast selectztgx(String sts1,String sts2,Integer count);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ababf93..e11951b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -51,5 +52,8 @@
}
return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
}
-
+ @Override
+ public LocMast selectztgx(String sts1,String sts2,Integer count){
+ return this.baseMapper.selectztgx(sts1,sts2,count);
+ }
}
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 c17bc8b..b159090 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; }
- staProtocol.setPakMk(true);
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
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;
@@ -168,9 +169,17 @@
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();
@@ -200,7 +209,7 @@
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
+ 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);
@@ -208,7 +217,7 @@
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
staProtocol.setWorkNo((short)9998);
- staProtocol.setStaNo((short)101);
+ 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);
@@ -826,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;
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
@@ -1073,6 +1097,12 @@
return;
}
+ //娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
+ if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
+ log.error("鍑哄簱 ===>> 绛夊緟鍚姩鎸夐挳",wrkMast);
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
@@ -1085,7 +1115,11 @@
crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setBarcode(wrkMast.getBarcode());//鎵樼洏鐮�
+ 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 {
@@ -2085,9 +2119,9 @@
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
sign=true;
- if (locMast.getPackStatus()==3){
+ if (locMast.getPackStatus()==3){//娴嬭瘯瀹屾垚
newSingle=41;
- }else if (locMast.getPackStatus()==4){
+ }else if (locMast.getPackStatus()==4){//娴嬭瘯澶辫触
newSingle=4;
}else {
log.info("璇诲彇閫氶亾"+(i+1)+"娴嬭瘯搴撲綅鎸夐挳淇″彿:涓�"+devpThread.startSignal[i][0]+"閫氶亾搴撲綅pack鐘舵�佷俊鎭紓甯�"+locMast.getPackStatus());
@@ -2210,7 +2244,9 @@
}
try{
locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
- messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
+ 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);
}
@@ -2237,7 +2273,7 @@
public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
//澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
StaProtocol staProtocol = new StaProtocol();
- staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setSiteId(i);//瀵勫瓨鍣ㄥ湴鍧�
staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
return MessageQueue.offer(devp, id, new Task(5, staProtocol));
}
@@ -2255,12 +2291,12 @@
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("鐏 ===>> 缁欏爢鍨涙満娓呴浂澶嶄綅鎶ヨ淇″彿澶辫触");
}
}
@@ -2280,7 +2316,7 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("bas_devp",103));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
if (Cools.isEmpty(basDevp)){
log.error("103绔欑偣鏌ヨ澶辫触-MainServiceImpl.java-2255琛�");
}
@@ -2298,4 +2334,110 @@
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());
+ }else if(devpThread.startSignal[i][0]==5){
+ locMast.setPackStatus(4);
+ testMast.setStatus(4);
+ testMast.setModiTime(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();
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 32d69a1..7ffad1f 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -55,7 +55,13 @@
@Override
public WrkDetl devpPackNo(Integer workNo) {
- return this.baseMapper.devpPackNo(workNo);
+ WrkDetl wrkDetl=this.baseMapper.devpPackNo1(workNo);
+ if(Cools.isEmpty(wrkDetl)){
+ return this.baseMapper.devpPackNo(workNo);
+ }else {
+ return wrkDetl;
+ }
+
}
@Override
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 86a66cf..6aa5829 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -67,9 +67,9 @@
// mainService.outOfDevp();
//鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
- mainService.packTest();
+ mainService.packTest1();
// //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
-// mainService.fierCrn();
+ mainService.fierCrn();
//103绔欑偣鏈夌墿涓嬪彂pack鐮�
mainService.packDevp();
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index 6fb0c54..8c9c1c4 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -76,6 +76,9 @@
private String barcode= "";
+ //鐏: 1鏄伀璀�
+ private short fireStaut = 0;
+
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
this.taskModeType = CrnTaskModeType.get(taskModeType);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b489297..5563f68 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -86,7 +86,12 @@
write(command);
break;
case 4:
- siemensNet.Write("DB100.20", (short)task.getData());
+ if(task.getData().equals("0")){
+ siemensNet.Write("DB100.276", (short)0);
+ }else {
+ siemensNet.Write("DB100.276", (short)1);
+ }
+
break;
default:
break;
@@ -236,7 +241,7 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
-// convertRow(command);
+ //convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[12];
array[0] = command.getAckFinish();
@@ -255,7 +260,6 @@
if (command.getAckFinish() == 0){
OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
}
-
if (command.getAckFinish() == 0) {
short commandFinish = 1;
result = siemensNet.Write("DB100.18", commandFinish);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ee14cc7..3998985 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -54,7 +54,7 @@
private int barcodeSize = 2;
public IoModeType ioMode = IoModeType.NONE;
- public int[][] startSignal = new int[48][2];
+ public int[][] startSignal = new int[48][3];
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -89,47 +89,47 @@
StaProtocol staProtocol2 = (StaProtocol)task.getData();
siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
break;
- //澶嶄綅娴嬭瘯淇″彿
- case 3:
- StaProtocol staProtocol = (StaProtocol)task.getData();
- siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
- break;
- default:
- break;
- }
- // 蹇冭烦
+ //澶嶄綅娴嬭瘯淇″彿
+ case 3:
+ StaProtocol staProtocol = (StaProtocol)task.getData();
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
+ break;
+ default:
+ break;
+ }
+ // 蹇冭烦
// heartbeat();
Thread.sleep(400);
- } catch (Exception e) {
- e.printStackTrace();
- }
+} catch (Exception e) {
+ e.printStackTrace();
+ }
}
- }
+ }
- @Override
- public boolean connect() {
+@Override
+public boolean connect() {
boolean result = false;
siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
siemensS7Net.setRack(slave.getRack().byteValue());
siemensS7Net.setSlot(slave.getSlot().byteValue());
OperateResult connect = siemensS7Net.ConnectServer();
if(connect.IsSuccess){
- result = true;
- OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ result = true;
+ OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
- OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
siemensS7Net.ConnectClose();
return result;
- }
+ }
- /**
- * 璇诲彇鐘舵�� ====> 鏁村潡plc
- */
- private void read() throws InterruptedException {
+/**
+ * 璇诲彇鐘舵�� ====> 鏁村潡plc
+ */
+private void read() throws InterruptedException {
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
int staNoSize = staNos.size();
@@ -205,12 +205,17 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
+ //娴嬭瘯鏌滅姸鎬佽幏鍙�
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
+ //鍚姩绉诲簱鎸夐挳
+ OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
+ //娑堥槻鎶ヨ
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
- startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
- startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
+ startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//娴嬭瘯鏌滅姸鎬�
+ startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//娑堥槻鐘舵��
+ startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//鍚姩鎸夐挳鐘舵��
}
}
// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
@@ -251,7 +256,8 @@
*/
private void write103(String packNo){
try{
- OperateResult write = siemensS7Net.Write("DB109.", packNo);
+
+ OperateResult write = siemensS7Net.Write("DB109.0", packNo);
if (!write.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(packNo)));
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(packNo));
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index dea056a..5b4c293 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -60,4 +60,8 @@
ORDER BY NEWID()
</select>
+ <select id="selectztgx" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast where loc_sts in (#{sts1},#{sts2}) and channel=#{count}+1
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 91c1927..df633fa 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -53,7 +53,9 @@
<select id="devpPackNo" resultMap="BaseResultMap">
select top 1 * from asr_wrk_detl_log where 1=1 and wrk_no = #{workNo} order by io_time desc
</select>
-
+ <select id="devpPackNo1" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_detl where 1=1 and wrk_no = #{workNo} order by io_time desc
+ </select>
<update id="updateIoTime">
update asr_wrk_detl
set io_time = #{ioTime}
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index c795252..da7aa18 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -165,9 +165,9 @@
<span class="site machine-auto-flag" style="color:#FFFFFF; top:550px; left:300px">绌哄簱浣�</span>
<span class="site machine-stock-move-flag" style="color:#FFFFFF; top:550px; left:364px">鍦ㄥ簱寰呮祴</span>
<span class="site machine-site-move-flag" style="color:#FFFFFF; top:550px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span>
- <span class="site machine-take-flag" style="color:#FFFFFF; top:550px; left:534px">鍦ㄥ簱闈欑疆涓�</span>
- <span class="site machine-put-flag" style="color:#FFFFFF; top:550px; left:626px">闈欑疆瀹屾垚</span>
- <span class="site machine-error-flag" style="color:#FFFFFF; top:550px; left:696px">寮傚父鎶ヨ</span>
+ <span class="site machine-take-flag" style="color:#FFFFFF; top:550px; left:534px">娴嬭瘯鎴愬姛OK</span>
+ <span class="site machine-put-flag" style="color:#FFFFFF; top:550px; left:626px">娴嬭瘯澶辫触NG</span>
+ <span class="site machine-error-flag" style="color:#FFFFFF; top:550px; left:716px">寮傚父鎶ヨ</span>
</div>
<div id="body">
@@ -661,10 +661,10 @@
for (var val in res.data) {
switch (res.data[val]) {
case "LOC_STAY_OVER" :
- res.data[val] = "闈欑疆瀹屾垚"
+ res.data[val] = "娴嬭瘯澶辫触NG"
break;
case "LOC_STAY" :
- res.data[val] = "鍦ㄥ簱闈欑疆涓�"
+ res.data[val] = "娴嬭瘯鎴愬姛OK"
break;
case "LOC_WAIT_TESTINT" :
res.data[val] = "鍦ㄥ簱寰呮祴"
--
Gitblit v1.9.1