From 35afa59be44abb4598611e0ca16247a6c6f71138 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 一月 2024 08:31:39 +0800
Subject: [PATCH] 代码测试更新
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 fc1ebb5..1179f74 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
@@ -19,7 +19,7 @@
// @GetMapping("/all")
public Short selectAll(String glassid) {
- int cage1;
+ int cage1=0;
int cells;
int ids;
int prcid;
@@ -29,9 +29,11 @@
double minwidth = 0;
north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+ //濡傛灉娌℃湁姝d鏃�
if (glasslist == null) {
return (300);
}
+
double widths = glasslist.getglasslengthmm();
String orderids = glasslist.getordernumber();
String FrameBarcode = glasslist.getFrameBarcode();
@@ -47,7 +49,10 @@
// String orderid="A001";
// 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
- List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode);
+ List<StorageCage> storageCage = spianMapper.selectAllFbarcode(FrameBarcode,widths,400);
+ //鍒ゆ柇閾濇鎸囧畾绌烘牸鏄惁闇�瑕侀棿闅旂┖闂�
+
+
if (storageCage.size() == 0) {
storageCage = spianMapper.selectAll(orderids, FrameBarcode);
}
@@ -164,10 +169,10 @@
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state);// 鏂板浠诲姟
// int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
- if (state == 2) {
- spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
- spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
- }
+ // if (state == 2) {
+ // spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
+ // spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
+ // }
System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
--
Gitblit v1.8.0