From a21906521689490fb7daadeee9fa0fc729d946aa Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 16 Aug 2024 18:26:41 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPackage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue index e751e5f4..bb364b40 100644 --- a/src/mycomponents/scan/winScanPackage.vue +++ b/src/mycomponents/scan/winScanPackage.vue @@ -176,7 +176,7 @@ getBalanceByFilter(params).then(res => { if (res.data.list.length > 0) { res.data.list.forEach(r => { - if (packageInfo.parentNumber !== null) { + if (packageInfo.parentNumber) { r.parentPackingNumber = packageInfo.parentNumber } else { r.parentPackingNumber = packageInfo.number @@ -230,7 +230,7 @@ }, losefocus() { - if (this.$refs.comscan ) { + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } }, From 6bbef5511cf24fd19b4a13572eaf249e0a8729e0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 19:41:27 +0800 Subject: [PATCH 02/31] =?UTF-8?q?HL-5420=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E7=89=A9=E6=96=99=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=82=B9=E5=87=BB=E2=80=9C=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8F=AA=E7=9C=8B=E5=BD=93=E5=A4=A9=E5=92=8C?= =?UTF-8?q?=E5=8F=AA=E7=9C=8B=E5=BE=85=E5=A4=84=E7=90=86=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobFilter.vue | 2 + src/pages/issue/job/issueJob.vue | 95 +++++++++++++----------- src/pages/repleinsh/job/repleinshJob.vue | 64 +++++++++------- 3 files changed, 90 insertions(+), 71 deletions(-) diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 4dcd4b84..32d1546f 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -198,6 +198,8 @@ return params; }, reset(){ + this.checkedTodayModel = false + this.checkedWaitModel = false this.productionLineCode = '' this.fromLocationCode = '' this.fromAreaCode = ''// 来源库区 diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 5d5db6d8..38acf2ac 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -329,82 +329,91 @@ title: "加载中­....", mask: true }); - var filters = [] - if (this.checkedToday) { - filters.push({ - column: "create_time", - action: "betweeen", - value: this.todayTime - }) + // var filters = [] + // if (this.checkedToday) { + // filters.push({ + // column: "create_time", + // action: "betweeen", + // value: this.todayTime + // }) + // } + + // filters.push({ + // column: "status", + // action: "in", + // value: this.status + // }) + if (params.status) { + this.status = params.status + + }else{ + this.status = "1,2" + } + if(params.creationTime==""){ + this.checkedToday = false; } - filters.push({ - column: "status", - action: "in", - value: this.status - }) - if (params.fromLocationCode) { // 来源库位 this.fromLocation = params.fromLocationCode - filters.push({ - column: "fromLocationCode", - action: "==", - value: params.fromLocationCode - }) + // filters.push({ + // column: "fromLocationCode", + // action: "==", + // value: params.fromLocationCode + // }) }else{ this.fromLocation = '' } if (params.productionLineCode) { // 生产线 this.productionLine = params.productionLineCode - filters.push({ - column: "productionLineCode", - action: "==", - value: params.productionLineCode - }) + // filters.push({ + // column: "productionLineCode", + // action: "==", + // value: params.productionLineCode + // }) }else{ this.productionLine = '' } if (params.itemCode) { // 物料代码 this.filterItemCode = params.itemCode - filters.push({ - column: "itemCode", - action: "like", - value: params.itemCode - }) + // filters.push({ + // column: "itemCode", + // action: "like", + // value: params.itemCode + // }) }else{ this.filterItemCode = '' } if (params.fromAreaCode) { // 来源库区 this.fromAreaCode = params.fromAreaCode - filters.push({ - column: "fromAreaCode", - action: "==", - value: params.fromAreaCode - }) + // filters.push({ + // column: "fromAreaCode", + // action: "==", + // value: params.fromAreaCode + // }) }else{ this.fromAreaCode = '' } if (params.toAreaCode) { // 到库区 this.toAreaCode = params.toAreaCode - filters.push({ - column: "toAreaCode", - action: "==", - value: params.toAreaCode - }) + // filters.push({ + // column: "toAreaCode", + // action: "==", + // value: params.toAreaCode + // }) }else{ this.toAreaCode = '' } - var params = { - filters: filters, - pageNo: 1, - pageSize: 100, - } + // var params = { + // filters: filters, + // pageNo: 1, + // pageSize: 100, + // } this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode) // getIssueJobList(params).then(res => { diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index d0c1605f..a711b862 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -281,29 +281,37 @@ title: "加载中­....", mask: true }); - var filters = [] - if (this.checkedToday) { - filters.push({ - column: "create_time", - action: "betweeen", - value: this.todayTime - }) - } + // var filters = [] + // if (this.checkedToday) { + // filters.push({ + // column: "create_time", + // action: "betweeen", + // value: this.todayTime + // }) + // } - filters.push({ - column: "status", - action: "in", - value: this.status - }) + // filters.push({ + // column: "status", + // action: "in", + // value: this.status + // }) + if (params.status) { + this.status = params.status + }else{ + this.status = "1,2" + } + if(params.creationTime==""){ + this.checkedToday = false; + } if (params.fromLocationCode) { // 来源库位 this.fromLocationCode = params.fromLocationCode - filters.push({ - column: "fromLocationCode", - action: "==", - value: params.fromLocationCode - }) + // filters.push({ + // column: "fromLocationCode", + // action: "==", + // value: params.fromLocationCode + // }) }else{ this.fromLocationCode = '' } @@ -311,19 +319,19 @@ if (params.itemCode) { // 物料代码 this.filterItemCode = params.itemCode - filters.push({ - column: "itemCode", - action: "like", - value: params.itemCode - }) + // filters.push({ + // column: "itemCode", + // action: "like", + // value: params.itemCode + // }) }else{ this.filterItemCode = '' } - var params = { - filters: filters, - pageNo: 1, - pageSize: 100, - } + // var params = { + // filters: filters, + // pageNo: 1, + // pageSize: 100, + // } this.getList('refresh', this.fromLocationCode, this.filterItemCode) // getRepleinshJobList(params).then(res => { From d88bdff7c54576eaaa582f33ffab6c9c2fd789af Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 16 Aug 2024 20:12:25 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=990816?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/record/directIssue0816.vue | 71 +++++++++++++--------- 1 file changed, 43 insertions(+), 28 deletions(-) diff --git a/src/pages/issue/record/directIssue0816.vue b/src/pages/issue/record/directIssue0816.vue index 8efa0038..6e4668b1 100644 --- a/src/pages/issue/record/directIssue0816.vue +++ b/src/pages/issue/record/directIssue0816.vue @@ -45,9 +45,9 @@ - - - + + @@ -100,7 +100,7 @@ import balanceSelect from '@/mycomponents/balance/balanceSelect.vue' import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' // import balanceQuery from '@/mycomponents/query/balanceQuery.vue' - + import winScanPackage from '@/mycomponents/scan/winScanPackage.vue' export default { components: { @@ -114,6 +114,7 @@ recordDetailCard, balanceSelect, winComScanBalance, + winScanPackage // balanceQuery }, data() { @@ -181,7 +182,6 @@ // showDrawer() { // this.$refs.showRight.open(); // }, - getBusinessType() { getBusinessType(this.businessTypeCode, res => { if (res.success) { @@ -196,27 +196,36 @@ }, getScanResult(result) { + // let balance = result.balance; let pack = result.package; - let balance = result.balance; - - if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this - .fromLocationCode + "]没有库存余额") - return; - } - - //扫描的是子包装 - if (pack.parentNumber) { - this.setPackageData(result); - } else { - this.setContainerData(result); - } + result.balance.forEach( + b => { + this.setPackageData(b,pack); + } + ) }, + + // getScanResult(result) { + // let pack = result.package; + // let balance = result.balance; + + // if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) { + // this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this + // .fromLocationCode + "]没有库存余额") + // return; + // } + + // //扫描的是子包装 + // if (pack.parentNumber) { + // this.setPackageData(result); + // } else { + // this.setContainerData(result); + // } + // }, - setPackageData(result) { - let balance = result.balance; - let label = result.label; - let pack = result.package; + setPackageData(balance, pack) { + // let balance = result.balance; + // let pack = result.package; var item = this.detailSource.find(res => { if (res.itemCode == balance.itemCode) { @@ -432,12 +441,18 @@ this.updateData(); }, + // openScanPopup() { + // if (this.businessType) { + // this.$refs.scanPopup.openScanPopup(this.businessType); + // } else { + // this.getBusinessType() + // } + // }, + openScanPopup() { - if (this.businessType) { - this.$refs.scanPopup.openScanPopup(this.businessType); - } else { - this.getBusinessType() - } + setTimeout(r => { + this.$refs.scanPopup.openScanPopupByBusinessType(this.businessType); + }) }, showFromLocationPopup() { From 8b7c4acc0f96a90705d198f86c82dec4ef68477f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sat, 17 Aug 2024 09:11:55 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueDetail.vue | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 374ef22a..76a209e7 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -32,7 +32,7 @@ - + @@ -449,9 +449,15 @@ afterScan() { this.resizeCollapse(); - let str = "" + this.autoCommit() + }, + + autoCommit(){ + var totalQty =0; + var taskQty =0; this.detailSource.forEach(detail => { detail.Items.forEach(item => { + taskQty =calc.add(taskQty,item.qty) item.Locations.forEach(lco => { lco.Batchs.forEach(batch => { batch.Records.forEach(record => { @@ -466,16 +472,23 @@ str += `包装号【${record.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${batch.qty}】不一致\n` } - } + if(record){ + var hanleQty =record.qty?record.qty:0 + totalQty = calc.add(totalQty,hanleQty) + } + }) }) }) }) }) - - if (str) { + + if(str){ str = '任务明细未全部完成,是否提交?\n' + str + } + if(totalQty!=taskQty){ + str ="扫描数量["+totalQty+"]与任务数量不一致["+taskQty+"],是否提交" this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { if (res) { //防止重复点击 @@ -484,10 +497,9 @@ this.scanPopupGetFocus() } }); - } else { + }else { //防止重复点击 this.$throttle(this.submit, 2000, this)() - } }, From c8727798e28372d1bfa5b026b4ef1eb4e9dcfa96 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sat, 17 Aug 2024 10:59:29 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=81=AF=E7=A0=81?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winComScanFg.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index b8772969..92a94549 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -188,6 +188,11 @@ // let productDate = content.substr(lengthMat, 8); // let batch = content.substr(lengthMat + 8, 3); let order = content.substr(-8); + if(content.length!=lengthBc){ + that.clear(); + throw new Error("解析错误:扫描标签长度与配置条码的长度不一致") + } + if (scanPartNumber != partNumber) { that.clear(); throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber + From 7b5f7f91d4dde7bdc070a9e7d6834d72ee32f66a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sat, 17 Aug 2024 11:00:06 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E3=80=81?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E4=B8=8A=E6=9E=B6=E6=A0=A1=E9=AA=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winScanPackage.vue | 48 +++++++++++++++---- .../record/productPutawayRecord.vue | 20 ++++---- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue index e751e5f4..eb7f074a 100644 --- a/src/mycomponents/scan/winScanPackage.vue +++ b/src/mycomponents/scan/winScanPackage.vue @@ -32,7 +32,13 @@ import { getBalanceByFilter } from '@/api/request2.js'; - + + import { + getInventoryStatusDesc, + getDirectoryItemArray, + getLocationAreaTypeName + } from '@/common/directory.js'; + export default { name: 'winScanPack', components: { @@ -55,7 +61,8 @@ data() { return { show: false, - businessType: null + businessType: null, + scanResult:{} } }, created() { @@ -104,6 +111,7 @@ getScanResult(result) { if (result.success) { + this.scanResult=result this.getBalance(result, res => { result.balance = res; this.$emit("getResult", result); @@ -130,14 +138,14 @@ value: this.businessType.outInventoryStatuses }) } - if (this.businessType.outAreaTypes != null) { + if (this.businessType.outAreaTypes ) { filters.push({ column: "areaType", action: "in", value: this.businessType.outAreaTypes }) } - if (this.businessType.outAreaCodes != null) { + if (this.businessType.outAreaCodes ) { filters.push({ column: "areaCode", action: "in", @@ -146,6 +154,30 @@ } return filters; }, + + getQueryCondition() { + let condition = '按照以下条件:\n'; + let label = this.scanResult.label; + let status = getInventoryStatusDesc(getDirectoryItemArray(this.businessType.outInventoryStatuses)); + let areaType =getLocationAreaTypeName(this.businessType.outAreaTypes) + condition = condition + '物料号=[' + label.itemCode + + ']\n箱码=[' + label.packingNumber + + ']\n批次=[' + + label.batch + + ']' + + if (status) { + condition = condition + '\n库存状态=[' + status + ']' + } + + if (areaType) { + condition = condition + '\n库区类型=[' + areaType + ']' + } + if (this.businessType.outAreaCodes) { + condition = condition + '\n库区代码=[' + this.businessType.outAreaCodes + ']' + } + return condition; + }, getBalance(result, callback) { let filters = []; @@ -201,9 +233,7 @@ params.filters = filters; getBalanceByFilter(params).then(res1 => { if (res1.data.list.length == 0) { - this.showErrorMessage('未查找到该包装的库存余额', res => { - this.packGetFocus(); - }) + this.showErrorMessage(this.getQueryCondition()+'\n未查找到该包装的库存余额') } else { res1.data.list.forEach(r => r.parentPackingNumber = packageInfo.number) callback(res1.data.list) @@ -212,9 +242,7 @@ this.showErrorMessage(err.message); }) } else { - this.showErrorMessage('未查找到该包装的库存余额', res => { - this.packGetFocus(); - }) + this.showErrorMessage(this.getQueryCondition()+'\n未查找到该包装的库存余额') } } }).catch(err => { diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index d3362b7d..31cc12c5 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -147,6 +147,7 @@ getScanResult(result) { let label = result.label; let pack = result.package; + let errorHint="" result.balance.forEach( balance => { let item = this.detailSource.find(res => { @@ -180,14 +181,19 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + - "]重复扫描") + errorHint+="箱码[" + balance.packingNumber + "批次[" + balance.batch + + "]重复扫描\n" } } } this.calcHandleQty(); } ) + if(errorHint){ + this.showErrorMessage(errorHint) + }else { + this.scanPopupGetFocus() + } }, getRecommendLocation(balance) { @@ -251,9 +257,6 @@ this.$forceUpdate(); }, - updateData() { - this.calcHandleQty(); - }, removeItem(index, item) { this.removeRecommendLocation([item.expectinNumber]); this.detailSource.splice(index, 1) @@ -423,13 +426,6 @@ if (res) {} }); }, - showErrorMessage(message) { - this.$refs.comMessage.showErrorMessage(message, res => { - if (res) { - - } - }); - }, showScanMessage(message) { this.$refs.comMessage.showScanMessage(message); From 1c1628290c33a1661ff24c7806d91912fb0bb66d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Sat, 17 Aug 2024 11:04:20 +0800 Subject: [PATCH 07/31] =?UTF-8?q?HL-5369=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E4=BB=BB=E5=8A=A1=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveJob.vue | 47 +++++++++++++++++-- .../inventoryMove/job/okToHoldMoveJob.vue | 2 +- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue index fd6ab5f2..7446bf81 100644 --- a/src/pages/inventoryMove/coms/comMoveJob.vue +++ b/src/pages/inventoryMove/coms/comMoveJob.vue @@ -1,9 +1,9 @@