From 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 24 六月 2024 19:00:22 +0800
Subject: [PATCH] 1，优化人工工位参数采集temp表删除方法 pushGeelycvMesFeedback 2，优化人工工位更新过站记录方法 workpieceRelease 3，优化未绑定小车码弹框提示 4，优化人工工位扫码重复会添加参数采集记录的问题及拧紧数据会添加上物料采集上的问题
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index c637493..68e47eb 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -189,6 +189,8 @@
<script>
import {getIpv4, listStationConf} from "@/api/main/sc/stationConf";
import {
+ checkMaterialCode,
+ clearWorkpieceRelease,
fistSetpNumber,
noPageListFormulaChild,
workpieceRelease,
@@ -325,20 +327,6 @@
serialLink() {
this.open1 = true
},
- bindYzSfc(){
- if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
- let param = {
- sfcCode: this.headContent.sfcCode,
- locationCode: this.headContent.processesCode,
- yzSfcCode: this.headContent.yzSfcCode
- }
- this.$message('鍙互缁戝畾锛�');
- replaceAssemblyCode(param).then(response => {
-
- });
- }
- },
-
Release(){
// this.$message('portsList锛�'+this.portsList.length);
if(this.btnType === "danger"){
@@ -406,8 +394,14 @@
console.log(tab, event);
},
clearClick(){
- this.$message('杩欐槸涓�鏉℃竻闄ゆ秷鎭彁绀�');
- this.headContent.sfcCode = null
+ const param = {
+ productCode: '1P102S',
+ locationCode: this.headContent.processesCode,
+ }
+ clearWorkpieceRelease(param).then(response => {});
+ this.headContent.sfcCode = ''
+ this.formulaChildList = [];
+ this.$message('娓呴櫎鎴愬姛锛�');
},
scanCompleted(){
this.$message('鎵爜瀹屾垚'+this.content);
@@ -537,25 +531,36 @@
self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
return;
}
- addTighteningParameters(param).then(response => {});
- yzUpdateTighteningFormula(param).then(response => {
- console.log(response)
- if(response.msg === "1" || response.msg === "3"){
- self.getListFormulaChild()
- }else {
- const param = {
- workOrderNo: self.workpieceInformation.workOrderNo,
- productCode: "1P102S",
- locationCode: self.headContent.processesCode,
- productBarcode: self.headContent.sfcCode,
- }
- saveCampaignTimeParameters(param).then(response => {});
- workpieceRelease(param).then(response => {});
- self.formulaChildList = [];
- self.headContent.sfcCode = '';
+ if(self.headContent.sfcCode === null||self.headContent.sfcCode ===''){
+ self.$message('鏈壘鍒版�绘垚鐮侊紝璇峰厛鎵爜锛�');
+ return;
+ }
+ checkMaterialCode(param).then(response => {
+ if(response.msg === "2"){
+ self.$message('鏈壂鎻忕墿鏂欑爜瀹屾瘯锛�');
+ return;
}
});
- // self.getListFormulaChild()
+
+ yzUpdateTighteningFormula(param).then(response => {
+ console.log(response)
+ if(response.msg === "1" || response.msg === "3"){
+ self.getListFormulaChild()
+ }else {
+ const param = {
+ workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: "1P102S",
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ saveCampaignTimeParameters(param).then(response => {});
+ workpieceRelease(param).then(response => {});
+ self.formulaChildList = [];
+ self.headContent.sfcCode = '';
+ }
+ });
+ addTighteningParameters(param).then(response => {});
+ // self.getListFormulaChild()
}
};
--
Gitblit v1.9.3