From 328f9b1f7a046378ef5d8f2b8337770fff372cc7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 26 十月 2024 19:12:07 +0800
Subject: [PATCH] 更新测试后代码
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianServiceNew.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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..64d54bb 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,42 +24,46 @@
//鏈夎繘鐗囪姹備絾鏄祴閲忓彴娌℃湁鐜荤拑
return 400;
}
+
+ System.out.println(glassInfo+"鍒濆");
//瀹氫箟鍒濆瀛楁
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();
//鍒ゆ柇鏄惁鏈夊悓绫诲瀷鐨�
- cage=albaniaMapper.SelectCage(glasstype,width, 50);
+ cage=albaniaMapper.SelectCage(glasstype,width, 300);
//濡傛灉鏈夊悓绫诲瀷鏃剁洿鎺ュ鍔�
if(cage!=null){
//鍙戦�乸lc浠诲姟
- Mestast(glassid, 40, cage.getId(), 1,"MESID1",1);
- //浠诲姟鍙戦�佸瓧
+ Mestast(glassid, 1001, cage.getId(), 1,"MESID1",1);
+ System.out.println("浠诲姟鍙戦�佺幓鐠僫d:"+glassid+"璧峰浣嶇疆:"+1001+"鏍煎瓙鍙�:"+cage.getId()+"鍚姩:"+1);
}else{
//鍒ゆ柇鐜荤拑鏄惁杩涘叆澶х墖绗�
if(glassInfo.getThickness()>=15){
cage=albaniaMapper.SelectNewCell(3,5);
}else{
- cage=albaniaMapper.SelectNewCell(0,5);
- //鍙戦�乸lc浠诲姟
+ cage=albaniaMapper.SelectNewCell(0,4);
+
+ System.out.println(cage+"鐞嗙墖绗煎垽鏂�");
}
//褰撹繑鍥炵殑鏍煎瓙鍙蜂负绌烘椂,杩斿洖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, 1, glasstype, 0);
Mestast(glassid,1001,cage.getId(),1,"MESID1",1);
- //鍙戦�乸lc浠诲姟
-
+ System.out.println("浠诲姟鍙戦�佺幓鐠僫d:"+glassid+"璧峰浣嶇疆:"+1001+"鏍煎瓙鍙�:"+cage.getId()+"鍚姩:"+1);
+ albaniaMapper.UpdateStorage(width,height,cage.getId());
}else{
return(400);
}
}
//澧炲姞浠诲姟璁板綍
albaniaMapper.Inserttask(0, 0, 1001, cage.getId(), glassid,glasstype, flowcard,0,0);
+ albaniaMapper.UpdateQueueState(glassid);
return(200);
}
@@ -69,42 +73,52 @@
GlassInfo glassmate=new GlassInfo();
GlassInfo method=new GlassInfo();
StorageCage glass=new StorageCage();
+ int glassend=0;
method=albaniaMapper.SelectMethod(line);
+ if(method==null){
+ return (400);
+ }
double width=0;
for(int i=1;i<=7;i++){
//濡傛灉涓嶆槸鐩撮�氭ā寮忓彧鍑烘湁瀹屾暣閰嶇墖鐨勬祦绋嬪崱
if(method.getMethod()==0){
- glassmate= albaniaMapper.SelectOutGlass(line);
+ glassmate= albaniaMapper.SelectOutGlass(1);
}else{
//鐩撮�氭ā寮忔椂鎸夐『搴忕洿鍑�
- glassmate= albaniaMapper.SelectOutGlass2(line);
+ glassmate= albaniaMapper.SelectOutGlass2(1);
+ //鑾峰彇鐩撮�氭ā寮忔渶鍚庝竴鍧�
+ glassend=albaniaMapper.SelectOutGlassend(1);
}
-
+ System.err.println("method:"+method+"glassmate:"+glassmate);
+ System.err.println(line);
if(glassmate==null){
//鏈鍙栦换鍔�
+ System.out.println("鏈鍙栦换鍔�");
return (400);
}else{
-
- glass= albaniaMapper.SelectCageGlass(glassmate.getGlasstype());
- if(glass!=null){
+
+ glass= albaniaMapper.SelectCageGlass(glassmate.getGlasstype());
+ System.out.println("glassmate:"+glassmate+"glassend:"+glassend+"glass:"+glass);
+ if(glass!=null){
//鍙戦�佷换鍔′箣鍓嶅垽鏂溅涓婄殑鍓╀綑瀹藉害鏄惁澶т簬姝ょ幓鐠�
- width+=glassmate.getWidth()+50;
+ width=width+glassmate.getWidth()+300;
//澶т簬杞︿笂绌轰綑瀹藉害鏃舵彁鍓嶅彂閫佸嚭鐗囧惎鍔�
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()){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
+ albaniaMapper.Inserttask(1, 0, glass.getId(), 2001, glassmate.getGlassid(), glassmate.getGlasstype(),glass.getFlowcard(),glassmate.getMateid(),glassmate.getTier());
+ if(glassmate.getTier()==glassmate.getId()||glassmate.getTier()==glassend){//褰撻厤鐗囨暟閲忕瓑浜庢垚鍝佸皬鐗囨�荤墖鏁版椂
//鏈閰嶇墖瀹屾垚鍙戦�佸惎鍔ㄥ懡浠�
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)1);//鍑虹墖浠诲姟鍚姩
+ System.out.println("浠诲姟绫诲瀷:1,浠诲姟鐘舵��:0,璧峰:"+glass.getId()+",鐩爣"+"40");
return (200);//缁撴潫
}
+
}else{
return (400);//缁撴潫
@@ -131,9 +145,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
}
@@ -178,6 +189,13 @@
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)MESToPLC);//mes鐞嗙墖浠诲姟绫诲瀷
}
}
+
+ // 鎵爜澧炲姞闃熷垪浠诲姟
+ public boolean scan(String address) {
+ List<Short> list = S7control.getinstance().ReadWord(address, 1);// 杩斿洖涓簍ure鏃朵负1
+ boolean listbool = list.contains((short) 1);
+ return listbool;
+ }
}
--
Gitblit v1.8.0