diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index c6bee9c..464f883 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -191,6 +191,23 @@ export function getReportList(query) {
 		params: query
 	});
 }
+
+// 查询报工详细列表
+export function getCKList(data) {
+  return request({
+    url: '/wms/order/listCKT',
+    method: 'post',
+    params: data
+  });
+}
+//查询报工详细列表+SAP收货状态
+export function getReportSAPList(query) {
+  return request({
+    url: '/wms/put/getReportListSap',
+    method: 'get',
+    params: query
+  });
+}
 // 提交报工详细列表
 export function submitReportPS(data) {
 	return request({
@@ -199,7 +216,14 @@ export function submitReportPS(data) {
 		data: data
 	});
 }
-
+// SAP收货
+export function submitReportPSSAP(data) {
+  return request({
+    url: '/wms/put/addReportListSap',
+    method: 'post',
+    data: data
+  });
+}
 // 查询物料管理列表
 export function getPrepareList(query) {
 	return request({
diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index d8b4e8f..e7467de 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -43,3 +43,13 @@ export function delProduce(recordId) {
 	});
 }
 
+export function getProduceReportXJ(orderNo) {
+	const data = {
+		orderNo
+	}
+	return request({
+		url: '/quality/qcProduceReport/getProduceReportXJ',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/views/device/operation/index.vue b/src/views/device/operation/index.vue
index 9fdaf91..e8ecf40 100644
--- a/src/views/device/operation/index.vue
+++ b/src/views/device/operation/index.vue
@@ -228,6 +228,8 @@
 			<el-table-column width="100" label="实际运行时间" align="center" prop="actualOperationTime" />
 			<el-table-column width="100" label="运行时间" align="center" prop="operationTime" />
 			<el-table-column width="100" label="故障率" align="center" prop="failureRate" />
+			<el-table-column width="100" label="故障次数" align="center" prop="failureTimes" />
+			<el-table-column width="100" label="停机次数" align="center" prop="shutdownTimes" />
 			<el-table-column width="200" label="故障描述" align="center" prop="failureDescription" />
 			<el-table-column width="200" label="原因分析" align="center" prop="reasonAnalyze" />
       <el-table-column width="200" label="设备状态描述" align="center" prop="equStatusDes" />
diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue
index 96615e7..7213c75 100644
--- a/src/views/device/sparePartsLedger/index.vue
+++ b/src/views/device/sparePartsLedger/index.vue
@@ -139,17 +139,17 @@
       <el-table-column label="备品备件号" align="center" prop="materialCode" width="120"/>
       <el-table-column label="备品备件名称" align="center" prop="materialDesc" width="120"/>
       <el-table-column label="规格型号" align="center" prop="spareMode" width="200"/>
-      <el-table-column label="单机装配数量" align="center" prop="unitQuantity" width="50"/>
+      <el-table-column label="单机装配数量" align="center" prop="unitQuantity" width="100"/>
       <el-table-column label="单价" align="center" prop="unitPrice" width="50"/>
       <el-table-column label="单位" align="center" prop="userDefined1" width="50"/>
-      <el-table-column label="代用件" align="center" prop="substituteParts" width="50"/>
-      <el-table-column label="安全库存" align="center" prop="safeStock" width="50"/>
-      <el-table-column label="现有库存" align="center" prop="amount" width="50"/>
+      <el-table-column label="代用件" align="center" prop="substituteParts" width="80"/>
+      <el-table-column label="安全库存" align="center" prop="safeStock" width="80"/>
+      <el-table-column label="现有库存" align="center" prop="amount" width="80"/>
       <el-table-column label="采购方式" align="center" prop="procurementMethod" width="150"/>
       <!-- 生产厂商暂时没有用 -->
       <!-- <el-table-column label="生产厂商" align="center" prop="spareManufacturer" width="200"/> -->
-      <el-table-column label="更换周期（月）" align="center" prop="spareReplacementCycle"/>
-      <el-table-column label="采购周期（天）" align="center" prop="procurementCycle"/>
+      <el-table-column label="更换周期（月）" align="center" prop="spareReplacementCycle"width="120"/>
+      <el-table-column label="采购周期（天）" align="center" prop="procurementCycle"width="120"/>
       <el-table-column label="期初结存" align="center" prop="openingBalance"/>
       <el-table-column label="入库记录" align="center" prop="inputRecords"/>
       <el-table-column label="出库记录" align="center" prop="outputRecords"/>
diff --git a/src/views/kanban/finishproduct/BottomRightTable1.vue b/src/views/kanban/finishproduct/BottomRightTable1.vue
index d96ac3d..765e2e2 100644
--- a/src/views/kanban/finishproduct/BottomRightTable1.vue
+++ b/src/views/kanban/finishproduct/BottomRightTable1.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="bottom-right-table-1">
-    <dv-border-box-6>
+    <dv-border-box-13 :key="borderBoxKey">
       <div class="table-name">
-        <dv-scroll-board :config="getScrollBoardConfig()"  />
+        <dv-scroll-board :config="getScrollBoardConfig()" />
+<!--        <dv-scroll-board :config="getScrollBoardConfig()"  />-->
       </div>
-    </dv-border-box-6>
+    </dv-border-box-13>
   </div>
 </template>
 
@@ -19,6 +20,7 @@ export default {
   },
   data () {
     return {
+      borderBoxKey: 1, // 初始化一个key值
       config:{
         header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'],
         data: [
@@ -37,6 +39,7 @@ export default {
     tableData(newVal) {
       console.log("newVal-",newVal)
       this.config.data = this.formatTableData(newVal);
+      this.borderBoxKey += 1;
     }
   },
   methods: {
@@ -100,5 +103,6 @@ export default {
   .dv-scroll-board {
     height: calc(~"100% - 0px");
   }
+
 }
 </style>
diff --git a/src/views/kanban/finishproduct/TopMiddleCmp.vue b/src/views/kanban/finishproduct/TopMiddleCmp.vue
index 3941989..de13d20 100644
--- a/src/views/kanban/finishproduct/TopMiddleCmp.vue
+++ b/src/views/kanban/finishproduct/TopMiddleCmp.vue
@@ -87,15 +87,15 @@ export default {
 <style scoped>
 .top-middle-cmp {
   position: relative;
-  padding: 0 50px;
+  padding: 0 0px;
   box-sizing: border-box;
 
-.chart-name {
-  position: absolute;
-  right: 70px;
-  text-align: right;
-  font-size: 20px;
-  top: 10px;
-}
+/*.chart-name {*/
+/*  position: absolute;*/
+/*  right: 70px;*/
+/*  text-align: right;*/
+/*  font-size: 20px;*/
+/*  top: 10px;*/
+/*}*/
 }
 </style>
diff --git a/src/views/kanban/finishproduct/index.vue b/src/views/kanban/finishproduct/index.vue
index 9ae42c8..8715499 100644
--- a/src/views/kanban/finishproduct/index.vue
+++ b/src/views/kanban/finishproduct/index.vue
@@ -1,32 +1,47 @@
 <template>
-  <div id="data-view">
-    <dv-full-screen-container>
-      <div class="main-header">
-        <div class="mh-left">
+  <v-scale-screen width="1920" height="1080" :fullScreen="true">
+    <div class="app-container home" style="">
+      <div class="head">
+        <div class="head-content">
+          <div class="title">成品包装线生产看板</div>
+        </div>
+        <div class="head-logo">
           <img src="../../../assets/images/logo.png" alt="" />
         </div>
-        <div class="mh-middle">成品包装线生产看板</div>
-        <div class="mh-right">{{currentDateTime}}
+        <div class="back">
+          <el-button
+            @click="back()"
+            type="primary"
+            icon="el-icon-s-home"
+          ></el-button>
         </div>
       </div>
-
-      <dv-border-box-1 class="main-container">
+      <div class="content-top">
+        <div class="timebox">
+          <div class="time">
+            {{ currentDateTime }}
+          </div>
+        </div>
+      </div>
+      <div class="content">
         <div class="mc-top">
-          <Top-Left-Cmp :data="valueForTopLeftCmp"/>
-          <Top-Middle-Cmp :data="valueForTopMiddleCmp" />
-          <Top-right-Cmp />
+          <div class="mc-left">
+            <Top-Left-Cmp :data="valueForTopLeftCmp"/>
+          </div>
+          <div class="mc-middle">
+
+          </div>
+          <div class="mc-right">
+            <Top-Middle-Cmp :data="valueForTopMiddleCmp"  style="height: 100%;"/>
+          </div>
         </div>
         <div class="mc-bottom">
-          <BottomRightTable1  :tableData="BottomRightTableValue"/>
+          <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px"/>
+          <!-- 设置 .mc-bottom 的高度，你可以根据实际情况调整 -->
         </div>
-
-<!--        <div class="mc-bottom">-->
-<!--          <BottomRightTable1 v-for="index in 4" :key="index+4" :tableIndex="index" :tableData="BottomRightTable2Value"/>-->
-<!--        </div>-->
-      </dv-border-box-1>
-
-    </dv-full-screen-container>
-  </div>
+      </div>
+    </div>
+  </v-scale-screen>
 </template>
 
 <script>
@@ -104,100 +119,92 @@ export default {
 }
 </script>
 
-<style lang="less">
-#data-view {
+<style lang="scss" scoped>
+
+.app-container {
+  padding: 0px 24px;
+  color: #fff;
+}
+.home {
   width: 100%;
   height: 100%;
-  background-color: #030409;
-  color: #fff;
-
-  #dv-full-screen-container {
-    background-image: url("../../../assets/images/bg-finishproduct.png");
-    background-size: 100% 100%;
-    box-shadow: 0 0 3px blue;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .main-header {
-    height: 80px;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-
-    .mh-left {
-      margin-top: 10px;
+  background: url("../../../assets/images/bg-finishproduct.png") no-repeat;
+  background-size: 100% 100%;
+  background-color: #050711;
+  .head {
+    width: 100%;
+    height: 74px;
+    position: relative;
+    .head-content {
+      height: 74px;
+      background-image: url("../../../assets/images/bg-head.png");
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+      .title {
+        font-size: 42px;
+        font-weight: 400;
+        color: #ffffff;
+      }
     }
-
-    .mh-middle {
-      font-size: 30px;
+    .head-logo {
+      position: absolute;
+      left: 0px;
+      top: 1px;
+      img {
+        height: 38px;
+        // width: ;
+      }
     }
-
-    .mh-left, .mh-right {
-      width: 200px;
+    .back {
+      position: absolute;
+      right: 0px;
+      top: 5px;
     }
   }
-
-  .main-container {
-    height: calc(~"100% - 80px");
-    margin-left:0px;
-    .mc-top, .mc-bottom ,mc-bottom-1 {
-      box-sizing: border-box;
-      padding: 30px;
-      display: flex;
-
+  .content-top {
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+    .timebox {
+      width: 480px;
+      height: 100px;
+
+      background-size: 100% 100%;
+      text-align: center;
+      position: absolute;
+      top: -17px;
+      right: 0px;
+      .time {
+        font-size: 30px;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 71px;
+      }
     }
-
+  }
+  .content {
+    margin-top: 63px;
+    display: block;
+    justify-content: space-between;
     .mc-top {
-      height: 40%;
-    }
-
-    .mc-bottom-1, .mc-bottom-2 {
       height: 100%;
-    }
-
-    .top-left-cmp, .bottom-left-container {
-      width: 32%;
-    }
-
-    .top-middle-cmp, .top-right-cmp {
-      width: 34%;
-    }
-
-    .bottom-left-container {
-      position: relative;
-
-      .border-box-content {
-        display: flex;
-      }
-
-      .mcb-decoration-1, .mcb-decoration-2 {
-        position: absolute;
-        left: 50%;
-        margin-left: -2px;
-      }
-
-      .mcb-decoration-1 {
-        top: 5%;
-        transform: rotate(180deg);
+      width: 100%;
+      display: flex;
+      .mc-left {
+        flex: 2;  // 占据剩余的空间
       }
 
-      .mcb-decoration-2 {
-        top: 50%;
+      .mc-middle {
+        flex: 1;  // 占据剩余的空间
       }
-
-      .bottom-left-chart-1, .bottom-left-chart-2 {
-        width: 50%;
-        height: 100%;
+      .mc-right {
+        flex: 2;  // 占据剩余的空间
       }
     }
 
-    .bottom-right-container {
-      width: 68%;
-      padding-left: 30px;
-      box-sizing: border-box;
-      display: flex;
-    }
   }
+
 }
+
 </style>
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 6e04378..3d85b8f 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -71,6 +71,7 @@
 					v-hasPermi="['mes:reportWork:add']"
 				>新增</el-button>
 			</el-col>
+
 			<!--<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -137,6 +138,17 @@
 					v-hasPermi="['mes:reportWork:export']"
 				>导出</el-button>
 			</el-col>
+
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAddSAP"
+          >SAP收货</el-button>
+        </el-col>
+
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -213,7 +225,7 @@
 									</el-input>
 								</el-form-item>
 							</el-col>
-						</el-row>		
+						</el-row>
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="批次编码" prop="batch">
@@ -273,7 +285,7 @@
 										</el-option>
 									</el-select>
 								</el-form-item>
-							</el-col>	
+							</el-col>
 							<el-col :span="6">
 								<el-form-item label="结束报工" prop="endReport">
 									<el-radio v-model="form.endReport" label="0">否</el-radio>
@@ -429,13 +441,13 @@
 						<el-table-column label="id" align="center" prop="id" v-if="false"/>
 						<el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
 						<el-table-column label="报工单号" width="150" align="left" prop="reportCode" :show-overflow-tooltip="true" />
-						<el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" /> 
+						<el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" />
 						<el-table-column label="单位" align="center" prop="unit"/>
-						<el-table-column label="报工数量" width="100" align="left" prop="quantityFeedback" :show-overflow-tooltip="true" > 
+						<el-table-column label="报工数量" width="100" align="left" prop="quantityFeedback" :show-overflow-tooltip="true" >
 						    <template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantityFeedback" @change="handleEdit(scope.$index,scope.row)"></el-input>
 							</template>
-						</el-table-column>	
+						</el-table-column>
 						<el-table-column label="工时数" align="center" prop="workTime">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.workTime" @change="handleEdit(scope.$index,scope.row)"></el-input>
@@ -458,13 +470,13 @@
 						<el-table-column label="id" align="center" prop="id" v-if="false"/>
 						<el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
 						<el-table-column label="报工单号" width="150" align="left" prop="reportCode" :show-overflow-tooltip="true" />
-						<el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" /> 
+						<el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" />
 						<el-table-column label="单位" align="center" prop="unit"/>
-						<el-table-column label="报工数量" width="100" align="left" prop="quantityFeedback" :show-overflow-tooltip="true" > 
+						<el-table-column label="报工数量" width="100" align="left" prop="quantityFeedback" :show-overflow-tooltip="true" >
 						    <template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantityFeedback" @change="handleEdit(scope.$index,scope.row)"></el-input>
 							</template>
-						</el-table-column>	
+						</el-table-column>
 						<el-table-column label="工时数" align="center" prop="workTime">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.workTime" @change="handleEdit(scope.$index,scope.row)"></el-input>
@@ -493,9 +505,9 @@
 						<el-table-column width="50" align="center" type="selection"/>
 						<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 						<el-table-column label="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
-						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" /> 
-						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" /> 
-						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" > 
+						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
+						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
+						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
 							</template>
@@ -510,9 +522,9 @@
 						<el-table-column width="50" align="center" type="selection"/>
 						<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 						<el-table-column label="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
-						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" /> 
-						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" /> 
-						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" > 
+						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
+						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
+						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
 							</template>
@@ -524,13 +536,69 @@
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
-			
+
 			    <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
 				<el-button type="primary" @click="submitConsume" v-else>确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
-		<!--母工单--》》》》》》》》》》》》》》》-->		
+
+
+    <!-- SAP收货 -->
+    <el-dialog :title="titleReport" :visible.sync="openReportSAP" width="1200px">
+      <el-select v-model="selectedWarehouse" placeholder="请选择仓库">
+        <el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseCode" :label="warehouse.warehouseName" :value="warehouse.warehouseCode"></el-option>
+      </el-select>
+      <el-tabs v-model="activeName" >
+        <el-tab-pane label="母工单报工信息" name="pOrder">
+          <el-table v-loading="loading" :data="pOrderTableList" ref="myPOrderTable"  @selection-change="pReportSelection"
+                    :summary-method="getSummaries"
+                    show-summary
+          >
+            <el-table-column width="50" align="center" type="selection"/>
+            <el-table-column label="id" align="center" prop="id" v-if="false"/>
+            <el-table-column label="SAP工单编码" width="250" align="left" prop="workorderCodeSap" :show-overflow-tooltip="true" />
+            <el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
+            <el-table-column label="报工单号" width="150" align="left" prop="reportCode" :show-overflow-tooltip="true" />
+            <el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" />
+            <el-table-column label="产品编码" width="350" align="center" prop="productCode"/>
+            <el-table-column label="产品名称" width="350" align="center" prop="productName"/>
+            <el-table-column label="单位" align="center" prop="unit"/>
+            <el-table-column label="报工数量" width="100" align="left" prop="quantityFeedback" :show-overflow-tooltip="true" >
+              <template slot-scope="scope">
+                <el-input type="number" size="small" v-model="scope.row.quantityFeedback" @change="handleEdit(scope.$index,scope.row)"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="入库数量" width="100" align="left" prop="quantityQualified" :show-overflow-tooltip="true" >
+              <template slot-scope="scope">
+                <el-input type="number" size="small" v-model="scope.row.quantityQualified" @change="handleEdit(scope.$index,scope.row)"></el-input>
+              </template>
+            </el-table-column>
+<!--            <el-table-column label="用人数" align="center" prop="useMan">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-input type="number" size="small" v-model="scope.row.useMan" @change="handleEdit(scope.$index,scope.row)"></el-input>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+            <el-table-column label="计划日期" width="100" align="center" prop="productDate"/>
+            <el-table-column label="SAP过账状态" width="100" align="center" prop="sapstatus">
+              <template slot-scope="scope">
+                <span v-if="scope.row.sapstatus === '1'">完成</span>
+                <span v-else-if="scope.row.sapstatus ==='2'">失败</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="SAP过账信息"  width="350"  align="center" prop="sapmessage"/>
+
+            <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="submitReportSAP" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+		<!--母工单--》》》》》》》》》》》》》》》-->
 			<!--人员选择弹窗-->
 			<ItemSelectUser
 				ref="itemSelectUser"
@@ -546,20 +614,21 @@
 				ref="itemSelectEquip"
 				@onSelected="onSelectEquip"
 			></ItemSelectEquip>
-		<!--母工单--《《《《《《《《《《《《《《《-->	
+		<!--母工单--《《《《《《《《《《《《《《《-->
 	</div>
 </template>
 
 <script>
 import { listReportWork, getReportWork, delReportWork, addReportWork, getWorkcenterList,
          updateReportWork,reportSap,getBatchList,
-		 getReportList,submitReportPS} from "@/api/mes/reportWork";
+		 getReportList,getReportSAPList,submitReportPS,submitReportPSSAP,getCKList} from "@/api/mes/reportWork";
 import { getConsumeList,submitConsumePS,submitReportInfo} from "@/api/mes/reportWorkConsume";
 import ReportWorkConsume from "./reportWorkConsume.vue";
 import ItemSelectUser from "./selectUser.vue";
 import ItemSelectWorkOrder from "./selectWorkOrder.vue";
 import ItemSelectEquip from "./selectEquip.vue";
 import moment from 'moment';
+import { getlistCK } from '@/api/wms/outorder'
 export default {
 	name: "ReportWork",
 	dicts: ['report_type'],
@@ -590,6 +659,9 @@ export default {
 			activeName0: 'first',
 			activeName: 'pOrder',
 			activeName2: 'pConsume',
+      selectedWarehouse:'0004',
+      warehouseList: [],
+    //  SAPCD:"",
 			reportRows:[],
 			pReportRows:[],
 			sReportRows:[],
@@ -604,6 +676,7 @@ export default {
 			// 是否显示弹出层
 			open: false,
 			openReport: false,
+      openReportSAP: false,
 			openConsume: false,
 			consumeQueryParams:{
 				consumePageNum:1,
@@ -642,7 +715,7 @@ export default {
 				attr2: null,
 				attr3: null,
 				attr4: null,
-				workorderCode: null,
+        workorderCodeSap: null,
 				parentOrder:null,
 				uploadStatus:"0"
 			},
@@ -702,7 +775,7 @@ export default {
 	},
 	methods: {
 		getWorkcenterList(){
-			
+
             getWorkcenterList().then(data => {
 				this.options1 = data;
 			});
@@ -727,7 +800,7 @@ export default {
 			var m = dd.getMonth() + 1;//获取当前月份的日期
 			var d = dd.getDate();
             return y + "-" + m + "-" + d;
-			
+
 		},
 		/** 查询报工报表列表 */
 		getList() {
@@ -763,6 +836,7 @@ export default {
 		cancel() {
 			this.open = false;
 			this.openReport = false;
+      this.openReportSAP=false;
 			this.openConsume = false;
 			this.reset();
 		},
@@ -868,6 +942,42 @@ export default {
 			this.title = "添加报工记录";
 			this.optType = "add";
 		},
+    handleAddSAP(row) {
+      this.reset();
+      let sr = this.selectRow[0];
+
+      if(sr.uploadStatus =='sap报工成功'){
+        this.optType = 'view'
+      }else{
+        this.optType = ''
+      }
+
+      this.queryParams.workorderCode = sr.workorderCode;
+      // this.SAPCD=sr.workorderCodeSap;
+      //查询母工单报工记录列表
+      this.queryParams.parentOrder = '0';
+      getReportSAPList(this.queryParams).then(response => {
+        this.pOrderTableList = response;
+        this.openReportSAP = true;
+        this.titleReport = "SAP收货";
+      });
+
+
+      // let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+      //  let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+      // let requestBody = JSON.stringify(params)// 将参数对象转换为JSON字符串
+      // getCKList(requestBody).then(response => {
+      //   this.warehouseList = response;
+      // });
+      let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+      let params = { factoryCode: factoryCode }; // 构造一个包含工厂代码的对象
+      //let paramsJSON = JSON.stringify(params); // 将对象转换为JSON字符串
+      console.log(factoryCode)
+      getCKList(params).then(response => {
+        this.warehouseList = response.data
+      });
+
+    },
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
@@ -941,7 +1051,7 @@ export default {
 		},
 		/** 报工详情按钮操作 */
 		handleReportHz(row) {
- 
+
 			this.reset();
 			let sr = row;
 
@@ -950,7 +1060,7 @@ export default {
 			}else{
 				this.optType = ''
 			}
-     
+
 			this.queryParams.workorderCode = sr.workorderCode;
 			//查询母工单报工记录列表
 			this.queryParams.parentOrder = '0';
@@ -981,7 +1091,7 @@ export default {
 		},
 		submitReport() {
             this.reportRows = this.pReportRows.concat(this.sReportRows)
-           
+
 			if ( this.reportRows==0) {
 				this.$modal.msgError(`请选择数据`);
 				return false;
@@ -992,6 +1102,24 @@ export default {
 				this.getList();
 			});
 		},
+    submitReportSAP() {
+      this.reportRows = this.pReportRows.concat(this.sReportRows)
+      console.log(this.reportRows)
+      if ( this.reportRows==0) {
+        this.$modal.msgError(`请选择数据`);
+        return false;
+      }
+      this.reportRows.forEach(row => {
+        this.$set(row, 'whCode', this.selectedWarehouse);
+      });
+      console.log("仓库－－－"+this.selectedWarehouse)
+      const reportRowsJson = JSON.stringify(this.reportRows); // 将this.reportRows转换为JSON字符串
+      submitReportPSSAP(reportRowsJson).then(response => {
+        this.$modal.msgSuccess("操作成功");
+        this.openReport = false;
+        this.getList();
+      });
+    },
 		/** 报工损耗按钮操作 */
 		handleConsumeHz(row) {
 			this.reset();
@@ -1031,7 +1159,7 @@ export default {
 		},
 		submitConsume() {
             this.consumeRows = this.pConsumeRows.concat(this.sConsumeRows)
-           
+
 			if ( this.consumeRows==0) {
 				this.$modal.msgError(`请选择数据`);
 				return false;
@@ -1053,7 +1181,7 @@ export default {
 		  this.$refs.itemSelectUser.showFlag = true;
 		},
 		//人员选择确认
-		onSelectUser(obj) {			
+		onSelectUser(obj) {
            this.form.userName = obj.code;
 		   this.form.nickName = obj.name;
 		},
diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue
index dba26fb..00c7e02 100644
--- a/src/views/mes/unitprice/index.vue
+++ b/src/views/mes/unitprice/index.vue
@@ -106,9 +106,9 @@
 			<el-table-column label="物料描述" align="center" prop="productName" />
 			<el-table-column label="产线编码" align="center" prop="lineCode" />
 			<el-table-column label="产线名称" align="center" prop="lineName" />
-
 			<el-table-column label="子工序编码" align="center" prop="childprocessCode" />
 			<el-table-column label="子工序名称" align="center" prop="childprocessName" />
+      <el-table-column label="工序单价（元/pc）" align="center" prop="attr1" />
 
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
@@ -256,7 +256,7 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
@@ -340,7 +340,7 @@ export default {
         // 设置上传的请求头部
         headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/mes/unitprice/importData"
+        url: process.env.VUE_APP_BASE_API + "/mes/unitPrice/importData"
       },
 			// 查询参数
 			queryParams: {
@@ -543,7 +543,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "子工序导入";
+      this.upload.title = "导入";
       this.upload.open = true;
     },
 
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index b9f9b82..3487d87 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-		    <el-form-item label="任务编号" prop="checkNo">
+		    <el-form-item label="订单编码" prop="orderNo">
 				<el-input
-					v-model="queryParams.checkNo"
-					placeholder="请输入检验任务编号"
+					v-model="queryParams.orderNo"
+					placeholder="请输入物料编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="物料名称" prop="materialName">
+			<el-form-item label="物料编码" prop="materialCode">
 				<el-input
-					v-model="queryParams.materialName"
-					placeholder="请输入物料名称"
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料编码"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -72,6 +72,7 @@
 		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="任务日期" align="center" prop="createTimeStr" width="100"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@@ -101,7 +102,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-
+		
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -114,7 +115,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="1370px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button
+					<el-button 
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -124,8 +125,8 @@
 				</el-col>
 			</el-row>
 			<!-- 打印整个printFrom区域 -->
-			<div id="printFrom">
-				<el-form :ref="formRef" :model="form" :rules="validateRules">
+			<div id="printForm">
+				<el-form :ref="formRef" :model="form">
 					<!-- 表头-工单信息 -->
 					<el-row>
 						<el-col :offset="7" :span="10" class="center-text">
@@ -139,11 +140,11 @@
 					</el-row>
 					<!-- 导航栏 -->
 					<el-row class="my-print-nav">
-						<el-col :span="4">生成车间:{{printData.workCenter}}</el-col>
-						<el-col :span="4">生成线体:{{printData.workCenter}}</el-col>
-						<el-col :span="4">检查日期:{{printData.productDate}}</el-col>
-						<el-col :span="4">产品名称:{{printData.printDate}}</el-col>
-						<el-col :span="4">批次号:{{printData.printDate}}</el-col>
+						<el-col :span="3">生成车间:{{form.supplierName}}</el-col>
+						<el-col :span="3">生成线体:{{form.lineName}}</el-col>
+						<el-col :span="3">检查日期:{{form.checkTimeStart}}</el-col>
+						<el-col :span="4">产品名称:{{form.materialName}}</el-col>
+						<el-col :span="6">批次号:{{form.incomeBatchNo}}</el-col>
 						<el-col :span="4">生产类型:
 							<el-checkbox-group  v-model="checkList">
 								<el-checkbox label="正常"></el-checkbox>
@@ -157,7 +158,7 @@
 						v-if="refreshNewWorkerTable"
 						v-loading="newWorkerLoading"
 						class="my-print-table"
-						:data="printData.workTable"
+						:data="form.checkInfos"
 						border
 						style="width: 100%">
 						<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
@@ -188,11 +189,11 @@
 					<el-row class="my-print-foot">
 						<el-col :offset="1" :span="3">检查人:</el-col>
 						<el-col :offset="2" :span="3">品质主管:</el-col>
-
+	
 					</el-row>
 					</el-form>
 			</div>
-
+			
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel">取 消</el-button>
 			</div>
@@ -202,7 +203,7 @@
 		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button
+					<el-button 
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -213,12 +214,9 @@
 			</el-row>
 			<!-- 打印整个firstReportPrint区域 -->
 			<div id="firstReportPrint">
-				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+				<el-form ref="form" :model="form" label-width="100px">
 					<el-row>
-						<el-col :span="7">
-							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
-						</el-col>
-						<el-col :span="10" class="center-text">
+						<el-col :offset="7" :span="10" class="center-text">
 							<h1>中山榄菊日化实业有限公司</h1>
 						</el-col>
 					</el-row>
@@ -254,14 +252,14 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="16">
+						<el-col :span="16">	
 							<el-form-item label="首检原因" >
 								<el-input   disabled/>
 							</el-form-item>
 						</el-col>
-					</el-row>
+					</el-row>	
 					<el-row>
-						<el-col :span="24">
+						<el-col :span="24">	
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="55" align="center" />
@@ -280,7 +278,7 @@
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
-								</el-table-column>
+								</el-table-column>	
 							</el-table>
 						</el-col>
 					</el-row>
@@ -314,7 +312,7 @@
 					</el-row>
 				</el-form>
 			</div>
-
+			
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="handleDone">确 定</el-button>
 			</div>
@@ -323,7 +321,7 @@
 </template>
 
 <script>
-import { listProduce, getProduce, delProduce, addProduce, updateIncome} from "@/api/quality/produceReport";
+import { listProduce, getProduce, delProduce, addProduce, updateIncome,getProduceReportXJ} from "@/api/quality/produceReport";
 import { getCkeckProjectList} from "@/api/quality/incomeReport";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
@@ -352,7 +350,7 @@ export default {
 			checkList: [],
 			standardNo: null,
 			printData: {
-				printable: 'printFrom',
+				printable: 'printForm',
 				ignore: ['no-print'],
 				workCenter: "暂无数据",
 				SAPNo: null,
@@ -361,7 +359,12 @@ export default {
 				printDate: null,
 				factory: null,
 				productDate: null,
-				workTable: [],
+				supplierName:null,
+				lineName:null,
+				checkTimeStart:null,
+				materialName:null,
+				incomeBatchNo:null,
+				checkInfos:[]
 			},
 			printDialogVisible: false,
 			// 来料检验表格数据
@@ -433,7 +436,7 @@ export default {
 		getDate() {
 			let start = this.Fungetdate (0)
 			let end = this.Fungetdate (1)
-			this.queryParams.incomeTimeArray.push(start,end)
+			//this.queryParams.incomeTimeArray.push(start,end)
 			this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
@@ -496,7 +499,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-
+				
 			};
 			this.resetForm("form");
 		},
@@ -526,7 +529,7 @@ export default {
 		handleLook(row) {
 			this.reset();
 			const recordId = row.recordId || this.ids
-
+			
 			if(row.checkType =='checkTypeSC') {
 				getProduce(recordId).then(response => {
 					this.form = response.data;
@@ -539,22 +542,20 @@ export default {
 				this.queryParams.recordId = recordId;
 				this.getCheckedProjectList();
 			}else {
-				//巡检报告
-				this.form.printable = 'printForm'; //打印时需要
-				this.form.ignore = ['no-print'];//打印时需要
-				this.open = true;
-				this.title = "巡检检验报告";
+
 				const orderNo = row.orderNo;
-				getProduceXJ(orderNo).then(response => {
-					this.form = response.data;
-					//首检报告
-					this.form.printable = 'firstReportPrint'; //打印时需要
+				getProduceReportXJ(orderNo).then(response => {
+					this.form = response;
+					//巡检报告
+					this.form.printable = 'printForm'; //打印时需要
 					this.form.ignore = ['no-print'];//打印时需要
-					this.firstReportOpen = true;
-					this.title = "首检检验报告";
+					this.open = true;
+					this.title = "巡检检验报告";
+					this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
+					this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 				})
 			}
-
+			
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -604,9 +605,9 @@ export default {
 		},
 		// 打印预览-浏览器打印
 		handlePrint(params) {
-			console.log(this.form);
+
 			printJS({
-				printable: params.printable, // 'printFrom', // 标签元素id
+				printable: params.printable, // 标签元素id
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
@@ -629,16 +630,11 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {
+.center-text {  
   text-align: center;
 }
-.report-logo {
-	margin-top: 15px;
-	margin-left: 15px;
-    height: 38px;
-}
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/wms/factory/index.vue b/src/views/wms/factory/index.vue
index ae17367..510a5cf 100644
--- a/src/views/wms/factory/index.vue
+++ b/src/views/wms/factory/index.vue
@@ -67,6 +67,14 @@
 		>
 			<el-table-column label="组织名称" align="center" prop="factoryName" width="350"/>
 			<el-table-column label="组织编码" align="center" prop="factoryCode" />
+      <el-table-column prop="ftype" label="工厂建模类型" width="100" align="center">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.f_type"
+            :value="scope.row.ftype"
+          />
+        </template>
+      </el-table-column>
 			<el-table-column label="创建人" align="center" prop="createBy" />
       		<el-table-column label="创建时间" align="center" prop="createTime" />
       		<el-table-column prop="status" label="是否启用" align="center" >
@@ -103,30 +111,45 @@
 
 		<!-- 添加或修改工厂模型对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="父组织名" prop="parentId" style="width:430px">
+			<el-form ref="form" :model="form" :rules="rules" label-width="120px">
+				<el-form-item label="父组织名" prop="parentId" style="width:350px">
 					<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" />
 				</el-form-item>
-				<el-form-item label="组织名称" prop="factoryName" style="width:430px">
+				<el-form-item label="组织名称" prop="factoryName" style="width:350px">
 					<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
 				</el-form-item>
-				<el-form-item label="组织编码" prop="factoryCode" style="width:430px">
-        			<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
-   				</el-form-item>
-				<el-form-item label="负责人" prop="leader" style="width:430px">
+				<el-form-item label="组织编码" prop="factoryCode" style="width:350px">
+        	<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
+   			</el-form-item>
+        <el-form-item label="工厂建模分类" prop="ftype">
+          <el-select
+            v-model="form.ftype"
+            placeholder="请选择设备类型"
+            filterable
+            style="width: 230px"
+          >
+            <el-option
+              v-for="dict in dict.type.f_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+				<el-form-item label="负责人" prop="leader" style="width:350px">
 					<el-input v-model="form.leader" placeholder="请输入负责人" />
 				</el-form-item>
-				<el-form-item label="联系电话" prop="phone" style="width:430px">
+				<el-form-item label="联系电话" prop="phone" style="width:350px">
 					<el-input v-model="form.phone" placeholder="请输入联系电话" />
 				</el-form-item>
-				<el-form-item label="邮箱" prop="email" style="width:430px">
+				<el-form-item label="邮箱" prop="email" style="width:350px">
 					<el-input v-model="form.email" placeholder="请输入邮箱" />
 				</el-form-item>
 				<el-form-item label="是否启用" prop="status" >
-          			<el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
-            			<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          			</el-select>
-        		</el-form-item>
+          <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:230px">
+            <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+          </el-select>
+        </el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -143,6 +166,9 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
 	name: "Factory",
+  dicts: [
+    "f_type",
+  ],
 	components: {
 		Treeselect
 	},
@@ -185,7 +211,6 @@ export default {
 			// 表单参数
 			form: {},
 			// 表单校验
-						// 表单校验
       			rules: {
       			  factoryCode: [
             	  { required: true, message: "组织编码不能为空", trigger: "blur" }
diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue
index a2b240b..b75c629 100644
--- a/src/views/wms/put/index.vue
+++ b/src/views/wms/put/index.vue
@@ -264,9 +264,10 @@
 		<el-table v-loading="loading" :data="putList" @selection-change="handleSelectionChange" style="width: 100%">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="ID" align="center" prop="id" v-if="false"/>
-			<el-table-column label="报工单号" align="center" prop="workOrder" width="200px"/>
 <!--			<el-table-column label="工厂编码" align="center" prop="factoryCode" />-->
-			<el-table-column label="生产工单号" align="center" prop="productOrder" width="200px"/>
+      <el-table-column label="生产工单号" align="center" prop="productOrder" width="200px"/>
+			<el-table-column label="批次" align="center" prop="batchNumber" width="200px"/>
+      <el-table-column label="报工单号" align="center" prop="workOrder" width="200px"/>
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" v-if="false"/>
 			<el-table-column label="库位编码" align="center" prop="wlCode" v-if="false"/>
@@ -461,6 +462,7 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				workOrder: null,
+        batchNumber:null,
 				factoryCode: null,
 				productOrder: null,
 				whCode: null,
@@ -522,6 +524,7 @@ export default {
 			this.form = {
 				id: null,
 				workOrder: null,
+        batchNumber:null,
 				factoryCode: null,
 				productOrder: null,
 				whCode: null,