From 6f271cc93b7992ae4613ac2fe2dad81c34630296 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 23 四月 2024 16:46:13 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 10 ++++------
1 files changed, 4 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 2988da2..baf7fa9 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
@@ -17,8 +17,6 @@
import com.example.springboot.mapper.SpianMapper;
import com.google.common.primitives.Bytes;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
@Service
public class SpianService {
@@ -26,7 +24,7 @@
private SpianMapper spianMapper;
// @GetMapping("/all")
- public Short selectAll(String glassid) {
+ public Short selectAll(north_glass_buffer1 glasslist) {
int cage1 = 0;
int cells;
@@ -36,8 +34,8 @@
int prctier;
double width;
double minwidth = 0;
-
- north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+
+ //north_glass_buffer1 glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
// 濡傛灉娌℃湁姝d鏃�
if (glasslist == null) {
return (300);
@@ -46,7 +44,7 @@
double widths = glasslist.getglasslengthmm();
String orderids = glasslist.getordernumber();
String FrameBarcode = glasslist.getFrameBarcode();
-
+ String glassid=glasslist.getbarcode();
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
--
Gitblit v1.8.0