From 67e81557661e44d1dd5c471e5a8fc12610be7284 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 十一月 2023 15:08:15 +0800
Subject: [PATCH] 英制尺转换率查询语句修改
---
CanadaMes-ui/src/views/home/index.vue | 10 +++++-----
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 11 +++--------
CanadaMes-ui/src/lang/locales/zh-CN.json | 4 +++-
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 9ae6fe4..e814137 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -232,6 +232,8 @@
"Cage Details":"鐞嗙墖绗艰鎯�",
"order":"璁㈠崟",
"length":"闀�",
+ "length(inch)":"闀�",
+ "width(inch)":"瀹�",
"width":"瀹�",
"Operate":"鎿嶄綔",
"end task":"瀹屾垚浠诲姟",
@@ -245,7 +247,7 @@
"Order Nmuber":"璁㈠崟缂栧彿",
"List Number":"鍒楄〃缂栧彿",
"Box Number":"绠卞瓙缂栧彿",
- "Length and Width":"灏哄",
+ "Length(inch) and Width(inch)":"灏哄",
"id":"id",
"content":"鍐呭",
"timeon":"鎶ヨ鏃堕棿",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index cae044e..fcebbe5 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -201,7 +201,7 @@
<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -216,7 +216,7 @@
<el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>
<el-table-column prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
@@ -304,10 +304,10 @@
<el-form-item :label="$t('order')">
<el-input v-model="form.orderId" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
+ <el-form-item :label="$t('length(inch)')">
<el-input v-model="form.height" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
+ <el-form-item :label="$t('width(inch)')">
<el-input v-model="form.width" readonly autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('Barcodid')">
@@ -359,7 +359,7 @@
<el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>
<el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>
<el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 921fbaa..c6456ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -32,7 +32,7 @@
List<StorageCage> selectRack4();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
- @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
+ @Select("select a.*,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage as a,conver as b where a.state=#{task_type} limit 1")
List<StorageCage> selectinout(@Param("task_type") Integer task_type);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -68,7 +68,7 @@
List<alarmmg> SelectAlarmmgInfo();
//鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
- @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage as a,glass as b ")
+ @Select("select *,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage as a,conver as b ")
List<StorageCage> SelectCageInfo(short cage);
@Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
@@ -87,12 +87,7 @@
StorageCage SelectGlassInfo(String glassid);
//鏌ヨ鐜荤拑淇℃伅
-// @Select("select * from glass where glassid=#{glassid}")
- @Select("SELECT id,glassid,orderid,\n" +
- " ROUND(width * Conversionrate, 2) AS width,\n" +
- " ROUND(height * Conversionrate, 2) AS height\n" +
- "FROM glass\n" +
- "where glassid=#{glassid};")
+ @Select("select * from glass where glassid=#{glassid}")
Glass SelectGlassByGlassID(String glassid);
//鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
--
Gitblit v1.8.0