From 4c4c8fb50c3e9a86ebe6948bfa81961579ea86c3 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 16 六月 2025 14:59:31 +0800
Subject: [PATCH] wcs功能完善
---
src/main/java/com/zy/common/model/MatDto.java | 33 -------
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3
src/main/java/com/zy/common/model/CanningLineInLocParam.java | 3
src/main/java/com/zy/service/impl/MainServiceImpl.java | 81 +++++++++++--------
src/main/java/com/zy/common/model/SearchLocParam.java | 3
src/main/java/com/zy/core/model/command/LedCommand.java | 15 +++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 25 ++++--
src/main/resources/application.yml | 46 ++++++----
8 files changed, 117 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/zy/common/model/CanningLineInLocParam.java b/src/main/java/com/zy/common/model/CanningLineInLocParam.java
index d600dc6..7c8c0b2 100644
--- a/src/main/java/com/zy/common/model/CanningLineInLocParam.java
+++ b/src/main/java/com/zy/common/model/CanningLineInLocParam.java
@@ -28,6 +28,9 @@
// 澶嶆閲嶉噺
private double grossWeight;
+ // 澶嶆鍚堟牸鍚�
+ private boolean reinspection;
+
// 婧愮珯鐐�
private Integer sourceStaNo;
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 19429ab..66c5ca0 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -24,6 +24,8 @@
private double weight;
+ private double grossWeight;
+
private double length;
private double volume;
@@ -35,21 +37,11 @@
private String memo;
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
private Double total;
public MatDto() {
- }
- public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
- this.matnr = matnr;
- this.maknx = maknx;
- this.batch = batch;
- this.specs = specs;
- this.manu = manu;
- this.memo = memo;
- this.count = count;
- this.total = total;
}
public MatDto(String matnr,String batch,String specs,String manuDate,String model,double weight, double length,double volume) {
this.matnr = matnr;
@@ -60,24 +52,5 @@
this.weight = weight;
this.length = length;
this.volume = volume;
- }
-
- public MatDto(String matNo, String maknx, Double count) {
- this.matnr = matNo;
- this.maknx = maknx;
- this.count = count;
- }
- public MatDto(String matNo, String maknx, Double count,String specs) {
- this.specs = specs;
- this.matnr = matNo;
- this.maknx = maknx;
- this.count = count;
- }
- public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
- this.specs = specs;
- this.matnr = matNo;
- this.maknx = maknx;
- this.count = count;
- this.total = total;
}
}
diff --git a/src/main/java/com/zy/common/model/SearchLocParam.java b/src/main/java/com/zy/common/model/SearchLocParam.java
index 7c16632..e01c609 100644
--- a/src/main/java/com/zy/common/model/SearchLocParam.java
+++ b/src/main/java/com/zy/common/model/SearchLocParam.java
@@ -33,6 +33,9 @@
// 缃愯绾胯妗� 缃愯绾垮彿-妗剁被鍨�
private List<WantBucket> wantBucketFlag;
+ // 澶栧舰妫�娴�/绉伴噸鎶ラ敊锛屽嚭鍒板嚭搴撳彛1024
+ private String errMsg;
+
@Data
@AllArgsConstructor
public static class WantBucket{
diff --git a/src/main/java/com/zy/core/model/command/LedCommand.java b/src/main/java/com/zy/core/model/command/LedCommand.java
index 4bffcb7..b1eb05e 100644
--- a/src/main/java/com/zy/core/model/command/LedCommand.java
+++ b/src/main/java/com/zy/core/model/command/LedCommand.java
@@ -21,6 +21,11 @@
"title='" + title + '\'' +
", workNo=" + workNo +
", staNo=" + staNo +
+ ", count=" + count +
+ ", error=" + error +
+ ", orderNo=" + orderNo +
+ ", cstmrName=" + cstmrName +
+ ", finish=" + finish +
", sourceStaNo=" + sourceStaNo +
", locNo='" + locNo + '\'' +
", sourceLocNo='" + sourceLocNo + '\'' +
@@ -35,6 +40,16 @@
private Integer staNo;
+ private Integer count;
+
+ private Integer finish;
+
+ private String error;
+
+ private String orderNo;
+
+ private String cstmrName;
+
private Integer sourceStaNo;
private String locNo;
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index af48cf5..a3f26f6 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -105,6 +105,9 @@
// 澶嶆閲嶉噺
private double grossWeight;
+ // 澶嶆鍚堟牸鍚�
+ private boolean reinspection;
+
// 鍑虹綈瑁呯嚎浠诲姟瀹屾垚锛岀粰缃愯绾垮啓鍙斁淇″彿 1鍙斁锛�2涓嶅彲鏀�-------------------------------------
private int placeableFlag;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 82682c6..a6d3c39 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -224,7 +224,7 @@
// 璇荤綈瑁呯嚎鍙嶉淇℃伅
if (slave.getId() > 3) {
// log.info("璇诲彇{}鍙风綈瑁呯嚎plc淇℃伅鎴愬姛",slave.getId());
- OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 58);
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 60);
if (read.IsSuccess) {
// 15绉掓墦鍗颁竴涓嬫棩蹇�
if (System.currentTimeMillis() - lastLogTime >= 15000) {
@@ -241,17 +241,18 @@
if (staProtocol != null) {
staProtocol.setWantBucketFlag(siemensS7Net.getByteTransform().TransInt16(read.Content, 0));// 缃愯绾胯妗跺瀷淇″彿
staProtocol.setWrkNo(siemensS7Net.getByteTransform().TransInt16(read.Content, 2));
- double weight208l1 = siemensS7Net.getByteTransform().TransInt32(read.Content, 4); // 200L妗�1鍑�閲�
- double weight208l2 = siemensS7Net.getByteTransform().TransInt32(read.Content, 8); // 200L妗�2鍑�閲�
- double weight208l3 = siemensS7Net.getByteTransform().TransInt32(read.Content, 12); // 200L妗�3鍑�閲�
- double weight208l4 = siemensS7Net.getByteTransform().TransInt32(read.Content, 16); // 200L妗�4鍑�閲�
- double weight1T = siemensS7Net.getByteTransform().TransInt32(read.Content, 20); // 1T妗跺噣閲�
+ double weight208l1 = siemensS7Net.getByteTransform().TransSingle(read.Content, 4); // 200L妗�1鍑�閲�
+ double weight208l2 = siemensS7Net.getByteTransform().TransSingle(read.Content, 8); // 200L妗�2鍑�閲�
+ double weight208l3 = siemensS7Net.getByteTransform().TransSingle(read.Content, 12); // 200L妗�3鍑�閲�
+ double weight208l4 = siemensS7Net.getByteTransform().TransSingle(read.Content, 16); // 200L妗�4鍑�閲�
+ double weight1T = siemensS7Net.getByteTransform().TransSingle(read.Content, 20); // 1T妗跺噣閲�
// log.info("璇诲彇宸ョ綈瑁呯嚎鍑�閲� 200l妗�1:{},200l妗�2:{},200l妗�3:{},200l妗�4:{},1t妗�:{}",weight208l1,weight208l2,weight208l3,weight208l4,weight1T);
staProtocol.setWeight(weight208l1 + weight208l2 + weight208l3 + weight208l4 + weight1T);
- staProtocol.setGrossWeight(siemensS7Net.getByteTransform().TransInt32(read.Content, 24));
+ staProtocol.setGrossWeight(siemensS7Net.getByteTransform().TransSingle(read.Content, 24));
staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(read.Content, 28,12,"UTF-8"));
staProtocol.setBatch(siemensS7Net.getByteTransform().TransString(read.Content, 40,10,"UTF-8"));
staProtocol.setManuDate(siemensS7Net.getByteTransform().TransString(read.Content, 50,8,"UTF-8"));
+ staProtocol.setReinspection(siemensS7Net.getByteTransform().TransInt16(read.Content, 58) == 1);
}
return;
}
@@ -503,7 +504,15 @@
do {
write = siemensS7Net.Write("DB100.0", common);
Thread.sleep(200);
- if(write.IsSuccess){
+ OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.4", (short) 2);
+ if(write.IsSuccess && read.IsSuccess){
+ short i = siemensS7Net.getByteTransform().TransInt16(read.Content, 0);
+ if ( i != staProtocol.getWorkNo().shortValue()) {
+ writeCount++;
+ log.error("缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鎴愬姛锛屼絾鍥炶澶辫触锛氬啓鍏ヤ换鍔″彿锛歿},鍥炶浠诲姟鍙凤細{}锛岃緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}",staProtocol.getWorkNo().shortValue(), i, slave.getId(), writeCount);
+ continue;
+ }
+ log.info("缁欑綈瑁呯嚎鍐欏叆妗跺瀷淇℃伅鎴愬姛锛屽洖璇绘垚鍔燂細浠诲姟鍙凤細{},鍥炶浠诲姟鍙凤細{}锛岃緭閫佺嚎plc缂栧彿={}锛屽啓鍏ユ鏁�={}",staProtocol.getWorkNo().shortValue(), i, slave.getId(), writeCount);
break;
}
else {
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 26fcc24..c550397 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -90,7 +90,7 @@
taskStaNoToRgvStaNoMap.put(1050,1044);taskStaNoToRgvStaNoMap.put(1078,1044);taskStaNoToRgvStaNoMap.put(1064,1044);taskStaNoToRgvStaNoMap.put(1071,1044);taskStaNoToRgvStaNoMap.put(1096,1094);
taskStaNoToRgvStaNoMap.put(1104,1100);taskStaNoToRgvStaNoMap.put(1102,1100);taskStaNoToRgvStaNoMap.put(1090,1090);taskStaNoToRgvStaNoMap.put(1002,1001);taskStaNoToRgvStaNoMap.put(1016,1018);
- taskStaNoToRgvStaNoMap.put(1020,1019);taskStaNoToRgvStaNoMap.put(1024,1022);taskStaNoToRgvStaNoMap.put(1035,1034);taskStaNoToRgvStaNoMap.put(1040,1033);taskStaNoToRgvStaNoMap.put(1043,1041);
+ taskStaNoToRgvStaNoMap.put(1020,1019);taskStaNoToRgvStaNoMap.put(1024,1022);taskStaNoToRgvStaNoMap.put(1031,1033);taskStaNoToRgvStaNoMap.put(1035,1034);taskStaNoToRgvStaNoMap.put(1040,1033);taskStaNoToRgvStaNoMap.put(1043,1041);
canningLineRgvConnectionSiteList.add(1083);canningLineRgvConnectionSiteList.add(1086);
canningLineRgvConnectionSiteList.add(1089);
@@ -205,12 +205,11 @@
if (!staProtocol.isLoading()){
continue;
}
- if (!staProtocol.isPakMk()) {
- continue;
- }
News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- log.error("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- return;
+ // 濡傛灉瓒呴檺鎶ヨ鎴栬秴閲嶇瓑锛屽嚭鍒�1024
+ if(errMsg.equals("鎵爜澶辫触")) {
+ return;
+ }
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
@@ -222,11 +221,13 @@
) {
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || barcode.startsWith("ERROR")) {
log.error("{}鍙锋潯鐮佹娴嬪け璐ワ紝鏉＄爜淇℃伅锛歿}", inSta.getBarcode(), barcode);
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "鏉＄爜妫�娴嬪け璐ワ細"+barcode));
continue;
}
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
if (wrkMast != null) {
+ MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "鏉＄爜宸查噸澶嶏細" + barcode));
continue;
}
@@ -242,6 +243,7 @@
param.setBucketCount(staProtocol.getBucketCount());
param.setTailSupportFlag(staProtocol.isTailSupportFlag());
param.setWantBucketFlag(getWantBucketFlag());
+ param.setErrMsg(errMsg);
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
@@ -293,8 +295,8 @@
StaProtocol staProtocol1084 = devpThread.getStation().get(1084);
StaProtocol staProtocol1087 = devpThread.getStation().get(1087);
List<SearchLocParam.WantBucket> wantBucketList = new ArrayList<>();
- wantBucketList.add(new SearchLocParam.WantBucket(1071,staProtocol1081.getWantBucketFlag()));
wantBucketList.add(new SearchLocParam.WantBucket(1064,staProtocol1084.getWantBucketFlag()));
+ wantBucketList.add(new SearchLocParam.WantBucket(1071,staProtocol1081.getWantBucketFlag()));
wantBucketList.add(new SearchLocParam.WantBucket(1078,staProtocol1087.getWantBucketFlag()));
return wantBucketList;
}
@@ -808,6 +810,14 @@
break;
}
+ if (crnStn.getStaNo() == 1093) { // 鍒ゆ柇鍑哄簱鍒板埌1093锛屽垽鏂�1092鏄惁鏈夌墿,鏈夌墿涓嶅彲鍑�
+ StaProtocol staProtocol2 = devpThread.getStation().get(1092);
+ if(!staProtocol2.isAutoing() || staProtocol2.isLoading() || staProtocol2.getWorkNo() != 0) {
+ log.warn("1鍙峰爢鍨涙満鍑哄簱鍙栬揣鍓嶏紝鍒ゆ柇1092绔欑偣淇℃伅鑷姩锛歿}锛屾湁鐗╋細{}锛屽伐浣滃彿锛歿}锛屼笉鍙叆",staProtocol2.isAutoing(),staProtocol2.isLoading(),staProtocol2.getWorkNo());
+ continue;
+ }
+ }
+
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
News.warnNoLog(""+mark+" - 2"+" - 6"+" - 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞� : 寮�濮嬫墽琛� 浠诲姟鍙�={}",wrkMast.getWrkNo());
@@ -1292,33 +1302,29 @@
break;
}
ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
+ ledCommand.setLocNo(wrkMast.getLocNo());
+ ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
ledCommand.setStaNo(wrkMast.getStaNo());
ledCommand.setBarcode(wrkMast.getBarcode());
- if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
-// List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getSpecs(),wrkDetl.getManuDate(),wrkDetl.getModel(),wrkDetl.getWeight(),wrkDetl.getManLength(),wrkDetl.getVolume())));
-// wrkDetls.forEach(wrkDetl -> {
-// Double total = 0.0;
-// EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
-// LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
-// if (Cools.isEmpty(locDetl)) {
-// total = wrkDetl.getAnfme();
-// } else {
-// total = locDetl.getAnfme();
-// }
-// if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
-// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
-// }
-// if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
-// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
-// }
-// if (wrkMast.getIoType() == 107) {
-// ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
-// }
-// });
+ MatDto matDto = new MatDto();
+ // 鏄庣粏
+ WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (wrkDetl1 != null) {
+ ledCommand.setOrderNo(wrkDetl1.getOrderNo());
+ matDto.setMaknx(wrkDetl1.getMaktx());
+ matDto.setMatnr(wrkDetl1.getMatnr());
+ matDto.setBatch(wrkDetl1.getBatch());
+ matDto.setManuDate(wrkDetl1.getManuDate());
+ matDto.setAnfme(wrkDetl1.getAnfme());
+ matDto.setWeight(wrkDetl1.getWeight());
+ matDto.setGrossWeight(wrkDetl1.getManLength());
+ ledCommand.getMatDtos().add(matDto);
}
- commands.add(ledCommand);
+ // 璁㈠崟
+// if(wrkDetl1 != null && !Cools.isEmpty(wrkDetl1.getOrderNo())) {
+//
+// }
+ commands.add(0,ledCommand);
}
Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
// 鑾峰彇LED绾跨▼
@@ -1652,10 +1658,14 @@
log.warn("rgv鏀捐揣瀹屾垚锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
continue;
}
- wrkMast.setWrkSts(2L);
+ wrkMast.setWrkSts(5L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
- } else if(wrkMast.getIoType() == 101 && wrkMast.getWrkSts() == 2 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
+ } else if(wrkMast.getIoType() == 101 && (wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016 || wrkMast.getStaNo() == 1043)) {
+ if(wrkMast.getWrkSts() != 2 ) {
+ log.warn("rgv鏀捐揣瀹屾垚锛宺gv鏈浣�:rgv鍙穥}锛屼换鍔″彿锛歿}锛屼换鍔＄姸鎬亄}", wrkMast.getRgvNo(), wrkMast.getWrkNo(), wrkMast.getWrkSts());
+ continue;
+ }
wrkMast.setWrkSts(15L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
@@ -1873,10 +1883,11 @@
CanningLineInLocParam param = new CanningLineInLocParam();
param.setWrkNo(staProtocol.getWrkNo());
param.setMatnr(staProtocol.getMatnr().trim());
- param.setBatch(staProtocol.getBatch());
+ param.setBatch(staProtocol.getBatch().trim());
param.setManuDate(staProtocol.getManuDate());
param.setWeight(staProtocol.getWeight());
param.setGrossWeight(staProtocol.getGrossWeight());
+ param.setReinspection(staProtocol.isReinspection());
param.setSourceStaNo(site + 2);
param.setTbFlag(staProtocol2.isBarcodeErr());
@@ -1951,7 +1962,7 @@
staProtocol.setBucketCount(wrkDetl.getAnfme().intValue());
boolean result = MessageQueue.offer(SlaveType.Devp, inGzxSiteList.indexOf(site) + 4, new Task(4, staProtocol));
if (result) {
- log.info("鍛婅瘔缃愯绾垮叆搴撴《淇℃伅鍛戒护闃熷垪鎺ㄩ�佹垚鍔燂細" + staProtocol.getWorkNo() + "," + site + "," + staProtocol.getBucketType() +"," + staProtocol.getBucketCount());
+ log.info("鍛婅瘔缃愯绾垮叆搴撴《淇℃伅鍛戒护闃熷垪鎺ㄩ�佹垚鍔燂細" + staProtocol.getWorkNo() + "," +"鎵樼洏鐮侊細" + wrkMast.getBarcode() +"锛�" + site + "," + staProtocol.getBucketType() +"," + staProtocol.getBucketCount());
News.info("鍛婅瘔缃愯绾垮叆搴撴《淇℃伅鍛戒护闃熷垪鎺ㄩ�佹垚鍔燂細" + staProtocol.getWorkNo() + "," + site + "," + staProtocol.getBucketType() +"," + staProtocol.getBucketCount());
wrkMast.setWhsType(1); // 鏇存柊鎺ㄩ�佹爣璇嗭紝閬垮厤閲嶅鎺ㄩ��
wrkMastService.updateById(wrkMast);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 366baa0..2bf57a9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -168,12 +168,12 @@
inSta[0]:
staNo: 1006
barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 1012
barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 1018
@@ -187,19 +187,19 @@
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1024
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�2
outSta[1]:
staNo: 1040
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[4].id}
# 鍑哄簱鍙�3
outSta[2]:
staNo: 1043
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�4
outSta[3]:
staNo: 1016
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 杈撻�佺嚎2
devp[1]:
id: 2
@@ -207,6 +207,14 @@
port: 102
rack: 0
slot: 0
+ # 鍏ュ簱鍙�4
+ inSta[0]:
+ staNo: 1090
+ led: ${wcs-slave.led[6].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 1090
+ led: ${wcs-slave.led[6].id}
# 杈撻�佺嚎3
devp[2]:
id: 3
@@ -259,49 +267,49 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.190
+ ip: 192.168.2.221
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1024
+ staArr: 1012
# LED2
led[1]:
id: 2
- ip: 10.10.10.191
+ ip: 192.168.2.222
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1040
+ staArr: 1006
# LED3
led[2]:
id: 3
- ip: 10.10.10.191
+ ip: 192.168.2.223
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1042,1043
+ staArr: 1018,1016
# LED4
led[3]:
id: 4
- ip: 10.10.10.191
+ ip: 192.168.2.224
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1017,1016
+ staArr: 1041,1043
# LED5
led[4]:
id: 5
- ip: 10.10.10.191
+ ip: 192.168.2.225
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1007
+ staArr: 1040
# LED6
led[5]:
id: 6
- ip: 10.10.10.191
+ ip: 192.168.2.226
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1011
+ staArr: 1024
# LED7
led[6]:
id: 7
- ip: 10.10.10.191
+ ip: 192.168.2.227
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 1090
\ No newline at end of file
--
Gitblit v1.9.1