diff --git a/src/pages.json b/src/pages.json index 11059bbf..58834e8d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1272,7 +1272,7 @@ { "path": "pages/productReceipt/job/productReceiptDetail", "style": { - "navigationBarTitleText": "预生产收货详情", + "navigationBarTitleText": "", "enablePullDownRefresh": false } }, @@ -1367,7 +1367,7 @@ { "path": "pages/productReceipt/job/fgProductReceiptJob", "style": { - "navigationBarTitleText": "装配收货任务", + "navigationBarTitleText": "号口品收货任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -1393,14 +1393,14 @@ { "path": "pages/productReceipt/job/fgProductReceiptDetail", "style": { - "navigationBarTitleText": "装配收货详情", + "navigationBarTitleText": "号口品收货详情", "enablePullDownRefresh": false } }, { "path": "pages/productReceipt/job/semiProductReceiptJob", "style": { - "navigationBarTitleText": "预生产收货任务", + "navigationBarTitleText": "补给品收货任务", "enablePullDownRefresh": true, "titleNView": { // "autoBackButton": "true", @@ -1426,7 +1426,7 @@ { "path": "pages/productReceipt/job/semiProductReceiptDetail", "style": { - "navigationBarTitleText": "预生产完工收货详情", + "navigationBarTitleText": "补给品收货详情", "enablePullDownRefresh": false } }, diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index 9447c003..c44ee1c8 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -538,63 +538,50 @@ let str1 = "" let str2 = "" this.detailSource.forEach(detail => { - var taskQty = 0; - var totalQty = 0; + detail.taskQty = 0; + detail.totalQty = 0; detail.subList.forEach(item => { - if(item.scaned){ - item.taskQty=0 - item.totalQty=0 - item.taskQty =calc.add(item.taskQty,item.qty) - item.totalQty =calc.add(item.totalQty,item.handleQty) - if (this.jobContent.allowSmallerQty == "FALSE") { - if(item.handleQty!=item.taskQty){ - str += `批次【${item.batch}】提交数量【${item.handleQty}】与任务物料数量【${item.taskQty}】不一致\n` - } - } - if (this.allowBiggerQty == 'FALSE') { - if ( item.taskQty < item.totalQty) { - str1 += '数量[' + item.totalQty + ']不允许大于任务数量[' + item.taskQty + ']' - } - } + item.qty = item.qty || 0 + item.handleQty = item.handleQty || 0 + detail.taskQty =calc.add(detail.taskQty,item.qty) + detail.totalQty =calc.add(detail.totalQty,item.handleQty) + if(item.scaned){ if(item.handleQty>item.balance.qty){ str2 += `批次【${item.batch}】提交数量【${item.handleQty}】不可以大于库存数量【${item.balance.qty}】` } - } - + } }) + if(detail.handleQty < detail.taskQty){ + str += `物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许小于任务数量【${detail.taskQty}】\n` + } + if(detail.handleQty > detail.taskQty){ + str1 += `物料号【${detail.itemCode}】数量【${detail.handleQty}】不允许大于任务数量【${detail.taskQty}】\n` + } }) - - if (str) { - str = '不允许提交\n' + str - this.showErrorMessage(str) + if (this.jobContent.allowSmallerQty == "FALSE") { + if (str) { + str = '不允许提交\n' + str + this.showErrorMessage(str) + } } - if (str1) { - str1 = '不允许提交\n' + str1 - this.showErrorMessage(str1) + if (this.allowBiggerQty == 'FALSE') { + if (str1) { + str1 = '不允许提交\n' + str1 + this.showErrorMessage(str1) + } } + if (str2) { str2 = '不允许提交\n' + str2 this.showErrorMessage(str2) } return str || str1 || str2 ? false : true - + }, submitJob() { - var params = this.setParams() - console.log("提交参数", params); - console.log("提交参数", params.subList); - // const isTrue = params.subList.some(item=>{ - // console.log(item.recordList.some(cur=>cur.scaned)) - // return item.recordList.some(cur=>cur.scaned) == true - // }) - const isTrue = params.subList.some(item=>item.scaned) - if(!isTrue){ - uni.hideLoading() - this.showErrorMessage("请扫描您需要提交的发货任务") - return - } + // return; // if (params.subList.length == 0) { // uni.hideLoading() @@ -612,6 +599,20 @@ return; } } + + var params = this.setParams() + console.log("提交参数", params); + console.log("提交参数", params.subList); + // const isTrue = params.subList.some(item=>{ + // console.log(item.recordList.some(cur=>cur.scaned)) + // return item.recordList.some(cur=>cur.scaned) == true + // }) + const isTrue = params.subList.some(item=>item.scaned) + if(!isTrue){ + uni.hideLoading() + this.showErrorMessage("请扫描您需要提交的发货任务") + return + } deliverJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { @@ -653,6 +654,7 @@ obj1.toInventoryStatus =record.inventoryStatus; obj1.toLocationCode = record.toLocationCode; obj1.supplierCode = record.supplierCode; + obj1.uom = record.uom; obj1.toPackingNumber =''; obj1.packingNumber = '' obj1.fromPackingNumber = ''; @@ -670,6 +672,7 @@ } }) + this.jobContent.subList = subList this.jobContent.createTime = createTime; this.jobContent.creator = creator; diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue index f99df8af..40fa52f0 100644 --- a/src/pages/issue/job/issueDetailBatch.vue +++ b/src/pages/issue/job/issueDetailBatch.vue @@ -523,7 +523,6 @@ } console.log("提交参数", params); - return issueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) { diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 44636dc0..072486ae 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -319,7 +319,7 @@ updateData() { - // calcHandleQty(this.detailSource); + calcHandleQty(this.detailSource); },