diff --git a/.env.development b/.env.development index 9bf7280a..2c183308 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ -VITE_BASE_URL=http://172.22.32.9:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api +VITE_BASE_URL=http://172.21.32.13:81/api/admin-api +VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' +VITE_TENANT='[{"text":"长春1379","value":1}]' # 是否是测试环境 -VITE_isDevelopment=true +VITE_isDevelopment=false # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' +VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue index 3e59bee7..ff845985 100644 --- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue +++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue @@ -35,7 +35,8 @@ {{record.parentPackingNumber}} --> + :isShowStatus='true'> + diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index cc609435..b5506380 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -8,7 +8,7 @@ 关闭 - - + --> @@ -83,13 +83,14 @@ } from '@/common/array.js'; import { getWorkShopLineStation, - getBalanceByFilter + getBalanceByFilter, + getBalanceByParams } from '@/api/request2.js'; import { calc } from '@/common/calc.js'; - + import { uniqueArray } from '@/common/basic.js'; @@ -100,8 +101,8 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; - - + + import { getLabelInfo } from '@/common/label.js'; @@ -162,8 +163,8 @@ this.$refs.popup.open('bottom') }, 500) }, - - openScanPopupForJobSimulate(content, jobcontent,scanMessage) { + + openScanPopupForJobSimulate(content, jobcontent, scanMessage) { this.issueRecord = []; this.dataContent = content; this.jobContent = jobcontent; @@ -174,7 +175,7 @@ } else { this.showErrorMessage(callback.message) } - + }) }, @@ -192,7 +193,7 @@ that.fromInventoryStatuses = this.jobContent.outInventoryStatuses that.toLocation = that.dataContent[0]; that.toLocationCode = that.dataContent[0].toLocationCode; - that.fromLocationList = that.getFromLocationList(); + // that.fromLocationList = that.getFromLocationList(); } }, @@ -200,26 +201,26 @@ this.$refs.balanceSelect.openPopup(items); }, - getFromLocationList() { - let list = []; - let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode); - if (location != undefined) { - location.Items.forEach(item => { - item.Locations.forEach(f => { - list.push(f.fromLocationCode) - }) - }) - //去掉重复库位 - list = uniqueArray(list); - this.fromLocationCode = list[0]; - - return list; - } else { - this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => { - this.toLocationCode = ''; - }); - } - }, + // getFromLocationList() { + // let list = []; + // let location = this.dataContent.find(r => r.toLocationCode == this.toLocationCode); + // if (location != undefined) { + // location.Items.forEach(item => { + // item.Locations.forEach(f => { + // list.push(f.fromLocationCode) + // }) + // }) + // //去掉重复库位 + // list = uniqueArray(list); + // this.fromLocationCode = list[0]; + + // return list; + // } else { + // this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => { + // this.toLocationCode = ''; + // }); + // } + // }, fromLocationUpdate(fromlocation) { let location = this.fromLocationList.find(r => r == fromlocation) @@ -228,15 +229,44 @@ this.showErrorMessage('发料库位【' + fromlocation + '】不存在') } }, + onScan(result) { + if (!result.package) { + this.showErrorMessage('扫描数据错误[' + result.label.code + "]", + res => { + this.getfocus(); + } + ) + return; + } + if (this.toLocation && result.package.packUnit) { + let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode); + if (!item) { + this.showErrorMessage('扫描物料代码不属于该任务'); + return + } + if (result.package.packUnit !== item.packUnit) { + this.$refs.comMessage.showQuestionMessage( + `扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => { + if (res) { + this.onScanResult(result) + } + }); + } else { + this.onScanResult(result) + } + } + }, + + onScanResult(result) { try { let that = this; - if (that.fromLocationCode == '') { - that.showErrorMessage('请选择来源库位', res => { - that.$refs.toLocationCombox.onFocus(); - }); - return; - } + // if (that.fromLocationCode == '') { + // that.showErrorMessage('请选择来源库位', res => { + // that.$refs.toLocationCombox.onFocus(); + // }); + // return; + // } let packageInfo = result.package; let itemCode = result.label.itemCode; let packingCode = result.label.packingNumber; @@ -250,115 +280,50 @@ ) return; } else { - //查找库存信息 + + var params = { + itemCode: result.package.itemCode, + batch: result.label.batch, + packingNumber: result.label.packingNumber, + parentPackingNumber: result.package.parentNumber, + inventoryStatus: this.jobContent.outInventoryStatuses.split(','), + areaType: this.jobContent.fromAreaTypes.split(','), + bussinessCode: this.jobContent.businessType + } uni.showLoading({ - title: '加载中', + title: '查询中', mask: true }) - - this.getBalance(result.label, packageInfo, balances => { - this.packageInfo = packageInfo; - //扫描的是外包装 - let s = ''; - if (!result.package.parentNumber) { - if (balances.list.length == 0) { - this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') + getBalanceByParams(params).then(res => { + if (res.data.length == 0) { + var status = getInventoryStatusDesc(params.inventoryStatus) + var areaType = getListLocationAreaTypeDesc(params.areaType) + var hint = + "按物料号 [" + params.itemCode + "]
" + + "包装号 [" + params.packingNumber + "]
" + + "批次 [" + params.batch + "]
" + + "状态 [" + status + "]
" + + "库区 [" + areaType + "]
" + + "未查找到库存余额" + this.showErrorMessage(hint) + } else if (res.data.length == 1) { + result.balance = res.data[0] + + if (result.label.packingNumber != result.balance.packingNumber) { + result.balance.handleQty = Number(result.label.qty) } else { - let newBalances = balances.list.filter(b => b.locationCode == that - .fromLocationCode); - if (newBalances.length == 0) { - this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') - } else if (newBalances.length == 1) { - let balance = newBalances[0]; - this.afterGetBalance(result.label, balance, packageInfo); - } else { - this.showBalanceSelect(newBalances); - } + result.balance.handleQty = Number(result.balance.qty) } + this.afterGetBalance(result.label, result.balance, result.package); } else { - //扫描的是小包装 - if (balances.list.length == 0) { - this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') - } else { - //小包装库存 - let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo - .number) - //外包装库存 - let subParentPackitems = balances.list.filter(r => r.packingNumber == - packageInfo - .parentNumber && r.locationCode == this.fromLocationCode) - - - //小包装没有库存， - if (subPackitems.length == 0) { - //外包装有库存，出库后剩余库存未转换为出库包装规格 - - if (subParentPackitems.length > 0) { - if (subParentPackitems.length == 1) { - let balance = subParentPackitems[0]; - balance.qty = packageInfo.qty; - this.afterGetBalance(result.label, balance, packageInfo); - } else { - this.showBalanceSelect(subParentPackitems); - } - - } else { - this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' + - packageInfo.number + '】都未查找到库存余额') - } - } else { - var locationCode = this.fromLocationCode - if (balances.list == 1) { - locationCode = balances.list[0].locationCode - } else { - var manyBlances = balances.list.filter(r => r.locationCode != this - .fromLocationCode) - if (manyBlances.length > 0) { - locationCode = manyBlances[0].locationCode; - } - - } - this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' + - locationCode + - '】已经有库存余额,请重新扫描') - } - - - - // //小包装没有库存，外包装有库存 - // if (subitems.length == 0 && subParentPackitems.length > 0) { - // this.afterGetBalance(result.label, null, packageInfo); - // } else if (subitems.length > 0 && subParentPackitems.length == 0) { - // //小包装没有库存，外包装没有有库存 - // this.showErrorMessage('该包装在库位【' + balances.list[0].locationCode + - // '】已经有库存余额,请重新扫描') - // } else { - - // } - - } + //多条记录 + this.$refs.balanceSelect.openPopup(res.data); } - uni.hideLoading(); - }); - - - // getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, - // balanceRes => { - // if (balanceRes.success) { - // let s = ''; - // if (balanceRes.data.list.length == 0) { - // this.afterGetBalance(result.label, null, packageInfo); - // } else if (balanceRes.data.list.length == 1) { - // let balance = balanceRes.data.list[0]; - // this.afterGetBalance(result.label, balance, packageInfo); - // } else { - // this.showBalanceSelect(balanceRes.data.list); - // } - // } else { - // this.showErrorMessage(balanceRes.message.message); - // } - // uni.hideLoading(); - // }); + uni.hideLoading() + }).catch(error => { + uni.hideLoading() + this.showErrorMessage(error) + }) } } catch (e) { this.showErrorMessage(e.stack) @@ -366,55 +331,6 @@ } }, - getBalance(label, packageInfo, callback) { - var filters = [] - - if (packageInfo.parentNumber) { - var packingNumber = packageInfo.parentNumber + "," + label.packingNumber; - filters.push({ - column: "packingNumber", - action: "in", - value: packingNumber - }) - } else { - filters.push({ - column: "packingNumber", - action: "==", - value: label.packingNumber - }) - } - - filters.push({ - column: "itemCode", - action: "==", - value: label.itemCode - }) - filters.push({ - column: "batch", - action: "==", - value: label.batch - }) - - if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") { - filters.push({ - column: "inventoryStatus", - action: "in", - value: this.fromInventoryStatuses - }) - } - - var params = { - filters: filters, - pageNo: 1, - pageSize: 100, - } - getBalanceByFilter(params).then(res => { - callback(res.data) - }).catch(err => { - this.showErrorMessage(err.message); - }) - }, - selectBalanceItem(balance) { this.afterGetBalance(this.label, balance, this.packageInfo); }, @@ -426,7 +342,10 @@ let packingCode = label.packingNumber; let lot = label.batch; let item = that.toLocation.Items.find(r => r.itemCode == itemCode); + + that.fromLocationCode = balance.locationCode; let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode); + //如果库存余额中的库位与任务推荐的不一致 if (fromLocation != undefined) { let batch = fromLocation.Batchs.find(r => r.batch == lot); if (batch != undefined) { @@ -483,11 +402,8 @@ } } } else { - that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发料明细', - res => { - that.getfocus(); - } - ) + let locaion = that.createLocationInfo(label, balance, packageInfo); + item.Locations.push(locaion); } } catch (e) { this.showErrorMessage(e.stack, @@ -498,20 +414,34 @@ } }, + //增加实际扫描的明细 + createLocationInfo(label, balance, packageInfo) { + let location = { + fromLocationCode: balance.locationCode, + qty: balance.qty, + uom: balance.uom, + handleQty: 0, + Batchs: [] + } + let batch = this.createBatchInfo(label, balance, packageInfo); + batch.detail = balance; + location.Batchs.push(batch); + return location; + }, + createBatchInfo(label, balance, packageInfo) { let batch = { batch: label.batch, qty: 0, uom: label.uom, - Records: [] } let record = {} - if (balance == null) { - record = this.creatRecordByBalance(label, packageInfo); + if (balance != null) { + record = this.creatRecordByBalance(balance, packageInfo); batch.handleQty = Number(label.qty) } else { - record = this.creatRecordByLabel(balance, packageInfo); + record = this.creatRecordByLabel(label, packageInfo); batch.handleQty = Number(balance.qty) } @@ -535,7 +465,7 @@ toLocationCode: this.toLocationCode, supplierCode: label.supplierCode, packUnit: packageInfo.packUnit, - packQty: packageInfo.packQty + packQty: packageInfo.packQty, } return record; }, @@ -659,16 +589,16 @@ }, packGetFocus() { - if(this.$refs.comscan){ + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } - + }, packLoseFocus() { - if(this.$refs.comscan){ + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } - + }, showMessage(message, callback) { setTimeout(r => { diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index cd55d81d..a0a0c25d 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -196,9 +196,9 @@ .jobContent, that.scanMessage); } - let timer = setTimeout(r => { + let timer = setTimeout(r => { that.resizeCollapse(); - if(timer){ + if (timer) { timer = null clearTimeout(timer) } @@ -278,7 +278,7 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - + return; repleinshJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { @@ -333,43 +333,6 @@ record.toPackUnit = r.packUnit; record.toBatch = r.batch; - - // if (r.parentPackingNumber != '' && r - // .parentPackingNumber != null) { - // record.fromPackingNumber = r - // .parentPackingNumber; - // record.toPackingNumber = r - // .packingNumber; - // // record.fromPackUnit = r.packUnit; - // record.toPackUnit = r.packUnit; - // } else { - // record.fromPackingNumber = r - // .packingNumber; - // record.toPackingNumber = r - // .packingNumber; - // record.toPackUnit = r.packUnit; - // } - // record.toBatch = r.batch; - - - // //使用在途库不改变管理模式 - // if (this.jobContent - // .useOnTheWayLocation == - // 'TRUE') { - // record.toPackingNumber = r - // .packingNumber; - // record.toBatch = r.batch; - // } else { - // var info = - // getPackingNumberAndBatch( - // this.managementList, r - // .itemCode, - // r.packingNumber, r - // .batch); - // record.toPackingNumber = info - // .packingNumber; - // record.toBatch = info.batch; - // } subItem.recordList.push(record); }) commitSubList.push(deepCopyData(subItem)); diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index ca36f9ab..05da5644 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -548,8 +548,9 @@ this.selectItem(list[0]) } } else { - this.showMessage("物料号[" + result.label.itemCode + "]批次[" + result.label.batch + - ']未查找到任务
' + "扫描[" + result.scanMessage + "]") + this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + + "]物料号[" + result.label.itemCode + "]未查找到任务
" + "扫描[" + result + .scanMessage + "]") } }).catch(error => { this.showMessage(error + "
扫描[" + result.scanMessage + "]")