From 202ca0f62257d108e95ca2e5912b86cf7b407906 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 25 三月 2024 08:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
index 5c4474a..d68cb6b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java
@@ -40,6 +40,8 @@
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cageid!=Integer.MIN_VALUE){
//鍙戦�乸lc浠诲姟
+ Mestast(glassid, 1001, cageid, 1,"MESID1");
+ //浠诲姟鍙戦�佸瓧
//Mestast(glassid,1001,cageid,1);
}else{
@@ -52,7 +54,7 @@
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cageid!=Integer.MIN_VALUE){
- Mestast(glassid,1001,cageid,1);
+ Mestast(glassid,1001,cageid,1,"MESID1");
//鍙戦�乸lc浠诲姟
}else{
@@ -84,7 +86,7 @@
StorageCage glass= albaniaMapper.SelectCageGlass(glasstype);
//鍙戦�侀厤鐗囨暟鎹�
- Mestast(glassmate.getGlasstype()+"i", glass.getId(),2002, 0);
+ Mestast(glassmate.getGlasstype()+"i", glass.getId(),2002, 0,"MESID1");
albaniaMapper.AddFinishNumber(flowcard, mateid, tier);
albaniaMapper.Inserttask(1, 0, glass.getId(), 2002, glassmate.getGlassid()+i, glasstype,glass.getFlowcard(),mateid,tier);
if(tier==sumid){
@@ -111,8 +113,12 @@
glassidlist.add((byte) iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
+ //writeString
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
+ System.out.println(plcmes.getPlcParameter(address).getAddress());
+ System.out.println();
+
+ //S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
//S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
@@ -150,8 +156,9 @@
}
//涓嬪彂鐞嗙墖浠诲姟
- public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC) {
- outmesid(glassid, "MESID1");//涓嬪彂鐜荤拑id
+ public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC,String address) {
+ //outmesid(glassid, "MESID1");//涓嬪彂鐜荤拑id
+ S7control.getinstance().writeString(plcmes.getPlcParameter(address).getAddress(),glassid);
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart1").getAddress(), (short) MESToPLCStart1);//璧峰浣嶇疆
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget1").getAddress(), (short) MESToPLCTarget1);//鐩爣浣嶇疆
if(MESToPLC!=0){
--
Gitblit v1.8.0