From c346aba6d0196673d43fb81610ec6f0ca9cddbbd Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 30 一月 2024 15:56:41 +0800
Subject: [PATCH] 工位终端
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java | 4 +
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 10 ++++-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java | 4 +
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 18 +++++++--
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 13 +++++-
jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js | 13 ++++++
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 15 ++++++-
7 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index fa87316..7842101 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -55,9 +55,9 @@
* 妫�鏌ユ槸鍚﹀彲浠ユ斁琛�
*/
@GetMapping("/releaseCheck")
- public AjaxResult releaseCheck()
+ public AjaxResult releaseCheck(BsFormulaChildInfo bsFormulaChildInfo)
{
- List<BsFormulaChildInfo> i = bsFormulaChildInfoService.releaseCheck();
+ List<BsFormulaChildInfo> i = bsFormulaChildInfoService.releaseCheck(bsFormulaChildInfo);
return AjaxResult.success(i.size());
}
@@ -71,6 +71,15 @@
}
/**
+ * 鏀捐璇风┖鐘舵��
+ */
+ @GetMapping("/workpieceRelease")
+ public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ return bsFormulaChildInfoService.workpieceRelease(bsFormulaChildInfo);
+ }
+
+ /**
* 瀵煎嚭閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@PreAuthorize("@ss.hasPermi('bs:formulaChild:export')")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
index efc11ce..695115c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
@@ -61,5 +61,7 @@
BsFormulaChildInfo selectBsFormulaChildInfoByTypeTopOne(BsFormulaChildInfo bsFormulaChildInfo);
- List<BsFormulaChildInfo> releaseCheck();
+ List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo);
+
+ void workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java
index 4790358..5c85566 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/IBsFormulaChildInfoService.java
@@ -63,7 +63,9 @@
public BsFormulaChildInfo selectBsFormulaChildInfoByTypeTopOne(String type,String productCode,String processesCode);
- List<BsFormulaChildInfo> releaseCheck();
+ List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo);
AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo);
+
+ AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index d1ba232..09972b8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -106,8 +106,8 @@
}
@Override
- public List<BsFormulaChildInfo> releaseCheck() {
- return bsFormulaChildInfoMapper.releaseCheck();
+ public List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
+ return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
}
@Override
@@ -121,4 +121,10 @@
}
return AjaxResult.success("鎴愬姛");
}
+
+ @Override
+ public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
+ bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
+ return AjaxResult.success();
+ }
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index c0265ce..d9720a9 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -164,11 +164,22 @@
ORDER BY step_sort ASC
</select>
- <select id="releaseCheck" resultMap="BsFormulaChildInfoResult">
+ <select id="releaseCheck" resultMap="BsFormulaChildInfoResult" parameterType="BsFormulaChildInfo">
SELECT
*
FROM
bs_formula_child_info
- WHERE NOT results = 'OK'
+ WHERE
+ NOT results = 'OK'
+ AND product_code = #{productCode}
+ AND processes_code = #{processesCode};
</select>
+
+ <update id="workpieceRelease" parameterType="BsFormulaChildInfo">
+ UPDATE bs_formula_child_info
+ SET results = ''
+ WHERE
+ product_code = #{productCode}
+ AND processes_code = #{processesCode};
+ </update>
</mapper>
\ No newline at end of file
diff --git a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
index 6bffa5f..ff841b7 100644
--- a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
+++ b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
@@ -10,10 +10,11 @@
}
// 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
-export function releaseCheck() {
+export function releaseCheck(query) {
return request({
url: '/bs/formulaChild/releaseCheck',
method: 'get',
+ params: query
})
}
@@ -27,6 +28,16 @@
})
}
+// 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
+export function workpieceRelease(query) {
+ return request({
+ url: '/bs/formulaChild/workpieceRelease',
+ method: 'get',
+ params: query
+
+ })
+}
+
// 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭缁�
export function getFormulaChild(id) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 2383ad3..81c68e6 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -147,7 +147,7 @@
<script>
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
-import {listFormulaChild, releaseCheck, updateResults} from "@/api/main/bs/formulaChild/formulaChild";
+import {listFormulaChild, releaseCheck, updateResults, workpieceRelease} from "@/api/main/bs/formulaChild/formulaChild";
export default {
name: "stationTerminal",
@@ -159,6 +159,7 @@
pageNum: 1,
pageSize: 10,
productCode: null,
+ processesCode: null,
},
// 閰嶆柟閰嶇疆瀛愪俊鎭〃鏍兼暟鎹�
formulaChildList: [],
@@ -198,7 +199,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.11.60:8080/websocket/message/",
+ url: "ws://192.168.10.252:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -220,11 +221,18 @@
},
methods: {
Release(){
- releaseCheck().then(response => {
+ let formulaChildParams = {
+ productCode: this.workpieceInformation.productCode,
+ processesCode: this.headContent.processesCode
+ }
+ releaseCheck(formulaChildParams).then(response => {
if(response.data === 0){
//鏀瑰彉鐘舵��
+ workpieceRelease(formulaChildParams).then(response => {
+ });
this.$message('鏀捐鎴愬姛锛�');
-
+ this.formulaChildList = []
+ this.getListFormulaChild()
}else {
this.$message('姝ラ鏈畬鎴愪笉璁告斁琛岋紒');
}
@@ -249,6 +257,7 @@
/** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */
getListFormulaChild() {
this.formulaChildParams.productCode = this.workpieceInformation.productCode
+ this.formulaChildParams.processesCode = this.headContent.processesCode
listFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
});
@@ -375,6 +384,7 @@
}, 2000); // 寤舵椂2绉掕Е鍙�
}else if(event.data === 'TIGHTEN'){
console.log('寮�濮嬫嫥绱�')
+ this.formulaChildList = []
self.getListFormulaChild()
}
};
--
Gitblit v1.9.3