From 1a91e5c0a6b7ee357fefd158d49d8e15f3bf6f00 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 01 十二月 2025 13:52:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/DevpSlave.java | 1
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 148 ++++++++++++++++++++++--------------
src/main/java/com/zy/core/MainProcess.java | 3
src/main/resources/mapper/BasAgvMastMapper.xml | 1
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 9 ++
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 13 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 +++
src/main/resources/application.yml | 8 ++
8 files changed, 130 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index 3d04eff..429a0c5 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -136,13 +136,20 @@
@TableField("devp_id")
private Integer devpId;
+ /**
+ * barcode
+ */
+ @ApiModelProperty(value= "barcode")
+ private String barcode;
+
@ApiModelProperty(value= "浠诲姟绫诲瀷")
@TableField("io_type")
- private Integer ioType;
+ private Integer ioType;//AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0 AGV搴撲綅==銆婣GV搴撲綅 1 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
public BasAgvMast() {
SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
this.timestamp = snowflakeIdWorker.nextId();
+ this.barcode = String.valueOf(snowflakeIdWorker.nextId());
this.priority = 1L;
this.status = 0;
diff --git a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
index 39ecb52..4353e93 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.BasArm;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.result.OrderDetlValueResultUtil;
import lombok.Data;
@@ -57,19 +58,19 @@
}
public OrderItem() {};
- public OrderItem(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
+ public OrderItem(BasArm basArm,BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
target_num = orderDetlValueResultUtil.getAnfme().intValue();
- from = String.valueOf((basArmMast.getSortingLine()+1)%2);
- to = String.valueOf((basArmMast.getSortingLine()+1)%2+2);
+ from = String.valueOf(basArm.getSortingLine());
+ to = String.valueOf(basArm.getStaNo());
sku_info = new SKUInfo(basArmMast,orderDetlValueResultUtil);
};
}
public ArmOrderAssignmentParam() {}
- public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
- order_id = basArmMast.getMatnr()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
+ public ArmOrderAssignmentParam(BasArm basArm, BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
+ order_id = basArmMast.getMatnr()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+basArm.getSortingLine();
List<OrderItem> orderItemArrayList= new ArrayList<>();
- OrderItem orderItem = new OrderItem(basArmMast,orderDetlValueResultUtil);
+ OrderItem orderItem = new OrderItem(basArm,basArmMast,orderDetlValueResultUtil);
orderItemArrayList.add(orderItem);
order_items = orderItemArrayList;
}
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 3e22f86..db75665 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -146,7 +146,6 @@
if(!staProtocol.isLoading()){
continue;
}
-
if (barcodeThread == null) {
continue;
}
@@ -221,30 +220,29 @@
&& !staProtocol.isEmptyMk()
&& staProtocol.isPakMk()
&& staProtocol.getWorkNo() == 0
+ && !barcode.equals("0")
+ && !Cools.isEmpty(barcode)
) {
- if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-// News.error(JSON.toJSONString(staProtocol));
- News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
- // led 寮傚父鏄剧ず
- if (ledThread != null) {
- String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
- MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
- }
- staProtocol.setWorkNo(wrkNo);
- staProtocol.setErrCode(errMsg);
- News.info("鏉＄爜鍒ゆ柇{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- wrkNo++;
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- staProtocol.setBarcode(barcode);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
- continue;
- }
- if(barcode.equals("0")){
- continue;
- }
+// if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+//// News.error(JSON.toJSONString(staProtocol));
+// News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+// // led 寮傚父鏄剧ず
+// if (ledThread != null) {
+// String errorMsg = "鎵爜澶辫触锛岃閲嶈瘯";
+// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
+// }
+// staProtocol.setWorkNo(wrkNo);
+// staProtocol.setErrCode(errMsg);
+// News.info("鏉＄爜鍒ゆ柇{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
+// wrkNo++;
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// staProtocol.setBarcode(barcode);
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
+// continue;
+// }
// if (staProtocol.getSiteId()!= 159){
// if( Cools.isEmpty(barcodeMat) || "NG".endsWith(barcodeMat) || "NoRead".equals(barcodeMat) || "00000000".equals(barcodeMat)) {
// News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcodeMat(), barcodeMat);
@@ -326,15 +324,6 @@
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂2锛�"+dto.getWorkNo()+","+dto.getStaNo());
- if(staProtocol.getSiteId() == 1036){ //1036
- BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("sta_no", 1037));
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
- agvBindCtnrAndBinParam.setCtnrCode(barcode);
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾瑙ｇ粦", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
- if (resultBind.getCode()!=200){
- agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV瀹瑰櫒缁戝畾瑙ｇ粦", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
- }
- }
ledThread.errorReset();
log.error("缁勬墭璇锋眰鍚嶭ED閿欒娓呴櫎");
@@ -3753,7 +3742,7 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
@@ -3850,7 +3839,7 @@
continue;
}
- if(wrkMastSta != null &&LEFT_POSITION.contains(wrkMastSta.getStaEnd())){
+ if( LEFT_POSITION.contains(wrkMastSta.getStaEnd())){
StaProtocol staProtocolSta = devpThread.getStation().get(wrkMastSta.getStaEnd());
if (staProtocolSta == null) {
News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍏ュ簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
@@ -3902,7 +3891,7 @@
try{
wrkMastSta.setWrkSts(1);
wrkMastStaMapper.updateById(wrkMastSta);
- log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
+ log.error("鏇存柊灏忚溅浠诲姟鎴愬姛{}",wrkMastSta);
}catch (Exception e){
log.error("鏇存柊灏忚溅浠诲姟澶辫触");
}
@@ -4409,6 +4398,40 @@
/*
* arm浠诲姟瀹屾垚鑷姩缁勬墭
* */
+ public synchronized void armMissionAccomplished1() {
+ try{
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
+ for (DevpSlave.Sta armSta : devp.getArmStaTwo()) {
+
+ // 鑾峰彇绔欑偣淇℃伅
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(armSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ String barcode = staProtocol.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
+ armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
+ continue;
+ }
+ } else {
+ armTaskAssignmentCallApiLogSave(staProtocol, "鎵樼洏鏉＄爜涓虹┖", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛�===銆嬫墭鐩樻潯鐮佷负绌�", false);
+ continue;
+ }
+ }
+ }
+ } catch (Exception e){
+ log.error("鏈烘鑷傛姄鍙栦换鍔″畬鎴愮粍鎵樺け璐�"+e.getMessage());
+ }
+ }
+
+ /*
+ * arm浠诲姟瀹屾垚鑷姩缁勬墭
+ * */
public synchronized void armMissionAccomplished2() {
try{
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().gt("arm_no",4));
@@ -4425,6 +4448,7 @@
new EntityWrapper<BasArmMast>()
.eq("arm_no", basArm.getArmNo())
.eq("sorting_line", basArm.getSortingLineSou())
+ .eq("sta_no", basArm.getStaNoSou())
.eq("status", 3)
);
if (basArmMastList.isEmpty()){
@@ -4626,7 +4650,7 @@
orderDetlValueResultUtil.setAnfme(anfmeSign);
//璁㈠崟涓嬪彂
try{
- ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArmMast,orderDetlValueResultUtil);
+ ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArm,basArmMast,orderDetlValueResultUtil);
// 璁㈠崟涓嬪彂(SKU+璁㈠崟)
ReturnT<String> result = new PostMesDataUtils().postMesData("鏈烘鑷傛姄鍙栬鍗曪紙SKU锛変笅鍙戯細",ArmConstant.getArmUrl(basArmMast.getArmNo()), ArmConstant.ARM_ADAPTOR, armOrderAssignmentParam);
if (result.getCode()!=200){
@@ -4770,7 +4794,7 @@
orderDetlValueResultUtil.setWidth(mat.getWidth());
//璁㈠崟涓嬪彂
try{
- ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArmMast,orderDetlValueResultUtil);
+ ArmOrderAssignmentParam armOrderAssignmentParam = new ArmOrderAssignmentParam(basArm,basArmMast,orderDetlValueResultUtil);
// 璁㈠崟涓嬪彂(SKU+璁㈠崟)
ReturnT<String> result = new PostMesDataUtils().postMesData("鏈烘鑷傛姄鍙栬鍗曪紙SKU锛変笅鍙戯細",ArmConstant.getArmUrl(basArmMast.getArmNo()), ArmConstant.ARM_ADAPTOR, armOrderAssignmentParam);
if (result.getCode()!=200){
@@ -4923,6 +4947,7 @@
basAgvMast.setTaskNo(wrkMast.getWrkNo());
basAgvMast.setSourceStaNo(outStaAgv.getStaNo());
basAgvMast.setLocNo(dto.getLocNo());
+ basAgvMast.setBarcode(wrkMast.getBarcode());
basAgvMast.setSourceLocNo(wrkMast.getSourceLocNo());
basAgvMast.setDevpId(devp.getId());
basAgvMast.setIoType(2);
@@ -5018,6 +5043,7 @@
basAgvMast.setSourceStaNo(outStaAgv.getStaNo());
basAgvMast.setLocNo(dto.getLocNo());
basAgvMast.setDevpId(devp.getId());
+ basAgvMast.setBarcode(barcode);
basAgvMast.setIoType(2);
basAgvMast.setFloorNo(2);
@@ -5060,7 +5086,7 @@
// 鍒ゆ柇閲嶅宸ヤ綔妗�
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("sta_no", inStaAgv.getStaNo()));
if (!basAgvMastList.isEmpty()) {
- News.info("{}鍙风珯鐐瑰瓨鍦ㄤ换鍔℃墽琛屼腑锛岀瓑寰呬换鍔℃墽琛屽畬姣�!!!", inStaAgv.getStaNo());
+// News.info("{}鍙风珯鐐瑰瓨鍦ㄤ换鍔℃墽琛屼腑锛岀瓑寰呬换鍔℃墽琛屽畬姣�!!!", inStaAgv.getStaNo());
continue;
}
// 浠诲姟鐢熸垚鍖� --------------------------------------------------------------------------
@@ -5098,6 +5124,7 @@
basAgvMast.setStaNo(inStaAgv.getStaNo());
basAgvMast.setDevpId(devp.getId());
basAgvMast.setFloorNo(floorNo);
+ basAgvMast.setBarcode(locMast.getBarcode());
basAgvMast.setIoType(0);//AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
basAgvMastService.insert(basAgvMast);
break;
@@ -5179,12 +5206,7 @@
}
if (staProtocol.isAutoing()){
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
- agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
- if (resultBind.getCode()!=200){
- agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV瀹瑰櫒缁戝畾", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
- }
+//
AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
//浠诲姟涓嬪彂
@@ -5264,22 +5286,30 @@
AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
if(basAgvMast.getFloorNo()==1 || basAgvMast.getStaNo().equals(2034)) {
- WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
- agvBindCtnrAndBinParam.setCtnrCode(wrkMast.getBarcode());
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾瑙ｇ粦", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
- if (resultBind.getCode()==200){
- //浠诲姟涓嬪彂
- ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
- if (result.getCode()==200){
- basAgvMast.setStatus(1);
- basAgvMastService.updateById(basAgvMast);
- } else {
- agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
- }
+// WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
+// AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
+// agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
+// agvBindCtnrAndBinParam.setCtnrTyp("1");
+// ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV瀹瑰櫒缁戝畾瑙ｇ粦", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);
+// if (resultBind.getCode()==200){
+// //浠诲姟涓嬪彂
+// ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+// if (result.getCode()==200){
+// basAgvMast.setStatus(1);
+// basAgvMastService.updateById(basAgvMast);
+// } else {
+// agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
+// }
+// } else {
+// agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV瀹瑰櫒缁戝畾瑙ｇ粦", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
+// }
+ //浠诲姟涓嬪彂
+ ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ if (result.getCode()==200){
+ basAgvMast.setStatus(1);
+ basAgvMastService.updateById(basAgvMast);
} else {
- agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV瀹瑰櫒缁戝畾瑙ｇ粦", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
+ agvTaskAssignmentCallApiLogSave(basAgvMast, "AGV浠诲姟涓嬪彂澶辫触", "浠诲姟鍙凤細"+basAgvMast.getTaskNo()+"浠诲姟淇℃伅涓嬪彂澶辫触锛侊紒锛�", false);
}
}else{
//浠诲姟涓嬪彂
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1e7ef89..7fd715a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -142,7 +142,8 @@
//arm浠诲姟瀹屾垚
mainService.armMissionAccomplished();//3==>4 ====> 3===銆�5
- mainService.armMissionAccomplished2();//3==>4 ====> 3===銆�5
+ mainService.armMissionAccomplished1();//3==>4 ====> 3===銆�5 2lou
+ mainService.armMissionAccomplished2();//3==>4 ====> 3===銆�5 2lou
// mainService.armMissionAccomplishedScanToCheckIn();//4===銆�5
//arm浠诲姟涓嬪彂
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index ac84e0d..667656e 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -29,6 +29,7 @@
private List<Sta> pickSta = new ArrayList<>();
private List<Sta> armSta = new ArrayList<>();
+ private List<Sta> armStaTwo = new ArrayList<>();
private List<Sta> outStaAgvFull = new ArrayList<>();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 25712d2..e11fb71 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -121,6 +121,12 @@
put(2031, 464);put(2032, 348);put(2033, 556);put(2034, 92);put(2035, 0);
put(2037, 256);
+// put(2101, 0);put(2102, 92);put(2103, 184);put(2104, 276);put(2105, 368);
+// put(2106, 460);put(2107, 552);put(2108, 644);put(2109, 736);put(2110, 828);
+// put(2111, 920);put(2112, 1012);put(2113, 1104);put(2114, 1196);put(2115, 1288);
+// put(2116, 1380);put(2117, 1472);put(2118, 1564);put(2119, 1656);put(2120, 1748);
+// put(2121, 1840);put(2122, 1932);
+
put(4001, 0);put(4002, 116);put(4003, 508);put(4004, 392);put(4005, 300);
put(4006, 208);
// 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
@@ -457,6 +463,8 @@
OperateResultExOne<byte[]> result3 = null;//1042-1053
OperateResultExOne<byte[]> result4 = null;//1054-1079
OperateResultExOne<byte[]> result5 = null;//1080-1110
+ OperateResultExOne<byte[]> result6 = null;//2101-2122
+
OperateResultExOne<byte[]> resultErr = null;
OperateResultExOne<byte[]> resultPlc = null;
OperateResultExOne<byte[]> resultAgv = null;
@@ -474,6 +482,7 @@
result1 = siemensS7Net.Read("DB200.0", (short) (3000));//2001-2030
result2 = siemensS7Net.Read("DB201.0", (short) (720));//2031-2037
result3 = siemensS7Net.Read("DB400.0", (short) (600));//4001-4006
+// result6 = siemensS7Net.Read("DB400.0", (short) (7400));//2101-2122
resultErr = siemensS7Net.Read("DB3.0", (short) (354));
// resultAgv = siemensS7Net.Read("DB901.0", (short) (7)); //agv鍙栨斁璐ц姹�
// resultPlc = siemensS7Net.Read("DB902.0", (short) (7)); //杈撻�佺嚎纭
@@ -507,9 +516,12 @@
}else{
if (siteId < 2031) {
result = result1;
- } else if (siteId < 4001) {
+ } else if (siteId < 2040) {
result = result2;
- } else {
+ } else if(siteId<4000){
+// result = result6;
+ }
+ else {
result = result3;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ce07fb7..c3c84ca 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -559,6 +559,14 @@
# outSta[2]:
# staNo: 156
# led: ${wcs-slave.led[4].id}
+ # 鎷嗗灈浣�
+ armStaTwo[0]:
+ staNo: 2110
+ armNo: 5
+ # 鎷嗗灈浣�
+ armStaTwo[1]:
+ staNo: 2120
+ armNo: 6
# 鏉＄爜鎵弿浠�1
diff --git a/src/main/resources/mapper/BasAgvMastMapper.xml b/src/main/resources/mapper/BasAgvMastMapper.xml
index 73f1b1f..fb2eb28 100644
--- a/src/main/resources/mapper/BasAgvMastMapper.xml
+++ b/src/main/resources/mapper/BasAgvMastMapper.xml
@@ -13,6 +13,7 @@
<result column="loc_no" property="locNo" />
<result column="priority" property="priority" />
<result column="floor_no" property="floorNo" />
+ <result column="barcode" property="barcode" />
<result column="status" property="status" />
<result column="error_time" property="errorTime" />
<result column="error_memo" property="errorMemo" />
--
Gitblit v1.9.1