From eaa749c5939632dd1aa7aa9440570886e29e6a63 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 15:32:42 +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 | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 19 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 262411c..e259214 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,10 +8,8 @@
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.example.springboot.mapper.SpianMapper;
import com.google.common.primitives.Bytes;
@@ -22,32 +20,89 @@
//璇诲彇DB105鍖烘枃浠�
private PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
public Short selectAll(GlassInfo glassInfo) {
+ if(glassInfo==null){
+ //鏈夎繘鐗囪姹備絾鏄祴閲忓彴娌℃湁鐜荤拑
+ return 400;
+ }
//瀹氫箟鍒濆瀛楁
int cageid;
+ String glassid=glassInfo.getGlassid();
+ Double width=glassInfo.getWidth();
+ //int mateid=glassInfo.getMateid();
+ String flowcard=glassInfo.getFlowcard();
+ int glasstype=glassInfo.getGlasstype();
+
+
//鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
- cageid=albaniaMapper.SelectCage(glassInfo.getGlasstype(), glassInfo.getWidth(), 50);
+ cageid=albaniaMapper.SelectCage(glasstype,width, 50);
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cageid!=Integer.MIN_VALUE){
- albaniaMapper.UpdateCageNumberAdd(cageid);
- }else{
+ //鍙戦�乸lc浠诲姟
+ Mestast(glassid, 1001, cageid, 1,"MESID1");
+ //浠诲姟鍙戦�佸瓧
+ //Mestast(glassid,1001,cageid,1);
+
+ }else{
//鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
if(glassInfo.getThickness()>=15){
cageid=albaniaMapper.SelectNewCell(3,5);
}else{
cageid=albaniaMapper.SelectNewCell(3,5);
+ //鍙戦�乸lc浠诲姟
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖400绗煎瓙宸叉弧
- if(cageid==Integer.MIN_VALUE){
+ if(cageid!=Integer.MIN_VALUE){
+ Mestast(glassid,1001,cageid,1,"MESID1");
+ //鍙戦�乸lc浠诲姟
+
+ }else{
return(400);
}
}
+ //澧炲姞浠诲姟璁板綍
+ albaniaMapper.Inserttask(0, 0, 1001, cageid, glassid,glasstype, flowcard,0,0);
return(200);
}
- public Short selectout2(String glassid) {
-
+ //鍑虹墖
+ public Short selectout(int line) {
+ int mateid;
+ int glasstype;
+ int tier;
+ int sumid;
+ String flowcard;
+ GlassInfo glassmate=new GlassInfo();
+
+ for(int i=1;i<=7;i++){
+ glassmate= albaniaMapper.SelectOutGlass(line);
+ if(glassmate==null){
+ //鏈鍙栦换鍔�
+ return (400);
+ }else{
+ mateid=glassmate.getMateid();
+ glasstype=glassmate.getGlasstype();
+ tier=glassmate.getTier();
+ sumid=glassmate.getId();
+ flowcard=glassmate.getFlowcard();
+
+ StorageCage glass= albaniaMapper.SelectCageGlass(glasstype);
+ if(glass!=null){
+ //鍙戦�侀厤鐗囨暟鎹�
+ Mestast(glassmate.getGlasstype()+"i", glass.getId(),2002, 0,"MESID"+i);
+ 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);//缁撴潫
+ }
+ }
+
+
+ }
+ }
return(200);// 缁撴潫
}
@@ -62,8 +117,12 @@
glassidlist.add((byte) iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
+ //writeString
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(plcmes.getPlcParameter(address).getAddressIndex()),bytes);
+ System.out.println(plcmes.getPlcParameter(address).getAddress());
+ System.out.println();
+
+ //S7control.getinstance().WriteByte(plcmes.getPlcParameter(address).getAddress(),bytes);
//S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
@@ -78,7 +137,7 @@
writedstrIdOut.append((char) iditem);
}
}
- return writedstrIdOut;
+ return writedstrIdOut;
}
// char鏁扮粍杞寲鎴恇it鏁扮粍
@@ -100,15 +159,15 @@
return listbool;
}
- // 鏍规嵁鐜荤拑id瀹屾垚鍦ㄨ繘琛屼腑鐨勪换鍔�
- public void overtask(String glassid) {
-
- // spianMapper.UpdatetaskOut(glassid.toString());// 瀹屾垚涓婁竴娆� 鍑虹墖鎴栬�呰繘鐗囦换鍔�
- // spianMapper.OverOutSlice(glassid.toString(), 2, 1);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
- // spianMapper.UpdataGlassCage(glassid.toString(), 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
- // spianMapper.UpdateCageOver(glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
- // spianMapper.UpdateCageadd(glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
- // spianMapper.UpdateAddQueue(glassid.toString());// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
+ //涓嬪彂鐞嗙墖浠诲姟
+ public void Mestast(String glassid,int MESToPLCStart1,int MESToPLCTarget1,int MESToPLC,String address) {
+ S7control.getinstance().writeString(plcmes.getPlcParameter(address).getAddress(),glassid);//鐜荤拑id
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStart1").getAddress(), (short) MESToPLCStart1);//璧峰浣嶇疆
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCTarget1").getAddress(), (short) MESToPLCTarget1);//鐩爣浣嶇疆
+ if(MESToPLC!=0){
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)MESToPLC);//mes鐞嗙墖浠诲姟绫诲瀷
+ }
}
+
}
--
Gitblit v1.8.0