From 5347f8353c806372bd804cedad514adcfd8d790b Mon Sep 17 00:00:00 2001 From: guoshuang Date: Tue, 8 Nov 2022 13:57:11 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=B8=8D=E8=89=AF=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E5=8D=8A=E6=88=90=E5=93=81=E5=88=A4=E5=BA=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 + src/i18n/lang/en.ts | 2 + src/i18n/lang/ru.ts | 2 + src/pages/login/login/index.vue | 2 +- .../raw/LineSide/rejectsOffline/index.vue | 60 ++++++++++++++++--- .../raw/LineSide/rejectsOffline/model.ts | 8 +++ .../semifinished-wasteJudgment/index.vue | 44 ++++++++++++-- .../semifinished-wasteJudgment/model.ts | 12 +++- src/utils/url.ts | 1 + 9 files changed, 119 insertions(+), 14 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index c6d423f..dc9c8c5 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -528,5 +528,7 @@ export default { Insufficient: '源容器不足', defect: '缺陷', Note: '备注', + Pleasedefects: '请扫描缺陷', + PleaseResponsibleArea: '请扫描责任区域', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 98667ee..40a4f91 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -528,5 +528,7 @@ export default { Insufficient: 'Insufficient source container', defect: 'defects', Note: 'Note', + Pleasedefects: 'Please scan for defects', + PleaseResponsibleArea: 'Please scan the responsible area', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index a485746..4083a13 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -528,5 +528,7 @@ export default { Insufficient: 'недостаточная емкость источника', defect: 'Дефект', Note: 'Примечание', + Pleasedefects: 'Ошибка сканирования', + PleaseResponsibleArea: 'область ответственности сканирования', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 0bd7ebb..dfb6820 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -163,7 +163,7 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.3'; + this.Version = '1.1.5'; } else { this.Version = '1.0.37'; } diff --git a/src/pages/raw/LineSide/rejectsOffline/index.vue b/src/pages/raw/LineSide/rejectsOffline/index.vue index f687e49..b92ceea 100644 --- a/src/pages/raw/LineSide/rejectsOffline/index.vue +++ b/src/pages/raw/LineSide/rejectsOffline/index.vue @@ -33,7 +33,8 @@ - + + @@ -41,7 +42,8 @@ - + + @@ -96,6 +98,8 @@ export default class productCheckReceipt extends BasePage { aimWl: {} as OptionType, }; dockCode: any = ''; + reasonList: any = {}; + ProcessList: any = {}; dockName: any = ''; wl: any = {}; Some: any = {}; @@ -124,24 +128,62 @@ export default class productCheckReceipt extends BasePage { this.Some = this.model.resdata; } } + async queryreason() { + if (this.Some.reason == '' || this.Some.reason.length == 0) { + this.customToast(this.$t('message.Pleasedefects') as string); + return; + } + await this.model.checkDicCode(this.Some.reason); + if (this.model.code == '0') { + uni.showToast({ + title: this.$t('message.successful') as string, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.reasonList = this.model.resdata; + } + } + async queryProcess() { + if (this.Some.responsibleProcess == '' || this.Some.responsibleProcess.length == 0) { + this.customToast(this.$t('message.PleaseResponsibleArea') as string); + return; + } + await this.model.checkDicCode(this.Some.responsibleProcess); + if (this.model.code == '0') { + uni.showToast({ + title: this.$t('message.successful') as string, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.ProcessList = this.model.resdata; + } + } //关闭 async closure() { if (!this.form.order3) { this.customToast(this.$t('message.Commission_tips1') as string); return; } - if (!this.Some.reason) { - this.customToast(this.$t('message.PleaseTwo') as string); + // if (!this.Some.reason) { + // this.customToast(this.$t('message.PleaseTwo') as string); + // return; + // } + if (this.Some.responsibleProcess == '' || this.Some.responsibleProcess.length == 0) { + this.customToast(this.$t('message.PleaseResponsibleArea') as string); + return; + } + if (this.Some.reason == '' || this.Some.reason.length == 0) { + this.customToast(this.$t('message.Pleasedefects') as string); return; } // if (!this.Some.responsibleUser) { // this.customToast(this.$t('message.PleaseOne') as string); // return; // } - if (!this.Some.responsibleProcess) { - this.customToast(this.$t('message.PleaseThere') as string); - return; - } + // if (!this.Some.responsibleProcess) { + // this.customToast(this.$t('message.PleaseThere') as string); + // return; + // } await this.model.scrapSfgOfflineConfirm({ orderNo: this.Some.proMoveCode, productCode: this.Some.materialCode, @@ -150,8 +192,10 @@ export default class productCheckReceipt extends BasePage { loginName: session.loginName, barcode: this.form.order3, reason: this.Some.reason, + reasonDesc: this.reasonList.dicName, responsibleUser: this.Some.responsibleUser, responsibleProcess: this.Some.responsibleProcess, + responsibleAreaName: this.ProcessList.dicName, add2: this.Some.Note, }); if (this.model.code == '1') { diff --git a/src/pages/raw/LineSide/rejectsOffline/model.ts b/src/pages/raw/LineSide/rejectsOffline/model.ts index 07911f9..d5fa848 100644 --- a/src/pages/raw/LineSide/rejectsOffline/model.ts +++ b/src/pages/raw/LineSide/rejectsOffline/model.ts @@ -96,6 +96,14 @@ export class wholeScrap extends VuexModule { const code = res.code; return { code, resdata }; } + //扫描缺陷，责任区域 + @MutationAction + async checkDicCode(params: any) { + const res: any = await http.post(url.warehouse.wholeTransfer.checkDicCode, { dicCode: params, factoryCode: session.factoryCode as string, loginName: session.loginName as string }); + const resdata = res.data; + const code = res.code; + return { code, resdata }; + } //确认 @MutationAction async scrapSfgOfflineConfirm(params: any) { diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue index f6eea76..47094e2 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -30,7 +30,8 @@ - + + @@ -38,7 +39,8 @@ - + + @@ -80,6 +82,8 @@ export default class KanDanHandOver extends BasePage { responsibleUser = ''; responsibleProcess = ''; every: any = {}; + reasonList: any = {}; + ProcessList: any = {}; Note = ''; async query() { if (this.barcode == '' || this.barcode.length == 0) { @@ -96,6 +100,36 @@ export default class KanDanHandOver extends BasePage { this.every = this.model.CodeDetail; } } + async queryreason() { + if (this.reason == '' || this.reason.length == 0) { + this.customToast(this.$t('message.Pleasedefects') as string); + return; + } + await this.model.checkDicCode(this.reason); + if (this.model.code == '0') { + uni.showToast({ + title: this.$t('message.successful') as string, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.reasonList = this.model.resdata; + } + } + async queryProcess() { + if (this.responsibleProcess == '' || this.responsibleProcess.length == 0) { + this.customToast(this.$t('message.PleaseResponsibleArea') as string); + return; + } + await this.model.checkDicCode(this.responsibleProcess); + if (this.model.code == '0') { + uni.showToast({ + title: this.$t('message.successful') as string, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.ProcessList = this.model.resdata; + } + } costCenter = ''; async submit() { if (this.barcode == '' || this.barcode.length == 0) { @@ -107,7 +141,7 @@ export default class KanDanHandOver extends BasePage { return; } if (this.reason == '') { - this.customToast(this.$t('message.PleaseFour') as string); + this.customToast(this.$t('message.Pleasedefects') as string); return; } // if (this.responsibleUser == '') { @@ -115,7 +149,7 @@ export default class KanDanHandOver extends BasePage { // return; // } if (this.responsibleProcess == '') { - this.customToast(this.$t('message.PleaseThere') as string); + this.customToast(this.$t('message.PleaseResponsibleArea') as string); return; } // if (this.every.qty != 0) { @@ -131,8 +165,10 @@ export default class KanDanHandOver extends BasePage { productDesc: this.every.productDescZh, locCode: this.every.locCode, reason: this.reason, + reasonDesc: this.reasonList.dicName, responsibleUser: this.responsibleUser, responsibleProcess: this.responsibleProcess, + responsibleAreaName: this.ProcessList.dicName, add2: this.Note, }; await this.model.submit(params); diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts b/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts index c0cf63b..0724da5 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/model.ts @@ -1,7 +1,7 @@ /* * @Author: zhou lei * @Date: 2022-09-29 13:45:51 - * @LastEditTime: 2022-10-27 17:33:47 + * @LastEditTime: 2022-11-08 13:42:51 * @LastEditors: zhou lei * @Description: * @FilePath: \hgwms-factory-app\src\pages\raw\LineSide\semifinished-wasteJudgment\model.ts @@ -22,6 +22,8 @@ export class semifinishedWasteJudgment extends VuexModule { //目标容器查询 SearchCode: any = ''; CodeDetail: any = ''; + code: any = ''; + resdata: any = {}; @MutationAction async searchBarcode(barcode: any) { const res: any = await http.post(url.warehouse.container.getSfgStorageSnPreScrap, { @@ -36,6 +38,14 @@ export class semifinishedWasteJudgment extends VuexModule { // } return { SearchCode, CodeDetail }; } + //扫描缺陷，责任区域 + @MutationAction + async checkDicCode(params: any) { + const res: any = await http.post(url.warehouse.wholeTransfer.checkDicCode, { dicCode: params, factoryCode: session.factoryCode as string, loginName: session.loginName as string }); + const resdata = res.data; + const code = res.code; + return { code, resdata }; + } //提交数据 submitCode: any = ''; @MutationAction diff --git a/src/utils/url.ts b/src/utils/url.ts index f073642..444c0fc 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -298,6 +298,7 @@ export const url = { querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo', getInfoByDoorBarcode: '/wmspda/fg/getInfoByDoorBarcode', scrapSfgOfflineConfirm: '/wmspda/fg/scrapSfgOfflineConfirm', + checkDicCode: '/wmspda/fg/checkDicCode', }, wholeLnventory: { content: '/wmspda/fg/findMaterialByPddNo',