From 4dac53b907f110d87940b1e06cc691afefe5d55a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 四月 2024 16:47:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java | 11
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 32 --
UI-Project/src/views/Returns/returns.vue | 170 +++++++---------
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 28 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 29 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 12
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 8
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml | 5
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java | 5
UI-Project/src/views/Caching/caching.vue | 58 +++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java | 9
hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml | 15 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml | 17
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkSequence.java | 2
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java | 17 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 18 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 100 ++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java | 16 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 37 +++
20 files changed, 421 insertions(+), 170 deletions(-)
diff --git a/UI-Project/src/views/Caching/caching.vue b/UI-Project/src/views/Caching/caching.vue
index 7b7903b..1734d49 100644
--- a/UI-Project/src/views/Caching/caching.vue
+++ b/UI-Project/src/views/Caching/caching.vue
@@ -13,27 +13,39 @@
const tableData = ref([])
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
-const fetchTableData = async () => {
- try {
- // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
- const response = await request.get("/unLoadGlass/unLoadGlass/downstorage");
+// const fetchTableData = async () => {
+// try {
+// // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
+// // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
+// const response = await request.get("unLoadGlass/downStorage/selectStorageCage");
- // 妫�鏌ュ搷搴旂姸鎬�
- if (response.code === 200) {
- // 鏇存柊琛ㄦ牸鏁版嵁
- console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
- tableData.splice(0, tableData.length, ...response.data);
- } else {
- // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
- ElMessage.error(response.msg);
- }
- } catch (error) {
- // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
- ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
- }
-};
-onMounted(fetchTableData);
+// // 妫�鏌ュ搷搴旂姸鎬�
+// if (response.code === 200) {
+// // 鏇存柊琛ㄦ牸鏁版嵁
+// console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
+// tableData.splice(0, tableData.length, ...response.data);
+// } else {
+// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+// ElMessage.error(response.msg);
+// }
+// } catch (error) {
+// // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+// ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
+// }
+// };
+// onMounted(fetchTableData);
+
+
+
+request.get("unLoadGlass/downStorage/selectStorageCage").then((res) => {
+ if (res.code == 200) {
+ console.log(res.data);
+ tableData.value = res.data
+ } else {
+ ElMessage.warning(res.msg)
+
+ }
+ });
const dialogForm = () => {
ElMessageBox.confirm(
@@ -139,9 +151,9 @@
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" label="鐜荤拑ID" min-width="80" />
- <el-table-column prop="long" align="center" label="浣嶇疆" min-width="120" />
- <el-table-column prop="wide" align="center" label="瀹�" min-width="120" />
- <el-table-column prop="type" align="center" label="闀�" min-width="120" />
+ <el-table-column prop="sequence" align="center" label="浣嶇疆" min-width="120" />
+ <el-table-column prop="width" align="center" label="瀹�" min-width="120" />
+ <el-table-column prop="height" align="center" label="闀�" min-width="120" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="200">
<template #default>
<el-button size="mini" type="text" plain @click="dialogForm">鎶ョ己</el-button>
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 759d3ca..12cd2dd 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -15,6 +15,16 @@
import { ref, onMounted } from "vue";
// import http from "@/http/index";
+
+let ruleForm = ref({
+ workstationId: '',
+ patternHeigth: '',
+ patternWidth: '',
+ filmsId: '',
+ patternThickness: '',
+ number: '',
+
+})
const tableDataa = ref([])
const requestData = {
@@ -54,6 +64,7 @@
if (res.code == 200) {
console.log(res.data);
tableDataa.value = res.data
+ // workstationId.value = res.data[0].workstationId
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -107,8 +118,63 @@
// }
// }
+const workstationId = ref('');
+const patternHeigth = ref('');
+const patternWidth = ref('');
+const filmsId = ref('');
+const patternThickness = ref('');
+const number = ref('');
+// 娣诲姞
+ const handleConfirm = async () => {
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ workstationId: workstationId.value,
+ patternHeigth: patternHeigth.value,
+ patternWidth: patternWidth.value,
+ filmsId: filmsId.value,
+ patternThickness: patternThickness.value,
+ number: number.value
+ });
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ add.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
+// 鍒犻櫎
+const handleConfirma = async () => {
+ try {
+ const response = await request.post('/loadGlass/LoadGlass/updateGlassMessage', {
+ workstationId: workstationId.value,
+ patternHeigth: 0,
+ patternWidth: 0,
+ filmsId: "",
+ patternThickness: 0,
+ number: 0
+ });
+
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ adda.value = false;
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
onMounted(fetchTableData);
interface User {
id: string
@@ -169,20 +235,6 @@
})
})
}
-const getTableRow = (type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- // router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
- break
- state: true
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
-}
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -240,13 +292,6 @@
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" >鍋滄浠诲姟</el-button>
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <!-- <el-table
- height="150"
- ref="table"
- :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
- :data="tableData"
- :span-method="objectSpanMethod"
- > -->
<el-table
height="150"
ref="table"
@@ -273,8 +318,6 @@
</el-card>
<div id="parent">
<img src="../../assets/shangpianji.png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 500px;">
- <!-- <el-button style="margin-top: -830px;margin-left: -40px;" size="mini" id="searchButton" @click="add = true">娣诲姞鍘熺墖</el-button> -->
- <!-- <el-button style="margin-top: -10px;margin-left: -80px;" size="mini" id="searchButton" @click="adda = true">娣诲姞鍘熺墖</el-button> -->
</div>
<div style="margin-top: -350px;margin-left: 650px;">
<el-table :data="tableDataa" border style="width: 60%"
@@ -286,8 +329,8 @@
<el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
<template #default>
- <el-button size="mini" type="text" plain @click="add = true">娣诲姞</el-button>
- <el-button size="mini" type="text" plain @click="open">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" plain @click="add = true">娣诲姞</el-button>
+ <el-button size="mini" type="text" plain @click="adda = true">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -307,19 +350,6 @@
:value="item.projectNo"
/>
</el-select>
- <!-- <el-select
- clearable
- placeholder="璇烽�夋嫨宸ョ▼"
- style="width: 300px"
- v-model="form.id"
- >
- <el-option
- v-for="item in billall"
- :key="item.id"
- :label="item.projectNo"
- :value="item.projectNo"
- />
- </el-select> -->
</el-form-item>
</div>
<template #footer>
@@ -340,14 +370,14 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-input v-model="patternHeigth" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
<el-form-item label="瀹斤細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-input v-model="patternWidth" autocomplete="off" />
</el-form-item></div>
</div>
</el-col>
@@ -357,14 +387,14 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="鑶滅郴锛�" :required="true" style="width: 14vw;">
- <el-input autocomplete="off" />
+ <el-input v-model="filmsId" autocomplete="off" />
</el-form-item></div></div>
</el-col>
<el-col :span="9">
<div id="dta" style="font-size: 15px;">
<div>
<el-form-item label="鍘氬害锛�" :required="true" style="width: 14vw">
- <el-input autocomplete="off" />
+ <el-input v-model="patternThickness" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -373,7 +403,7 @@
<div id="dt" style="font-size: 15px;">
<div>
<el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw;">
- <el-input autocomplete="off" />
+ <el-input v-model="number" autocomplete="off" />
</el-form-item></div></div>
</el-col>
</el-row>
@@ -382,65 +412,17 @@
</div>
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="getTableRow('edit')">
+ <el-button type="primary" @click="handleConfirm">
纭
</el-button>
<el-button @click="add = false">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
- <el-dialog v-model="adda" top="23vh" width="45%" title="娣诲姞鍘熺墖" >
- <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" >
- <el-form label-width="70px" label-position="right">
- <el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item label="闀匡細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" style="width: 180px" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item label="瀹斤細" :required="true" style="width: 14vw">
- <el-input autocomplete="off" style="width: 180px" />
- </el-form-item></div>
- </div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item label="鑶滅郴锛�" :required="true" style="width: 14vw;">
- <el-input autocomplete="off" style="width: 180px" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item label="鍘氬害锛�" :required="true" style="width: 14vw">
- <el-input autocomplete="off" style="width: 180px" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item label="鏁伴噺锛�" :required="true" style="width: 14vw;">
- <el-input autocomplete="off" style="width: 180px" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- </el-form>
- </el-form>
- </div>
+ <el-dialog v-model="adda" top="25vh" width="25%" title="鏄惁鍒犻櫎" >
<template #footer>
<div id="dialog-footer">
- <el-button type="primary" @click="adda = false">
+ <el-button type="primary" @click="handleConfirma">
纭
</el-button>
<el-button @click="adda = false">鍙栨秷</el-button>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index a2463c5..866f4b4 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -22,10 +22,10 @@
// 2銆佸叏灞�閰嶇疆
// 鍏ㄥ眬閰嶇疆
GlobalConfig gc = new GlobalConfig();
- gc.setOutputDir("D:\\Documents\\hangzhoumesParent1\\");
+ gc.setOutputDir("D:\\Documents\\hangzhoumesParent2\\");
gc.setServiceName("%sService"); //鍘绘帀Service鎺ュ彛鐨勯瀛楁瘝I
- gc.setAuthor("zhoush");
+ gc.setAuthor("wu");
gc.setOpen(false);
mpg.setGlobalConfig(gc);
@@ -41,7 +41,7 @@
// 4銆佸寘閰嶇疆
PackageConfig pc = new PackageConfig();
pc.setParent("com.mes");
- pc.setModuleName("userinfo"); //妯″潡鍚�
+ pc.setModuleName("engineering"); //妯″潡鍚�
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -50,7 +50,7 @@
// 5銆佺瓥鐣ラ厤缃�
StrategyConfig strategy = new StrategyConfig();
- strategy.setInclude("up_patten_usage");
+ strategy.setInclude("engineering");
strategy.setNaming(NamingStrategy.underline_to_camel);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
index 23fa7e1..4ecea3c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/pom.xml
@@ -18,11 +18,16 @@
<artifactId>mybatis-plus-join</artifactId>
<version>1.1.6</version>
</dependency>
- <dependency>
- <groupId>com.github.yulichang</groupId>
- <artifactId>mybatis-plus-join</artifactId>
- <version>1.1.6</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>sqljdbc4</artifactId>
+ <version>4.0</version>
+ </dependency>
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
index f145de5..ddc77a0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,6 +19,7 @@
* @author zhoush
* @since 2024-03-27
*/
+@ApiModel(description = "<p> 澶х悊鐗囩 </p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class BigStorageCage implements Serializable {
@@ -26,29 +29,35 @@
/**
* 澶х悊鐗囩琛╥d
*/
+ @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
/**
* 鏍呮牸鍙�
*/
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
private Integer slot;
/**
* 鍚敤鐘舵��
*/
+ @ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
private String enableState;
/**
* 鍓╀綑瀹藉害
*/
+ @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 6)
private Integer remainWidth;
+ @ApiModelProperty(hidden = true)
@TableField(exist = false)
private List<BigStorageCageDetails> bigStorageCageDetails;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index c4c9f4c..fc9c3e0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,6 +17,7 @@
* @author zhoush
* @since 2024-03-27
*/
+@ApiModel(description = "<p> 澶х悊鐗囩璇︽儏 </p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class BigStorageCageDetails implements Serializable {
@@ -23,72 +27,86 @@
/**
* 澶х悊鐗囩璇︽儏琛╥d
*/
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
/**
* 鏍呮牸鍙�
*/
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
private Integer slot;
/**
* 鐜荤拑id
*/
+ @ApiModelProperty(value = "鐜荤拑id", position = 5)
private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
*/
+ @ApiModelProperty(value = "灏忕墖鍦ㄦ牸鍐呯殑椤哄簭", position = 6)
private Integer sequence;
/**
* 娴佺▼鍗″彿
*/
+ @ApiModelProperty(value = "娴佺▼鍗″彿", position = 7)
private String flowCardId;
/**
* 鐜荤拑绫诲瀷
*/
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
private Integer glassType;
/**
* 瀹�
*/
+ @ApiModelProperty(value = "瀹�", position = 9)
private Double width;
/**
* 楂�
*/
+ @ApiModelProperty(value = "楂�", position = 10)
private Double height;
/**
* 鍘氬害
*/
+ @ApiModelProperty(value = "鍘氬害", position = 11)
private Double thickness;
/**
* 閽㈠寲鐗堝浘id
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
private Integer temperingLayoutId;
/**
* 閽㈠寲鐗堝浘鐗囧簭
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
private Integer temperingFeedSequence;
/**
* 鐘舵��
*/
+ @ApiModelProperty(value = "鐘舵��", position = 14)
private Integer state;
/**
* 鐜荤拑闂撮殭
*/
+ @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 15)
private Integer gap;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
index 82e77bf..5a4b62b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
@@ -38,7 +38,7 @@
@Override
public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState){
LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper=new LambdaQueryWrapper<>();
- getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,1);
+ getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,taskState);
return baseMapper.selectList(getFeedTaskWrapper);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
new file mode 100644
index 0000000..4d64154
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -0,0 +1,28 @@
+package com.mes;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = CacheVerticalClassModuleApplication.class)
+public class CacheVerticalGlassModuleApplicationTest {
+
+ @Test
+ public void testFindPath() {
+ log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
+ }
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
new file mode 100644
index 0000000..6b2c34c
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -0,0 +1,37 @@
+package com.mes.engineering.controller;
+
+
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.service.impl.EngineeringServiceImpl;
+import com.mes.utils.Result;
+import com.mes.workstation.service.UpWorkstationService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.mes.engineering.service.EngineeringService;
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+@RestController
+@Slf4j
+@RequestMapping("/engineering/engineering")
+public class EngineeringController {
+ @Autowired
+ private EngineeringService engineeringService;
+
+ @ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
+ @PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <Engineering> changeTask(String projectId , Integer state) {
+ boolean work=engineeringService.changeTask(projectId,state);
+ log.info("寮�濮嬩换鍔¤繑鍥�:{}", work);
+ return Result.build(200, "",null);
+ }
+}
+
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
new file mode 100644
index 0000000..4e68183
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -0,0 +1,100 @@
+package com.mes.engineering.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Engineering implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 宸ョ▼琛╥d
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String engineerId;
+
+ /**
+ * 宸ョ▼鍚嶇О
+ */
+ private String engineerName;
+
+ /**
+ * 骞冲潎鍒╃敤鐜�
+ */
+ private Double avgAvailability;
+
+ /**
+ * 鏈夋晥鍒╃敤鐜�
+ */
+ private Double validAvailability;
+
+ /**
+ * 灏剧墖鍒╃敤鐜�
+ */
+ private Double lastAvailability;
+
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
+
+ /**
+ * 灏忕墖鎬绘暟
+ */
+ private Integer glassTotal;
+
+ /**
+ * 灏忕墖鎬婚潰绉�
+ */
+ private Double glassTotalArea;
+
+ /**
+ * 璁″垝鍘熺墖鎬绘暟
+ */
+ private Integer planPatternTotal;
+
+ /**
+ * 璁″垝鍘熺墖鎬婚潰绉�
+ */
+ private Double planPatternTotalArea;
+
+ /**
+ * 瀹為檯鍘熺墖鎬绘暟
+ */
+ private Integer realityPatternTotal;
+
+ /**
+ * 瀹為檯鍘熺墖鎬婚潰绉�
+ */
+ private Double realityPatternTotalArea;
+
+ /**
+ * 鑶滅郴id
+ */
+ private Integer filmsId;
+
+ /**
+ * 澶囨敞
+ */
+ private String notes;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
new file mode 100644
index 0000000..4005960
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/EngineeringMapper.java
@@ -0,0 +1,16 @@
+package com.mes.engineering.mapper;
+
+import com.mes.engineering.entity.Engineering;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+public interface EngineeringMapper extends BaseMapper<Engineering> {
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml
new file mode 100644
index 0000000..bff1839
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/mapper/xml/EngineeringMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mes.engineering.mapper.EngineeringMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
new file mode 100644
index 0000000..ebca48c
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -0,0 +1,17 @@
+package com.mes.engineering.service;
+
+import com.mes.engineering.entity.Engineering;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+public interface EngineeringService extends IService<Engineering> {
+
+ boolean changeTask(String projectId,Integer state);
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
new file mode 100644
index 0000000..b6d0cba
--- /dev/null
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -0,0 +1,29 @@
+package com.mes.engineering.service.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.engineering.service.EngineeringService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author wu
+ * @since 2024-04-22
+ */
+@Service
+public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
+ //寮�濮�/鏆傚仠浠诲姟
+ @Override
+ public boolean changeTask(String projectId, Integer state) {
+ LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+ wrapper.set(Engineering::getState,state);
+ wrapper.eq(Engineering::getEngineerId,projectId);
+ return wrapper.update();
+ }
+
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
index c17d927..57b043d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -3,6 +3,7 @@
import com.mes.utils.Result;
import com.mes.workstation.entity.GlassInfo;
+import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import io.swagger.annotations.ApiOperation;
@@ -26,7 +27,6 @@
public class UpWorkstationController {
@Autowired
private UpWorkstationService upWorkstationService;
- private GlassInfo glassInfo;
@ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅")
@GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
public Result<List<UpWorkstation>> list() {
@@ -40,15 +40,19 @@
@ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴")
@PostMapping("/updateGlassMessage")
@ResponseBody
- public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
+ public Result<UpWorkstation> updateGlassMessage(@RequestBody UpWorkstation upwork) {
upWorkstationService.updateGlassMessage(upwork);
+ return Result.build(200, "", upwork);
}
@ApiOperation("寮�濮嬩笂鐗囦换鍔�")
- @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔�
+ @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
@ResponseBody
public void selectPriority() {
- upWorkstationService.selectPriority();
+ UpWorkSequence work=upWorkstationService.selectPriority();
+ log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
+
}
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkSequence.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkSequence.java
index ca1d3a2..692263e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkSequence.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/entity/UpWorkSequence.java
@@ -9,7 +9,7 @@
public class UpWorkSequence {
private int sequence;
-
+ private int workId;
private int number;
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
index 1a5e695..f5358bf 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
@@ -16,7 +16,8 @@
* @since 2024-04-07
*/
public interface UpWorkstationMapper extends BaseMapper<UpWorkstation> {
+ //鑾峰彇宸ヤ綅淇℃伅
+ UpWorkSequence selectPriority(@Param("id") int id);
- List<UpWorkSequence> selectPriority(@Param("id") int id);
-
+ //鑾峰彇涓嬩竴鐗囩幓鐠冧俊鎭�
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
index f489ca1..39d44e3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
@@ -1,6 +1,7 @@
package com.mes.workstation.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
/**
@@ -14,12 +15,10 @@
public interface UpWorkstationService extends IService<UpWorkstation> {
//PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- //鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
-// public void deleteGlass(int id);
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
+
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority();
+ public UpWorkSequence selectPriority();
//鏌ヨ姝ｅ湪杩涜鐨勫伐绋�
@@ -29,5 +28,9 @@
*
* @param upwork
*/
+ //淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�
void updateGlassMessage(UpWorkstation upwork);
+
+
}
+
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index 9e67249..18d8b4b 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -33,29 +33,14 @@
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority() {
- //todo:鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
-// String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
-// if (!"1".equals(loadstart)) {
-// return;
-// }
- UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0);
- UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0);
- //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
-// if(loadid1.getSequence()>loadid2.getSequence()) {
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
-// }else if(loadid1.getSequence()==loadid2.getSequence()){
-// //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
-// int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
-// int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
-// if(glassnum1>glassnum2){
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
-// }else{
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
-// }
-// }else{
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
-// }
+ public UpWorkSequence selectPriority() {
+ UpWorkSequence upwork= this.baseMapper.selectPriority(1);
+ String start = "鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+ if(upwork!=null&&start.equals("1")){
+ //鍙戦�佸嚭鐗囦换鍔�
+ //plcmes.getPlcParameter("鍑虹墖淇″彿").setValue("1");
+ }
+ return upwork;
}
/**
@@ -69,4 +54,5 @@
int update = this.baseMapper.update(upwork, updateWrapper);
}
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
index 2dce130..ceba9a6 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/mapper/UpWorkstationMapper.xml
@@ -3,20 +3,19 @@
<mapper namespace="com.mes.workstation.mapper.UpWorkstationMapper">
<resultMap id="sequenceMap" type="com.mes.workstation.entity.UpWorkSequence">
- <id property="sequence" column="layout_sequence"/>
- <result property="number" column="number"/>
+ <id property="workId" column="workstation_id"/>
+<!-- <result property="number" column="number"/>-->
</resultMap>
<select id="selectPriority" resultMap="sequenceMap">
SELECT
- b.layout_sequence,a."number"
+ b.workstation_id
FROM
- up_workstation a
- LEFT JOIN up_patten_usage b ON a.pattern_width = b.width
- AND a.pattern_heigth = b.width
- AND a.pattern_thickness = b.thickness
- WHERE
- a.workstation_id = #{id}
+ ( SELECT * FROM up_patten_usage a WHERE state = 1 ORDER BY a.layout_sequence LIMIT 1 )as a
+ LEFT JOIN up_workstation b ON a.width =b.pattern_width
+ AND a.height = b.pattern_heigth
+ AND a.thickness = b.pattern_thickness
+ AND a.films_id = b.films_id
</select>
--
Gitblit v1.8.0