From 52d24acc23b6bc15109c36363563c2835d04aa83 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sun, 20 Nov 2022 18:12:33 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/closeSchedule.vue      | 12 ++++++++-
 src/views/modules/production/dailyPlan.vue    | 27 ++++++++++++++-----
 .../modules/production/generateReport.vue     | 21 ++++++++++-----
 src/views/modules/production/operator.vue     |  2 +-
 .../modules/production/scheduleForSOTask.vue  | 12 ++++++++-
 .../production/scheduleForShopOrder.vue       | 10 +++++++
 .../modules/production/searchDailyPlan.vue    | 13 ++++++++-
 .../modules/production/soscheduleRouting.vue  |  5 +++-
 src/views/modules/production/stockPrint.vue   |  5 +++-
 .../modules/production/transFerPrint.vue      | 13 ++++++++-
 10 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index 4eb6cf1..e128d4c 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" style="margin-top: 0px;">
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
@@ -106,6 +109,13 @@
           <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="seqNo"
         header-align="center"
@@ -409,7 +419,7 @@
           orderNo: '',
           sWorkCenterNo: '',
           partNo: '',
-          site: this.$store.state.user.site,
+          site: '',
           itemDesc:'',
           scheduleType:'',
           reportFlag:'QtyRequired>QtyReported',
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index f8bf611..ad3b26c 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -2,6 +2,9 @@
   <div class="mod-config">
     <el-form inline="true"  v-model="searchData">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
+        <el-form-item :label="'工厂编号：'">
+          <el-input v-model="searchData.site" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="'订单号：'">
           <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
         </el-form-item>
@@ -100,7 +103,6 @@
       style="width: 100%">
       <el-table-column
         prop=""
-        fixed="right"
         header-align="center"
         align="center"
         min-width="30"
@@ -109,6 +111,13 @@
           <a type="text" size="small" @click="openScheduleModel(scope.row)">排产</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
@@ -339,7 +348,8 @@
           planStartDate: '',
           needDate: '',
           schedulingSize: '',
-          unSchedulingSize: ''
+          unSchedulingSize: '',
+          site:'',
         },
         dataListSelections: [],
         scheduledingData: {
@@ -350,7 +360,7 @@
           lotSize: '',
           planStartDate: '',
           needDate: '',
-          site: this.$store.state.user.site,
+          site: '',
           productionType: '生产订单',
           planAdd: 0,
           partNo: ''
@@ -365,7 +375,7 @@
           lotSize: '',
           planStartDate: '',
           needDate: '',
-          site: this.$store.state.user.site,
+          site: '',
           productionType: '生产订单',
           planAdd: 0,
           partNo: ''
@@ -384,7 +394,7 @@
           partNo: '',
           startDate3: '',
           endDate3: '',
-          site: this.$store.state.user.site,
+          site: '',
           planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(so.scheduling_size,0),3)'
         },
         // table高度
@@ -431,6 +441,7 @@
         this.scheduledingData.userName = this.$store.state.user.name
         this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate
         this.scheduledingData.needDate = this.scheduledModelData.needDate
+        this.scheduledingData.site = this.scheduledModelData.site
         this.scheduledingData.orderNo = this.scheduledModelData.orderNo
         this.scheduledingData.orderDate = this.scheduledModelData.planStartDate
         this.scheduledingData.planAdd = 0
@@ -449,6 +460,7 @@
         this.scheduledingsData.planStartDate = this.scheduledModelData.planStartDate
         this.scheduledingsData.needDate = this.scheduledModelData.needDate
         this.scheduledingsData.orderNo = this.scheduledModelData.orderNo
+        this.scheduledingsData.site = this.scheduledModelData.site
         this.scheduledingsData.orderDate = this.scheduledModelData.planStartDate
         this.scheduledingsData.planAdd = 0
         this.scheduledingsData.orderQty = ''
@@ -471,7 +483,9 @@
           this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
         })
         this.scheduledingData.lotSize = row.lotSize
+        this.scheduledingData.site = row.site
         this.scheduledingData.partNo = row.partNo
+        this.scheduledModelData.site = row.site
         this.scheduledingsData.lotSize = row.lotSize
         this.scheduledingsData.partNo = row.partNo
         this.scheduledModelData.needDate = row.needDate
@@ -589,7 +603,7 @@
             "userName": this.$store.state.user.name,
             "planStartDate": this.scheduledingsData.planStartDate,
             "needDate": this.scheduledingsData.needDate,
-            "site": this.$store.state.user.site,
+            "site": this.scheduledingsData.site,
             "productionType": '生产订单',
             "partNo": this.scheduledingsData.partNo,
             "lotSize": this.scheduledingsData.lotSize,
@@ -678,6 +692,7 @@
         this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate
         this.scheduledingData.needDate = this.scheduledModelData.needDate
         this.scheduledingData.orderNo = this.scheduledModelData.orderNo
+        this.scheduledingData.site = this.scheduledModelData.site
         this.scheduledingData.orderDate = row.orderDate
         this.scheduledingData.planAdd = 1
         this.scheduledingData.orderQty = row.orderQty
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index cf40695..dec1ee9 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
-        <el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
+        <el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item >
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
@@ -121,6 +124,13 @@
           <a type="text" size="small" @click="SOPModal2(scope.row)">查看SOP</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="60"
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="seqNo"
         header-align="center"
@@ -529,7 +539,7 @@
         qty2:'',
         qty3:'',
         sopFlag:false,
