From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:12:53 +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 | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 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..8ebfe3d 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
@@ -28,7 +28,7 @@
StorageCage cage;
String glassid=glassInfo.getGlassid();
Double width=glassInfo.getWidth();
- //int mateid=glassInfo.getMateid();
+ Double height=glassInfo.getHeight();
String flowcard=glassInfo.getFlowcard();
int glasstype=glassInfo.getGlasstype();
//鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
@@ -37,8 +37,7 @@
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cage!=null){
//鍙戦�乸lc浠诲姟
- Mestast(glassid, 40, cage.getId(), 1,"MESID1",1);
- //浠诲姟鍙戦�佸瓧
+ Mestast(glassid, 1001, cage.getId(), 1,"MESID1",1);
}else{
//鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
@@ -46,14 +45,13 @@
cage=albaniaMapper.SelectNewCell(3,5);
}else{
cage=albaniaMapper.SelectNewCell(0,5);
- //鍙戦�乸lc浠诲姟
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cage!=null){
- albaniaMapper.AddCage(cage.getId(), glassid, cage.getGlassWidth(), cage.getGlassHeight(), cage.getGlassWidthMm(), cage.getGlassHeightMm(), 1, cage.getGlasstype(), 0);
+ albaniaMapper.AddCage(cage.getId(), glassid,width, height, cage.getGlassWidthMm(), cage.getGlassHeightMm(), 1, cage.getGlasstype(), 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
- //鍙戦�乸lc浠诲姟
-
+ albaniaMapper.UpdateStorage(width,height,cage.getId());
+ albaniaMapper.UpdateQueueState(glassid);
}else{
return(400);
}
@@ -85,19 +83,18 @@
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){
//鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
return (200);//缁撴潫
}
-
//鍙戦�侀厤鐗囨暟鎹�
- Mestast(glass.getGlassId(), glass.getId(),7, 0,"MESID"+i,i);
+ Mestast(glass.getGlassId(), glass.getId(),40, 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 +128,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