From 161c2226aa491e20a6d2547095d698d4c4854d90 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 10:48:59 +0800
Subject: [PATCH] 手动页面地址变更
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 b0e8782..8dc6562 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
@@ -24,6 +24,8 @@
//鏈夎繘鐗囪姹備絾鏄祴閲忓彴娌℃湁鐜荤拑
return 400;
}
+
+ System.out.println(glassInfo+"鍒濆");
//瀹氫箟鍒濆瀛楁
StorageCage cage;
String glassid=glassInfo.getGlassid();
@@ -44,20 +46,23 @@
if(glassInfo.getThickness()>=15){
cage=albaniaMapper.SelectNewCell(3,5);
}else{
- cage=albaniaMapper.SelectNewCell(0,5);
+ cage=albaniaMapper.SelectNewCell(0,4);
+
+ System.out.println(cage+"鐞嗙墖绗煎垽鏂�");
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
if(cage!=null){
- albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, cage.getGlasstype(), 0);
+ albaniaMapper.AddCage(cage.getId(), glassid,width, height, 1, glasstype, 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
albaniaMapper.UpdateStorage(width,height,cage.getId());
- albaniaMapper.UpdateQueueState(glassid);
+ System.out.println(cage+"浠诲姟鍙戦��");
}else{
return(400);
}
}
//澧炲姞浠诲姟璁板綍
albaniaMapper.Inserttask(0, 0, 1001, cage.getId(), glassid,glasstype, flowcard,0,0);
+ albaniaMapper.UpdateQueueState(glassid);
return(200);
}
@@ -67,6 +72,7 @@
GlassInfo glassmate=new GlassInfo();
GlassInfo method=new GlassInfo();
StorageCage glass=new StorageCage();
+ int glassend=0;
method=albaniaMapper.SelectMethod(line);
double width=0;
for(int i=1;i<=7;i++){
@@ -76,6 +82,8 @@
}else{
//鐩撮�氭ā寮忔椂鎸夐『搴忕洿鍑�
glassmate= albaniaMapper.SelectOutGlass2(line);
+ //鑾峰彇鐩撮�氭ā寮忔渶鍚庝竴鍧�
+ glassend=albaniaMapper.SelectOutGlassend(line);
}
if(glassmate==null){
@@ -97,11 +105,12 @@
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()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
+ if(glassmate.getTier()==glassmate.getId()||glassmate.getTier()==glassend){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
//鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
return (200);//缁撴潫
}
+
}else{
return (400);//缁撴潫
--
Gitblit v1.8.0