From 1de52d82ec5c3fb56e095a36571ab32bfdb15ca4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:25:01 +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 | 114 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 49 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 db1fd2a..6b18551 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
@@ -8,7 +8,6 @@
import com.example.springboot.component.S7control;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.StorageCage;
-import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.AlbaniaMapper;
import com.google.common.primitives.Bytes;
@@ -21,36 +20,38 @@
//璇诲彇DB105鍖烘枃浠�
private PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
public Short selectAll(GlassInfo glassInfo) {
+ if(glassInfo==null){
+ //鏈夎繘鐗囪姹備絾鏄祴閲忓彴娌℃湁鐜荤拑
+ return 400;
+ }
//瀹氫箟鍒濆瀛楁
- int cageid;
+ StorageCage cage;
String glassid=glassInfo.getGlassid();
Double width=glassInfo.getWidth();
//int mateid=glassInfo.getMateid();
String flowcard=glassInfo.getFlowcard();
int glasstype=glassInfo.getGlasstype();
-
-
-
//鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
- cageid=albaniaMapper.SelectCage(glasstype,width, 50);
+ cage=albaniaMapper.SelectCage(glasstype,width, 50);
+
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
- if(cageid!=Integer.MIN_VALUE){
+ if(cage!=null){
//鍙戦�乸lc浠诲姟
- Mestast(glassid, 1001, cageid, 1,"MESID1");
+ Mestast(glassid, 40, cage.getId(), 1,"MESID1",1);
//浠诲姟鍙戦�佸瓧
- //Mestast(glassid,1001,cageid,1);
}else{
//鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
- if(glassInfo.getThickness()>=15){
- cageid=albaniaMapper.SelectNewCell(3,5);
+ if(glassInfo.getThickness()>=15){
+ cage=albaniaMapper.SelectNewCell(3,5);
}else{
- cageid=albaniaMapper.SelectNewCell(3,5);
+ cage=albaniaMapper.SelectNewCell(0,5);
//鍙戦�乸lc浠诲姟
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
- if(cageid!=Integer.MIN_VALUE){
- Mestast(glassid,1001,cageid,1,"MESID1");
+ 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);
//鍙戦�乸lc浠诲姟
}else{
@@ -58,43 +59,60 @@
}
}
//澧炲姞浠诲姟璁板綍
- albaniaMapper.Inserttask(0, 0, 1001, cageid, glassid,glasstype, flowcard,0,0);
+ albaniaMapper.Inserttask(0, 0, 1001, cage.getId(), glassid,glasstype, flowcard,0,0);
return(200);
}
//鍑虹墖
public Short selectout(int line) {
- int mateid;
- int glasstype;
- int tier;
- int sumid;
- String flowcard;
GlassInfo glassmate=new GlassInfo();
-
+ GlassInfo method=new GlassInfo();
+ StorageCage glass=new StorageCage();
+ method=albaniaMapper.SelectMethod(line);
+ double width=0;
for(int i=1;i<=7;i++){
- glassmate= albaniaMapper.SelectOutGlass(line);
- mateid=glassmate.getMateid();
- glasstype=glassmate.getGlasstype();
- tier=glassmate.getTier();
- sumid=glassmate.getId();
- flowcard=glassmate.getFlowcard();
-
- StorageCage glass= albaniaMapper.SelectCageGlass(glasstype);
- //鍙戦�侀厤鐗囨暟鎹�
- 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){
- //鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)2);//鍑虹墖浠诲姟鍚姩
- return (200);//缁撴潫
- }
+ //濡傛灉涓嶆槸鐩撮�氭ā寮忓彧鍑烘湁瀹屾暣閰嶇墖鐨勬祦绋嬪崱
+ if(method.getMethod()==0){
+ glassmate= albaniaMapper.SelectOutGlass(line);
+ }else{
+ //鐩撮�氭ā寮忔椂鎸夐『搴忕洿鍑�
+ glassmate= albaniaMapper.SelectOutGlass2(line);
+ }
+ if(glassmate==null){
+ //鏈鍙栦换鍔�
+ return (400);
+ }else{
+
+ glass= albaniaMapper.SelectCageGlass(glassmate.getGlasstype());
+ if(glass!=null){
+ //鍙戦�佷换鍔′箣鍓嶅垽鏂溅涓婄殑鍓╀綑瀹藉害鏄惁澶т簬姝ょ幓鐠�
+ 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);
+ 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()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
+ //鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
+ return (200);//缁撴潫
+ }
+
+ }else{
+ return (400);//缁撴潫
+ }
+
+
+ }
}
-
-
-
return(200);// 缁撴潫
}
@@ -152,16 +170,14 @@
}
//涓嬪彂鐞嗙墖浠诲姟
- 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);//鐩爣浣嶇疆
+ public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC,String address,int i) {
+ S7control.getinstance().writeString(plcmes.getPlcParameter(address).getAddress(),glassid);//鐜荤拑id
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart"+i).getAddress(), (short) MESToPLCStart1);//璧峰浣嶇疆
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget"+i).getAddress(), (short) MESToPLCTarget1);//鐩爣浣嶇疆
if(MESToPLC!=0){
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)MESToPLC);//mes鐞嗙墖浠诲姟绫诲瀷
- }
-
-
+ }
}
+
}
--
Gitblit v1.8.0