-        site: this.$store.state.user.site,
+        site: '',
         operatorType: 0,
         // 导出 start
         exportData: [],
@@ -564,7 +574,7 @@
           orderNo: '',
           sWorkCenterNo: '',
           partNo: '',
-          site: this.$store.state.user.site,
+          site: '',
           itemDesc:'',
           scheduleType:'',
           reportFlag:"closedFlag='N'",
@@ -891,7 +901,7 @@
           return false;
         }
         let inData={
-          site:this.$store.state.user.site,
+
           seqNo:this.scanSeqNo
         }
         searchSeqNo(inData).then(({data}) => {
@@ -1016,7 +1026,6 @@
       },
       startSeqNo(){
         let inData={
-          site:this.$store.state.user.site,
           username:this.$store.state.user.name,
           seqNo:this.scanSeqNo
         }
@@ -1040,7 +1049,6 @@
       },
       stopWork(){
         let inData={
-          site:this.$store.state.user.site,
           username:this.$store.state.user.name,
           seqNo:this.scanSeqNo
         }
@@ -1064,7 +1072,6 @@
       },
       continueWork(){
         let inData={
-          site:this.$store.state.user.site,
           username:this.$store.state.user.name,
           seqNo:this.scanSeqNo
         }
diff --git a/src/views/modules/production/operator.vue b/src/views/modules/production/operator.vue
index a7c1437..fd48ee2 100644
--- a/src/views/modules/production/operator.vue
+++ b/src/views/modules/production/operator.vue
@@ -205,7 +205,7 @@
           operatorID:'',
           operatorName:'',
           status:'all',
-          site:this.$store.state.user.site,
+          site:'',
         },
         operatorData:{
           operatorID:'',
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 1eba0c2..6d4e01f 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -2,6 +2,9 @@
   <div class="mod-config">
     <el-form inline="true"  v-model="searchData">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
+        <el-form-item :label="'工厂编号：'">
+          <el-input v-model="searchData.site" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="'日计划号：'">
           <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
         </el-form-item>
@@ -96,6 +99,13 @@
           <a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="120"
+        label="工厂编号">
+      </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
@@ -440,7 +450,7 @@
           status: '(\'已计划\')',
           partNo: '',
           orderRef1:'',
-          site: this.$store.state.user.site,
+          site: '',
           planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)',
           itemNo:'',
           finishFlag:'',
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 9231637..d63fbd4 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -2,6 +2,9 @@
   <div class="mod-config">
     <el-form inline="true"  v-model="searchData">
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
+        <el-form-item :label="'工厂编码：'">
+          <el-input v-model="searchData.site" style="width: 120px"></el-input>
+        </el-form-item>
         <el-form-item :label="'订单号：'">
           <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
         </el-form-item>
@@ -133,6 +136,13 @@
           <a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        width="60"
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue
index bf3981e..fb63b14 100644
--- a/src/views/modules/production/searchDailyPlan.vue
+++ b/src/views/modules/production/searchDailyPlan.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'工厂编码：'">
+        <el-input v-model="searchData.site" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'日计划单号：'">
         <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
       </el-form-item>
@@ -55,6 +58,14 @@
       :data="tableData"
       border
       style="width: 100%">
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="60"
+
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
@@ -167,7 +178,7 @@
           startDate1:new Date(),
           endDate1:'',
           status:'all',
-          site:this.$store.state.user.site,
+          site:'',
         },
       }
     },
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 8112432..331ae1d 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'工厂编码'">
+        <el-input v-model="searchData.site" style="width: 130px"></el-input>
+      </el-form-item>
       <el-form-item :label="'生产订单号'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
@@ -342,7 +345,7 @@
           orderNo: '',
           sWorkCenterNo: '',
           partNo: '',
-          site: this.$store.state.user.site,
+          site: '',
           itemDesc:'',
           scheduleType:'',
           reportFlag:'QtyRequired>QtyApprove',
diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue
index 1094152..23005d9 100644
--- a/src/views/modules/production/stockPrint.vue
+++ b/src/views/modules/production/stockPrint.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'工厂编码:'">
+        <el-input v-model="searchData.site" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'入库日期：'">
         <el-date-picker
           style="width: 130px"
@@ -161,7 +164,7 @@
         searchData: {
           orderNo: '',
           partNo: '',
-          site: this.$store.state.user.site,
+          site: '',
           startDate:new Date(),
           endDate:'',
           printFlag:'N',
diff --git a/src/views/modules/production/transFerPrint.vue b/src/views/modules/production/transFerPrint.vue
index 7bd4c98..892aa7d 100644
--- a/src/views/modules/production/transFerPrint.vue
+++ b/src/views/modules/production/transFerPrint.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'工厂编码:'">
+        <el-input v-model="searchData.site" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="'报工日期：'">
         <el-date-picker
           style="width: 130px"
@@ -44,6 +47,14 @@
           <a type="text" size="small" @click="printStock(scope.row)">打印标签</a>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="site"
+        header-align="center"
+        align="left"
+        min-width="60"
+        style="font-size: 20px"
+        label="工厂编码">
+      </el-table-column>
       <el-table-column
         prop="transNo"
         header-align="center"
@@ -137,7 +148,7 @@
         searchData: {
           orderNo: '',
           partNo: '',
-          site: this.$store.state.user.site,
+          site: '',
           startDate:new Date(),
           endDate:'',
           seqNo:'',