From ced0655bb9f83906eb9986462c9641c15baa5918 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 09 四月 2024 14:18:03 +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, 5 insertions(+), 9 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 a8fd762..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();
//鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
@@ -38,7 +38,6 @@
if(cage!=null){
//鍙戦�乸lc浠诲姟
Mestast(glassid, 1001, cage.getId(), 1,"MESID1",1);
- //浠诲姟鍙戦�佸瓧
}else{
//鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
@@ -46,15 +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);
- albaniaMapper.UpdateStorage(cage.getGlassWidth(),cage.getGlassHeight(),cage.getId());
- //鍙戦�乸lc浠诲姟
-
+ albaniaMapper.UpdateStorage(width,height,cage.getId());
+ albaniaMapper.UpdateQueueState(glassid);
}else{
return(400);
}
@@ -96,9 +93,8 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
return (200);//缁撴潫
}
-
//鍙戦�侀厤鐗囨暟鎹�
- Mestast(glass.getGlassId(), glass.getId(),line, 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()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
--
Gitblit v1.8.0