diff --git a/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue b/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue index 67b24ee..97615b4 100644 --- a/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue +++ b/src/views/modules/shopOrder/productionReport/common/productionLineYieldReport.vue @@ -276,7 +276,7 @@ this.tagNo = val this.$nextTick(() => { let query = this.itemData.operator - this.$refs.baseList.init(val, query) + this.$refs.baseList.init(val, query, " and A.OperatorID in (Select D.ResourceID from WorkCenterResource as D Where D.Site=A.Site and D.WorkCenterNo= 'FQC')") }) }, // 操作员信息 diff --git a/src/views/modules/shopOrder/shopOrder/common/routing.vue b/src/views/modules/shopOrder/shopOrder/common/routing.vue index 71333e5..df08f60 100644 --- a/src/views/modules/shopOrder/shopOrder/common/routing.vue +++ b/src/views/modules/shopOrder/shopOrder/common/routing.vue @@ -580,6 +580,8 @@ if (data.code == 0) { let maxItem = JSON.parse(JSON.stringify(this.selectRow)) maxItem.itemNo = Number(data.data) + 10 + let barcodeID = '0000'+maxItem.itemNo + maxItem.barcodeID = maxItem.site+'-00000'+maxItem.orderNo+"-"+barcodeID.slice(-4) // 保存信息 this.addRouteInShopOrder(maxItem) }