From 0b83163518f23e4571f3f510c38e9a25f46b6d07 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 08 九月 2023 17:06:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
index 4b1da37..c7a1c97 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java
@@ -1,6 +1,7 @@
package com.example.springboot.controller;
import com.example.springboot.common.Result;
+import com.example.springboot.component.S7control;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.SpianService;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@RestController
@@ -30,27 +32,53 @@
//鍑虹墖浠诲姟
@GetMapping("/all2")
public Result selectdd(String orderid){
+
+
+ //鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout=spianMapper.selectOut(orderid);
- //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
- //鐜荤拑鍐呭鐗�
-
- int cage =cageout.getCage();
+ int cage =cageout.getCage(); //鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell =cageout.getCell();
int tier =cageout.getTier();
- double width=cageout.getWidth();
+ double glasswidth=cageout.getGlassWidth();
+ //鍒ゆ柇鐜荤拑鍐呭鐗�
if(tier==2){
+ //鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
return Result.success("鎵ц鍑虹墖");
}
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);
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ List<String> adddresslist=new ArrayList<>();
+ adddresslist.add("DB105.6");
+ adddresslist.add("DB105.8");
+ adddresslist.add("DB105.10");
+ adddresslist.add("DB105.14");
+ List<Short> datas=new ArrayList<>();
+ datas.add((short)0);
+ datas.add((short)0);
+ datas.add((short)0);
+ datas.add((short)0);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+ }else{
+ StorageCage cagecell= spianMapper.selectGlassCage(cage,glasswidth,5,11);
+ //鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ StorageCage ca=cagecell;
+ return Result.success(cagecell); //璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ //鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
+
+ }
- return Result.success("鐘舵�佷负1,闇�瑕佽璋冩嫧");
}
}
@@ -72,13 +100,17 @@
int cages=spianMapper.selectCage(cage1);
//鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夌┖鏍�
StorageCage cages1=spianMapper.selectCage1(cage1);
+ //鏈夊悎閫傜┖鏍兼椂杩涚墖
if(cages>1 &&cages1.getTier()!=null){
+ //鎵ц杩涚墖
return Result.success(cages1);
+ }else{
+ //杩斿洖涓嶅彲杩涚墖
}
}
- return Result.success("0");
+ return Result.success("涓嶅彲杩涚墖");
}
--
Gitblit v1.8.0