From 8c50aa93a2978ec50ddc1bd67912b603a19df838 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 21 Jun 2022 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=80=89=E6=8B=A9=202022-06-?=
 =?UTF-8?q?21=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionReport/common/productionLineYieldReport.vue       | 2 +-
 src/views/modules/shopOrder/shopOrder/common/routing.vue        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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)
           }