From bd456a3fca8cb8e8c1a15fa21ca02117512f3c5c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 四月 2024 09:57:04 +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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 6b18551..a8fd762 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
@@ -37,7 +37,7 @@
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cage!=null){
//鍙戦�乸lc浠诲姟
- Mestast(glassid, 40, cage.getId(), 1,"MESID1",1);
+ Mestast(glassid, 1001, cage.getId(), 1,"MESID1",1);
//浠诲姟鍙戦�佸瓧
}else{
@@ -52,6 +52,7 @@
if(cage!=null){
albaniaMapper.AddCage(cage.getId(), glassid, cage.getGlassWidth(), cage.getGlassHeight(), cage.getGlassWidthMm(), cage.getGlassHeightMm(), 1, cage.getGlasstype(), 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
+ albaniaMapper.UpdateStorage(cage.getGlassWidth(),cage.getGlassHeight(),cage.getId());
//鍙戦�乸lc浠诲姟
}else{
@@ -85,10 +86,10 @@
return (400);
}else{
- glass= albaniaMapper.SelectCageGlass(glassmate.getGlasstype());
- if(glass!=null){
+ glass= albaniaMapper.SelectCageGlass(glassmate.getGlasstype());
+ if(glass!=null){
//鍙戦�佷换鍔′箣鍓嶅垽鏂溅涓婄殑鍓╀綑瀹藉害鏄惁澶т簬姝ょ幓鐠�
- width+=glassmate.getWidth()+50;
+ width=width+glassmate.getWidth()+50;
//澶т簬杞︿笂绌轰綑瀹藉害鏃舵彁鍓嶅彂閫佸嚭鐗囧惎鍔�
if(width>5000){
//鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
@@ -97,7 +98,7 @@
}
//鍙戦�侀厤鐗囨暟鎹�
- Mestast(glass.getGlassId(), glass.getId(),7, 0,"MESID"+i,i);
+ Mestast(glass.getGlassId(), glass.getId(),line, 0,"MESID"+i,i);
albaniaMapper.AddFinishNumber(glassmate.getFlowcard(), glassmate.getMateid(), glassmate.getTier());
albaniaMapper.Inserttask(1, 0, glass.getId(), 2002, glassmate.getGlassid(), glassmate.getGlasstype(),glass.getFlowcard(),glassmate.getMateid(),glassmate.getTier());
if(glassmate.getTier()==glassmate.getId()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
@@ -131,9 +132,6 @@
System.out.println("outmesidbytes:" + bytes.length);
System.out.println(plcmes.getPlcParameter(address).getAddress());
System.out.println();
-
- //S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
- //S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
--
Gitblit v1.8.0