From 62a3bea35d7d046881f3934c5ca63895c4383aeb Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 11 九月 2023 17:49:54 +0800
Subject: [PATCH] 调整sign界面样式，添加部分注释
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 21 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 09c3df4..951216b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -9,6 +9,7 @@
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.mapper.SpianMapper;
@@ -17,7 +18,7 @@
@Autowired
private SpianMapper spianMapper;
@GetMapping("/all2")
- public Result selectadd(String orderid){
+ public Result selectout(String orderid){
//瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist=new ArrayList<>();
adddresslist.add("DB105.6");//鍑虹墖杞﹁捣濮嬩綅缃�
@@ -28,9 +29,10 @@
//鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout=spianMapper.selectOut(orderid);
int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
- int cell =cageout.getCell();
- int tier =cageout.getTier();
- int id=cageout.getId();
+ int cell =cageout.getCell();//鍑虹墖鏍煎彿
+ int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
+ int prcid=cageout.getPrcId();//prcid
+ int prcid2;
int ids;
double glasswidth=cageout.getGlassWidth();
//鍒ゆ柇鐜荤拑鍐呭鐗�
@@ -38,7 +40,8 @@
//鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
//淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
- datas.add((short)id);
+
+ datas.add((short)prcid);
datas.add((short)1000);
datas.add((short)1);
datas.add((short)1);
@@ -55,42 +58,55 @@
//鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
if(cage<6){
StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
+ if(cagecell==null){
+ return Result.success(cagecell);
+ }
//鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峆RCID
ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
+ //鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
//濉叆璋冩嫧鏁版嵁
- datas.add((short)id);
- datas.add((short)ids);
+ datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
+ datas.add((short)prcid2);
datas.add((short)2);
datas.add((short)1);
//浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
- //鏇存崲鐜荤拑鐨勭瀛�
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
//鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
- datas.add((short)id);
+ datas.add((short)prcid);
datas.add((short)1000);
datas.add((short)1);
datas.add((short)1);
S7control.getinstance().WriteWord(adddresslist, datas);
//淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
+
return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
- }else{
+ }else{//绗煎瓙鍙峰ぇ浜�5鏃�
StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
+ if(cagecell==null){
+ return Result.success(cagecell);
+ }
//鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峱rcID
ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
//濉叆璋冩嫧鏁版嵁
- datas.add((short)id);
- datas.add((short)ids);
+ datas.add((short)prcid);
+ datas.add((short)prcid2);
datas.add((short)2);
datas.add((short)1);
+ //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
//浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
//鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
//濉叆鍑虹墖鏁版嵁
- datas.add((short)id);
+ datas.add((short)prcid);
datas.add((short)1000);
datas.add((short)1);
datas.add((short)1);
@@ -110,18 +126,29 @@
public Result selectAll(Short glassid){
//return spianMapper.selectAll();
int cage1;
+ int cells;
int ids;
- int tier;
- double widths=1500;
+ int prcid;
+ int tiers;
+ int prctier;
+
+ Glass glasslist=spianMapper.selectGlass(glassid);
+ double widths=glasslist.getWidth();
+ Short orderids=glasslist.getOrderId();
+
List<String> adddresslist=new ArrayList<>();
adddresslist.add("DB105.0");//杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");//杩涚墖杞︾洰鏍囦綅缃�
adddresslist.add("DB105.4");//杩涚墖绗肩幓鐠冩暟
adddresslist.add("DB105.12");//杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
List<Short> datas=new ArrayList<>();
+
//String orderid="A001";
//鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
List<StorageCage> storageCage=spianMapper.selectAll(glassid);
+ if(storageCage==null){
+ return Result.success(storageCage);
+ }
for (StorageCage storageCage2 : storageCage) {
//淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
cage1=storageCage2.getCage();
@@ -129,18 +156,22 @@
int cages=spianMapper.selectCage(cage1);
//鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
StorageCage cages1=spianMapper.selectCage1(cage1,widths);
- ids=cages1.getId();
- tier=cages1.getTier();
+ ids=cages1.getId();//鏁版嵁搴揑D
+ tiers=cages1.getTier();//鍐呭鐗�
+ cells=cages1.getCell();//鏍煎瓙鍙�
+ prcid=cages1.getPrcId();//浼犵粰prc鐨勭洰鏍囧湴id
+ prctier=spianMapper.selectsum(cage1, cells);//浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
//鏈夊悎閫傜┖鏍兼椂杩涚墖
if(cages>1 &&cages1.getTier()!=null){
//鎵ц杩涚墖
datas.add((short)1000);
- datas.add((short)ids);
- datas.add((short)tier);
+ datas.add((short)prcid);
+ datas.add((short)prctier);
datas.add((short)1);
S7control.getinstance().WriteWord(adddresslist, datas);
//鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
- spianMapper.UpdataAddCage("glassid", glassid, widths, cages, ids, tier, 1);//杩樻湭鑾峰彇鐜荤拑id
+
+ spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
return Result.success(cages1);
}
@@ -149,5 +180,108 @@
return Result.success("涓嶅彲杩涚墖");
}
+
+ @GetMapping("/all2")
+ public Result selectout2(String glassid){
+ //瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+ List<String> adddresslist=new ArrayList<>();
+ adddresslist.add("DB105.6");//鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.8");//鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.10");//鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.14");//鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas=new ArrayList<>();
+ //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
+ StorageCage cageout=spianMapper.selectOut2(glassid);
+ int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+ int cell =cageout.getCell();//鍑虹墖鏍煎彿
+ int tier =cageout.getTier();//鍑虹墖鍐呭鐗�
+ int prcid=cageout.getPrcId();//prcid
+ int prcid2;
+ int ids;
+ double glasswidth=cageout.getGlassWidth();
+ //鍒ゆ柇鐜荤拑鍐呭鐗�
+ if(tier==2){
+ //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+ //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+ spianMapper.UpdataGlassCage("","",glasswidth, cage, cell, tier, 0);
+
+ datas.add((short)prcid);
+ datas.add((short)1000);
+ datas.add((short)1);
+ datas.add((short)1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(datas);
+ }
+ else{
+ //鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+ int state= spianMapper.selectGlassState(cage,cell);
+ //鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+ if(state==0){
+ return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
+ }else{
+ //鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+ if(cage<6){
+ StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,0,6);
+ if(cagecell==null){
+ return Result.success(cagecell);
+ }
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峆RCID
+ ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
+ //鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
+ //濉叆璋冩嫧鏁版嵁
+ datas.add((short)prcid);//璋冩嫧澶栫墖璧峰浣嶇疆
+ datas.add((short)prcid2);
+ datas.add((short)2);
+ datas.add((short)1);
+ //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
+ datas.add((short)prcid);
+ datas.add((short)1000);
+ datas.add((short)1);
+ datas.add((short)1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ //淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
+ }else{//绗煎瓙鍙峰ぇ浜�5鏃�
+ StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
+ if(cagecell==null){
+ return Result.success(cagecell);
+ }
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2=cagecell.getPrcId();//璋冩嫧鐩爣浣峱rcID
+ ids=cagecell.getId();//璋冩嫧鐩爣浣岻D
+ //濉叆璋冩嫧鏁版嵁
+ datas.add((short)prcid);
+ datas.add((short)prcid2);
+ datas.add((short)2);
+ datas.add((short)1);
+ //杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdateDBCage(ids, cage, cell);//灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);//娓呴櫎鍘熸牸瀛愭暟鎹�
+ //浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+ //濉叆鍑虹墖鏁版嵁
+ datas.add((short)prcid);
+ datas.add((short)1000);
+ datas.add((short)1);
+ datas.add((short)1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+
+ }
+
+ }
+ }
+
+}
}
--
Gitblit v1.8.0