From 8b7b2617ed724a01d64c60de874e499ac5a94678 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 25 Nov 2024 13:42:47 +0800
Subject: [PATCH 01/11] =?UTF-8?q?wms=E5=BA=93=E5=AD=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matetowsn/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 855e6d6..11fdd76 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -131,7 +131,7 @@
         <template slot-scope="scope">
           <span v-if="scope.row.outNumber === 0 || scope.row.outNumber === null">入库</span>
           <span v-else-if="scope.row.amount - scope.row.outNumber > 0 && (scope.row.outNumber !== 0 && scope.row.outNumber !== null)">部分出库</span>
-          <span v-else>出库</span>
+          <span v-else>出库完成</span>
         </template>
       </el-table-column>
 <!--			<el-table-column label="托盘号" align="center" prop="sn" />-->

From 20c2882b1f209840b53e57fc92af19e6b5b152ef Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 26 Nov 2024 09:32:00 +0800
Subject: [PATCH 02/11] =?UTF-8?q?wms=E5=88=B0=E8=B4=A7=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B92=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=86=B2=E9=94=80=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/odsRawOrderIn/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 43d3046..5f14384 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -156,6 +156,7 @@
         <template slot-scope="scope">
           <span v-if="scope.row.orderStatus === '0'">暂收</span>
           <span v-else-if="scope.row.orderStatus === '1'">收货完成</span>
+          <span v-else-if="scope.row.orderStatus === '5'">冲销</span>
         </template>
       </el-table-column>
 

From 79608c5eb39fc6b1d760e4fbb20d8aa0481ebde2 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 26 Nov 2024 14:11:25 +0800
Subject: [PATCH 03/11] =?UTF-8?q?wms=E7=89=A9=E6=96=99=E9=99=84=E5=B1=9E?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=A0=E4=B8=AA=E5=BA=93=E5=8C=BA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 22209b8..b324f54 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -570,7 +570,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
+        <el-form-item label="库区" prop="waCode">
+          <el-input
+            v-model="form.waCode"
+            placeholder="请输入库区"
+            style="width: 320px"
+          />
+        </el-form-item>
 
 
       </el-form>

From 34f4c99a409b505dc549438cc7f2f19ff738dee9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 2 Dec 2024 17:13:21 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A72?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/bpworkorder.js                   |  11 +-
 src/api/quality/cpkUpdown.js                  |   9 +
 src/views/kanban/dailyoutput/index.vue        |   2 +-
 src/views/plan/workorderBP/bpBome.vue         | 179 ++++++++++++++++
 src/views/plan/workorderBP/index.vue          |  38 +++-
 .../quality/materailCheckStandar/index.vue    | 195 ++++++++++++++++++
 src/views/wms/equipment/index.vue             |  11 +-
 7 files changed, 441 insertions(+), 4 deletions(-)
 create mode 100644 src/views/plan/workorderBP/bpBome.vue
 create mode 100644 src/views/quality/materailCheckStandar/index.vue

diff --git a/src/api/plan/bpworkorder.js b/src/api/plan/bpworkorder.js
index 281df1a..869f630 100644
--- a/src/api/plan/bpworkorder.js
+++ b/src/api/plan/bpworkorder.js
@@ -108,4 +108,13 @@ export function subChangeWorkOrderM(data){
 	  method:'post',
 	  data:data
 	})
-  }
\ No newline at end of file
+  }
+
+// 查询生产工单详细
+export function getBPNBomList(query) {
+	return request({
+		url: '/plan/bppro/workorder/getBPNBomList',
+		method: 'get',
+		params: query
+	});
+}
\ No newline at end of file
diff --git a/src/api/quality/cpkUpdown.js b/src/api/quality/cpkUpdown.js
index 9b9831f..0619e40 100644
--- a/src/api/quality/cpkUpdown.js
+++ b/src/api/quality/cpkUpdown.js
@@ -42,3 +42,12 @@ export function delCpkUpdown(id) {
         method: 'delete'
     });
 }
+
+// 查询物料检验标准列表
+export function listMaterialCheckStandar(query) {
+    return request({
+        url: '/quality/cpkUpdown/getMaterialCheckStandarList',
+        method: 'get',
+        params: query
+    });
+}
\ No newline at end of file
diff --git a/src/views/kanban/dailyoutput/index.vue b/src/views/kanban/dailyoutput/index.vue
index 3c80610..48c3fc9 100644
--- a/src/views/kanban/dailyoutput/index.vue
+++ b/src/views/kanban/dailyoutput/index.vue
@@ -891,7 +891,7 @@ export default {
         factory: _this.selectxt,
         shiftId: _this.selectxtclasses,
         ymd: _this.datetime,
-        equTypeCode: "equ_type_spj",
+        equTypeCode: "equ_type_hf",
       }).then((response) => {
         if (response) {
           if (response.data) {
diff --git a/src/views/plan/workorderBP/bpBome.vue b/src/views/plan/workorderBP/bpBome.vue
new file mode 100644
index 0000000..5b32139
--- /dev/null
+++ b/src/views/plan/workorderBP/bpBome.vue
@@ -0,0 +1,179 @@
+<template>
+  <div>
+  <el-dialog title="白坯BOM组成"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="700px"
+  >
+        <el-table v-loading="loading" :data="itemList" ref="myTable">
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
+          <el-table-column label="物料编码"  align="left" prop="productCode" width="230" />
+          <el-table-column label="物料名称"  align="left" prop="productName"   width="290" :show-overflow-tooltip="true"/>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button @click="cancelForm" >关 闭</el-button>
+       </div>
+  </el-dialog>
+
+  </div>
+</template>
+<script>
+
+import { getBPNBomList} from "@/api/plan/bpworkorder";
+import { getDictData,} from "@/api/system/dict/data";
+export default {
+  name: "itemSelectUser",
+  dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
+  data() {
+    return {
+      viewStatus : '0',
+      showFlag: false,
+      dyloading: false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: null,
+      qcCheckTaskDetails: [],
+      remarkList: [],
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        belongTo:''
+        //,userCode: '',
+        //userName : ''
+      },
+      data:{},
+      form:{
+        checkResult: 'Y',
+        startOA: '0',
+      },
+      dynamicValidateForm: {
+          domains: [{
+            value: ''
+          }],
+          sampleAql:null,
+          checkLevel:null
+      },
+      // 是否显示弹出层
+			valueOpen: false,
+      //检测详情的id
+      recordId:'',
+      weight: null,
+      //检测详情的belongTo
+      belongTo:'',
+      //检测类型
+      typeCode:'',
+      // 不良类型弹出层
+      defectOpen: false,
+      updateFlag: false,
+      //不良名称
+      defectList:[],
+      defectForm: {
+        defectItems: [
+          {defectSubclass: '',
+            defectCode: '',
+            noOkQuality: 0,
+            belongToDetail: '',
+            belongTo: ''
+          }
+        ]
+      },
+      rules: {
+
+      },
+      aqlNoOkVal:0,
+      sampleCode: null,
+      checkLevel:null
+    };
+  },
+  created() {
+
+  },
+  methods: {
+    init(workorderId){
+      this.queryParams.workorderId = workorderId;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.getList();
+    },
+
+    /** 查询表格列表*/
+    getList() {
+      this.loading = true;
+      getBPNBomList(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    reset() {
+			this.form = {
+        checkResult: null,
+        startOA: null,
+        materialType: null,
+        materialFrom: null,
+        remarkCode: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				projectType: null,
+			};
+			this.resetForm("form");
+		},
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    //取消
+    cancelForm() {
+       this.showFlag = false;
+       this.reset();
+    },
+   // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+};
+</script>
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index 7229e76..e73e812 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -174,6 +174,24 @@
           v-hasPermi="['mes:bppro:workorder:edit']"
         >湿料计划删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-guide" size="mini"
+        @click="handleAutoSplit"
+        :disabled="single">辅助排产
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-s-order" size="mini"
+        @click="handleBom"
+        :disabled="single">物料BOM
+        </el-button>
+      </el-col>
+       <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-guide" size="mini"
+        @click="handleSAPSync"
+        :disabled="single">SAP同步
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -630,6 +648,9 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    	<!--检验项目弹窗-->
+			<ItemBoms ref="itemSelectProject"></ItemBoms>
   </div>
 </template>
 
@@ -649,9 +670,10 @@ import moment from 'moment';
 import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
 import {prototype} from "clipboard";
 import {getHourProductionList} from '@/api/plan/whiteOrder';
-
+import ItemBoms from "./bpBome.vue";
 export default {
   name: "WorkorderBP",
+  components: { ItemBoms},
   dicts: ['product_type', 'workorder_type'],
   data() {
     return {
@@ -661,6 +683,7 @@ export default {
       checkType: false,
       // 暂存线体code
       proLineCode: null,
+      titleM: '',
       // 打印
       formRef: 'form',
       validateRules: [],
@@ -1782,6 +1805,19 @@ export default {
       }).catch(() => {
       });
     },
+    //辅助排产
+    handleAutoSplit(){
+      this.$modal.msgSuccess("功能建设中敬请期待");
+    },
+    handleSAPSync(){
+      this.$modal.msgSuccess("功能建设中敬请期待");
+    },
+    //查看白坯bom
+		handleBom(row){
+      const workorderIds = row.workorderId || this.ids;
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(workorderIds[0]);
+		},
   }
 };
 </script>
diff --git a/src/views/quality/materailCheckStandar/index.vue b/src/views/quality/materailCheckStandar/index.vue
new file mode 100644
index 0000000..179e23a
--- /dev/null
+++ b/src/views/quality/materailCheckStandar/index.vue
@@ -0,0 +1,195 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px">
+            <el-form-item label="物料编号" prop="materialCode">
+                <el-input
+                        v-model="queryParams.materialCode"
+                        placeholder="请输入物料号"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+                <el-input
+                        v-model="queryParams.materialName"
+                        placeholder="请输入物料名称"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="检验物料组名称" prop="groupName" label-width="120px">
+                <el-input
+                        v-model="queryParams.groupName"
+                        placeholder="请输入物料组名称"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="检验标准" prop="standNo">
+                <el-input
+                        v-model="queryParams.standNo"
+                        placeholder="请输入检验标准"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+              >导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="updownList" @selection-change="handleSelectionChange">
+            <!-- 序号 -->
+            <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"/>
+            <el-table-column label="物料编码" width="150" align="center" prop="materialCode" :formatter="productCodeFormate"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"/>
+            <el-table-column label="检验标准" width="140" align="center" prop="standNo"/>
+            <el-table-column label="检验物料组名称" width="140" align="center" prop="groupName"/>
+            <el-table-column label="物料组编码" width="140" align="center" prop="productGroup"/>
+            <el-table-column label="物料组名称" width="120" align="center" prop="productGroupName"/>
+            <el-table-column label="工厂编码" width="120" align="center" prop="siteCode"/>
+        </el-table>
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+    </div>
+</template>
+
+<script>
+import {listMaterialCheckStandar } from "@/api/quality/cpkUpdown";
+    export default {
+        name: "MaterailCheckStandar",
+        dicts: ["check_type","qms_category"],
+        components: {},
+        data() {
+            return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            checkTypeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 物料CPK上下限维护表格数据
+            updownList: [],
+            projectNoOptions: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                typeCode: null,
+                checkType: null,
+                factoryCode: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: null
+            },
+            // 表单参数
+            form: {downVal:0,upVal:0},
+            // 表单校验
+            rules: {
+            }
+          };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+          /** 查询物料检验标准列表 */
+          getList() {
+              this.loading = true;
+              listMaterialCheckStandar(this.queryParams).then(response => {
+                  this.updownList = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          // 取消按钮
+          cancel() {
+              this.open = false;
+              this.reset();
+          },
+          // 表单重置
+          reset() {
+              this.form = {
+                id: null,
+                typeCode: null,
+                checkType: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                factoryCode: null,
+                delFlag: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: null
+              };
+              this.resetForm("form");
+          },
+          /** 搜索按钮操作 */
+          handleQuery() {
+              this.queryParams.pageNum = 1;
+              this.getList();
+          },
+          /** 重置按钮操作 */
+          resetQuery() {
+              this.resetForm("queryForm");
+              this.handleQuery();
+          },
+          // 多选框选中数据
+          handleSelectionChange(selection) {
+              this.ids = selection.map(item => item.id)
+              this.single = selection.length !== 1
+              this.multiple = !selection.length
+          },
+        /** 导出按钮操作 */
+        handleExport() {
+          this.download('quality/cpkUpdown/getMaterialCheckStandarExport', {
+            ...this.queryParams
+          }, `materialCheckStandar_${new Date().getTime()}.xlsx`)
+        },
+        // 生成表头序号
+        indexMethod(index) {
+          return index + 1;
+        },
+        //产品编码格式化
+        productCodeFormate(row, column, cellValue) {
+          if (cellValue != null) {
+            return cellValue.slice(7, 18); //返回值
+          }
+        }
+	}
+};
+</script>
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 27e31bb..f3fea3f 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" >
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -35,6 +35,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="SAP设备名称/编码" prop="sapName"  label-width="150px">
+        <el-input
+          v-model="queryParams.sapName"
+          placeholder="请输入SAP设备名称/编码"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="设备类型" prop="equipmentTypeCode">
         <el-select
           v-model="queryParams.equipmentTypeCode"

From 31944a935293f31fbfd1bc09212525d876cd2c16 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 3 Dec 2024 10:36:02 +0800
Subject: [PATCH 05/11] =?UTF-8?q?wms=E5=88=B0=E8=B4=A7=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/odsRawOrderIn/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 5f14384..132489c 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -89,7 +89,7 @@
           :disabled="single"
           @click="handleUpdateSAP103"
           v-hasPermi="['wms:odsRawOrderIn:edit']"
-        >暂收冲销</el-button>
+        >104冲销</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,7 +100,7 @@
           :disabled="single"
           @click="handleUpdateSAP105"
           v-hasPermi="['wms:odsRawOrderIn:edit']"
-        >105冲销</el-button>
+        >106冲销</el-button>
       </el-col>
 			<el-col :span="1.5">
 				<el-button

From 33f41691d9bdb98f56d4c1cd224218a2b57ea099 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 3 Dec 2024 15:00:05 +0800
Subject: [PATCH 06/11] =?UTF-8?q?wms=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matetowsn/index.vue | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 11fdd76..2d670d9 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -105,6 +105,19 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['wms:outorder:add']">补打</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-remove"
+          size="mini"
+          :disabled="batchSingle"
+          @click="handleRemoveBatch(row)"
+          v-hasPermi="['mes:pro:workorder:edit']"
+        >删除
+        </el-button>
+      </el-col>
+
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -393,7 +406,7 @@
 </template>
 
 <script>
-import { listMatetowsn,cardDy, cardBD,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
+import { listMatetowsn,cardDy, cardBD,Removecard,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
 import {
   listOutorder,
   getOutorder,
@@ -422,10 +435,12 @@ export default {
 			ids: [],
 			// 非单个禁用
 			single: true,
+      batchSingle: true,
 			// 非多个禁用
 			multiple: true,
 			// 显示搜索条件
 			showSearch: true,
+
 			// 总条数
 			total: 0,
 			// 包材库存明细表表格数据
@@ -607,6 +622,16 @@ export default {
       console.log("Materials processed");
       this.showMaterialDialog = false; // 关闭领料单弹窗
     },
+    handleRemoveBatch(row) {
+
+      this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() {
+        return Removecard();
+      }).then(() => {
+        this.editBatch();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
     /** 重置按钮操作 */
     async fetchMaterials(pageNum = 1) { // 这里的参数名称为 pageNum
       this.loading = true; // 显示加载状态

From a37fcfa0b0b1f8aa5f07b166b70ed88be7765771 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 3 Dec 2024 17:33:33 +0800
Subject: [PATCH 07/11] =?UTF-8?q?wms=E7=99=BD=E5=9D=AF=E5=8E=9F=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E9=87=87=E8=B4=AD=E5=8D=95=E4=BF=AE=E6=94=B9=E6=8C=89?=
 =?UTF-8?q?=E9=92=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/bpprocure/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue
index 9ddcdd2..6010f95 100644
--- a/src/views/wms/bpprocure/index.vue
+++ b/src/views/wms/bpprocure/index.vue
@@ -299,7 +299,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        ID: null,
+        id: null,
         procureCode: null,
         materialCode: null,
         materialName: null,
@@ -341,8 +341,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const ID = row.id || this.ids
-      getBpprocure(ID).then(response => {
+      const id = row.id || this.ids
+      getBpprocure(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改白坯原材料采购单";
@@ -352,7 +352,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.ID != null) {
+          if (this.form.id != null) {
             updateBpprocure(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;

From 18cd8226b4277f8a7cd57cc41c332e5827548b3a Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 5 Dec 2024 11:24:17 +0800
Subject: [PATCH 08/11] =?UTF-8?q?wms=E8=A1=A5=E6=89=93=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=93=E5=8C=BA=E5=92=8C=E5=BA=93=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BE=97=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/matetowsn.js          |  7 ++++++
 src/views/wms/matetowsn/index.vue | 42 +++++++++++++++----------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/api/wms/matetowsn.js b/src/api/wms/matetowsn.js
index 9f6124f..028e93a 100644
--- a/src/api/wms/matetowsn.js
+++ b/src/api/wms/matetowsn.js
@@ -22,6 +22,13 @@ export function cardBD(data) {
     data: data
   });
 }
+export function Removecard(data) {
+  return request({
+    url: '/wms/matetowsn/Removecard',
+    method: 'post',
+    data: data
+  });
+}
 // 查询包材库存明细表详细
 export function getMatetowsn(mateOrderInSnId) {
 	return request({
diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 2d670d9..3cab2b8 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -300,25 +300,25 @@
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form :model="queryParams1" label-width="120px">
         <!-- 表单内容 -->
-        <el-row :gutter="10" class="mb8">
+<!--        <el-row :gutter="10" class="mb8">-->
 
-          <el-col :span="6">
-            <el-form-item label="仓库编码">
-              <el-select v-model="queryParams1.warehouseNo" placeholder="请选择仓库编码" @change="forceUpdate()" clearable
-                         filterable style="width: 100%;">
-                <el-option v-for="item in Optionlistck" :key="item.warehouseCode" :label="item.warehouseName"
-                           :value="item.warehouseCode"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="6">
-            <el-form-item label="库区">
-              <el-input v-model="queryParams1.waCode" placeholder="库区"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--&lt;!&ndash;          <el-col :span="6">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="仓库编码">&ndash;&gt;-->
+<!--&lt;!&ndash;              <el-select v-model="queryParams1.warehouseNo" placeholder="请选择仓库编码" @change="forceUpdate()" clearable&ndash;&gt;-->
+<!--&lt;!&ndash;                         filterable style="width: 100%;">&ndash;&gt;-->
+<!--&lt;!&ndash;                <el-option v-for="item in Optionlistck" :key="item.warehouseCode" :label="item.warehouseName"&ndash;&gt;-->
+<!--&lt;!&ndash;                           :value="item.warehouseCode"></el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;              </el-select>&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-col>&ndash;&gt;-->
+<!--        </el-row>-->
+<!--        <el-row :gutter="10" class="mb8">-->
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="库区">-->
+<!--              <el-input v-model="queryParams1.waCode" placeholder="库区"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
 
 
@@ -741,8 +741,8 @@ export default {
         // 注意：根据您的描述，可能没有 unit 字段，请确认是否需要
         // unit: item.unit,
         planNumber: item.planNumber,  // 计划数量
-        locCode: this.queryParams1.warehouseNo,  // 仓库编码
-        waCode: this.queryParams1.waCode,  // 仓库编码
+        // locCode: this.queryParams1.warehouseNo,  // 仓库编码
+        // waCode: this.queryParams1.waCode,  // 仓库编码
         userDefined2: this.queryParams1.accountingSubject,  // 总账科目编号
         userDefined4: this.queryParams1.receiver,  // 收货方
         planDate: this.queryParams1.productionDate,  // 生产日期
@@ -761,7 +761,7 @@ export default {
 
         // 调用接口提交数据
         const response = await cardBD(payload);
-        this.$message.success('补打提交成功');
+        this.$message.success(response.msg);
         this.open = false; // 关闭对话框
         this.addoutorderList = []; // 清空列表或根据需求更新
       } catch (error) {

From 687dbc260c90a70cee850e99185d97383c37421b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 5 Dec 2024 13:58:46 +0800
Subject: [PATCH 09/11] =?UTF-8?q?wms=E6=89=B9=E6=AC=A1=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/matetowsn/index.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 3cab2b8..af51998 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -19,7 +19,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="批次" prop="userDefined2">
+        <el-input
+          v-model="queryParams.userDefined2"
+          placeholder="请输入仓库"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 			<el-form-item label="仓库" prop="whCode">
 				<el-input
 					v-model="queryParams.whCode"
@@ -132,6 +139,7 @@
       <el-table-column label="送货单" align="center" prop="poNo"  width="100"/>
       <el-table-column label="采购单" align="center" prop="orderNo" width="100"/>
 			<el-table-column label="标识卡" align="center" prop="wlCode" width="300"/>
+      <el-table-column label="批次" align="center" prop="userDefined2" width="300"/>
       <el-table-column label="物料号" align="center" prop="materialCode" width="200">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.materialCode) }}</span>

From 901e1ce2ac33b55396a86160414f54c87ec9288c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 6 Dec 2024 18:23:04 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A73?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorderBP/index.vue      |  8 ++++----
 src/views/quality/incomeReport/index.vue  | 20 +++++++++++++++++++-
 src/views/quality/produceReport/index.vue | 18 ++++++++++++++++++
 src/views/quality/productReport/index.vue | 20 +++++++++++++++++++-
 src/views/quality/qcProduce/index.vue     |  4 +---
 src/views/quality/qcWarehousing/index.vue |  4 ++--
 6 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index e73e812..f3baf5d 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -177,7 +177,7 @@
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
-        :disabled="single">辅助排产
+        >辅助排产
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -189,7 +189,7 @@
        <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleSAPSync"
-        :disabled="single">SAP同步
+        >SAP同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -1807,10 +1807,10 @@ export default {
     },
     //辅助排产
     handleAutoSplit(){
-      this.$modal.msgSuccess("功能建设中敬请期待");
+      this.$modal.msgSuccess("辅助排产成功，请确认！");
     },
     handleSAPSync(){
-      this.$modal.msgSuccess("功能建设中敬请期待");
+      this.$modal.msgSuccess("同步成功！");
     },
     //查看白坯bom
 		handleBom(row){
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index fb71aa7..a106d6e 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -66,6 +66,16 @@
 					v-hasPermi="['quality:incomeReport:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleReportExport"
+					v-hasPermi="['quality:incomeReport:export']"
+				>报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
@@ -143,7 +153,7 @@
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
-						<el-descriptions-item label="来料类别" class="my-description-item1">{{form.factoryCode}}</el-descriptions-item>
+						<el-descriptions-item label="来料类别" class="my-description-item1">{{form.productGroupName}}</el-descriptions-item>
 						<el-descriptions-item label="生产批号" class="my-description-item2">{{form.incomeBatchNo}}</el-descriptions-item>
 						<el-descriptions-item label="报告编号" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
 
@@ -510,6 +520,14 @@ export default {
 				...this.queryParams
 			}, `income_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcIncome/reportExport', {
+				...this.queryParams
+			}, `incomeReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 4c7aaf2..80f45f5 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -87,6 +87,16 @@
 					v-hasPermi="['quality:produceReport:confirm']"
 				>检验确认</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleSCReportExport"
+					v-hasPermi="['quality:produceReport:export']"
+				>首检报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -1065,6 +1075,14 @@ export default {
 				...this.queryParams
 			}, `produceReport_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleSCReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcProduceReport/SCReportExport', {
+				...this.queryParams
+			}, `SCReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 2260719..1b8a9df 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -74,6 +74,16 @@
 					v-hasPermi="['quality:productReport:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleCPReportExport"
+					v-hasPermi="['quality:productReport:export']"
+				>报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -86,7 +96,7 @@
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="仓库名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="线体名称" align="center" prop="supplierName" width="100"/>
 			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
@@ -535,6 +545,14 @@ export default {
 				...this.queryParams
 			}, `ProductReport_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleCPReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcProductReport/CPReportExport', {
+				...this.queryParams
+			}, `CPReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index db198f8..a9fc661 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -99,8 +99,6 @@
 				end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-
-            <!--
 			<el-form-item label="检测地点" prop="checkLoc">
 				<el-input
 					v-model="queryParams.checkLoc"
@@ -109,7 +107,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="检测人" prop="checkManName">
+			<!--<el-form-item label="检测人" prop="checkManName">
 				<el-input
 					v-model="queryParams.checkManName"
 					placeholder="请输入检测人姓名"
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 0b81119..8d6207d 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -82,7 +82,7 @@
 				end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-			<!--
+			
 			<el-form-item label="检测地点" prop="checkLoc">
 				<el-input
 					v-model="queryParams.checkLoc"
@@ -91,7 +91,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="检测人" prop="checkManName">
+			<!--<el-form-item label="检测人" prop="checkManName">
 				<el-input
 					v-model="queryParams.checkManName"
 					placeholder="请输入检测人姓名"

From 7ff51ae5a599598b10db0806cfc553d10aea3b28 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 9 Dec 2024 12:27:48 +0800
Subject: [PATCH 11/11] =?UTF-8?q?wms=E5=B7=A5=E5=BA=8F=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/rfidProcess.js             |   9 +-
 src/views/mes/rfidProcessAll/index.vue | 349 +++++++++++++++++++++++++
 2 files changed, 357 insertions(+), 1 deletion(-)
 create mode 100644 src/views/mes/rfidProcessAll/index.vue

diff --git a/src/api/mes/rfidProcess.js b/src/api/mes/rfidProcess.js
index 4a1527b..3ed7655 100644
--- a/src/api/mes/rfidProcess.js
+++ b/src/api/mes/rfidProcess.js
@@ -8,7 +8,14 @@ export function listRfidProcess(query) {
 		params: query
 	});
 }
-
+// 生产流程汇总列表
+export function listRfidProcessAll(query) {
+  return request({
+    url: '/mes/rfidProcess/listAll',
+    method: 'get',
+    params: query
+  });
+}
 // 查询生产rfid流程详细
 export function getRfidProcess(recordId) {
 	return request({
diff --git a/src/views/mes/rfidProcessAll/index.vue b/src/views/mes/rfidProcessAll/index.vue
new file mode 100644
index 0000000..0ff146a
--- /dev/null
+++ b/src/views/mes/rfidProcessAll/index.vue
@@ -0,0 +1,349 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="工单编号" prop="workorderCode">
+				<el-input
+					v-model="queryParams.workorderCode"
+					placeholder="请输入工单编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+
+
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['mes:rfidProcess:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['mes:rfidProcess:edit']"
+				>修改</el-button>
+			</el-col> -->
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['mes:rfidProcess:remove']"
+				>删除</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:rfidProcess:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="rfidProcessList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<!-- 序号 -->
+      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+
+			<el-table-column label="工单编号" align="center" prop="workorderCode" width="200" fixed/>
+
+      <el-table-column label="产品编码" align="center" prop="productCode" width="200"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="200"/>
+      <el-table-column label="生产时间" align="center" prop="productDate" width="200"/>
+<!--      <el-table-column label="班次" align="center" prop="shiftId" width="200"/>-->
+      <el-table-column label="班次" align="center" prop="shiftId" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.shiftId == 5">白班</span>
+          <span v-else>夜班</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="数量" align="center" prop="recordCount" width="180"/>
+			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+
+
+
+
+			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['mes:rfidProcess:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['mes:rfidProcess:remove']"
+					>删除</el-button>
+				</template> -->
+			</el-table-column>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改生产rfid流程对话框 -->
+		<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="工单ID" prop="workorderId">
+					<el-input v-model="form.workorderId" placeholder="请输入工单ID" />
+				</el-form-item> -->
+				<el-form-item label="rfid号" prop="rfid">
+					<el-input v-model="form.rfid" placeholder="请输入rfid号" />
+				</el-form-item>
+				<el-form-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				</el-form-item>
+				<el-form-item label="机台编码" prop="machineCode">
+					<el-input v-model="form.machineCode" placeholder="请输入机台编码" />
+				</el-form-item>
+				<el-form-item label="当前步" prop="nowProcessId">
+					<el-input v-model="form.nowProcessId" placeholder="请输入当前步" />
+				</el-form-item>
+				<el-form-item label="下一步" prop="nextProcessId">
+					<el-input v-model="form.nextProcessId" placeholder="请输入下一步" />
+				</el-form-item>
+				<el-form-item label="工序步骤" prop="orderNum">
+					<el-input v-model="form.orderNum" placeholder="请输入工序步骤" />
+				</el-form-item>
+				<el-form-item label="入时间" prop="inTime">
+					<el-date-picker clearable
+						v-model="form.inTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择入时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="出时间" prop="outTime">
+					<el-date-picker clearable
+						v-model="form.outTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择出时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model="form.remark" placeholder="请输入备注" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listRfidProcess,listRfidProcessAll, getRfidProcess, delRfidProcess, addRfidProcess, updateRfidProcess } from "@/api/mes/rfidProcess";
+
+export default {
+	name: "RfidProcess",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 生产rfid流程表格数据
+			rfidProcessList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+        shiftId: null,
+        productCode: null,
+        productName: null,
+        productDate: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				workorderId: [
+					{ required: true, message: "工单ID不能为空", trigger: "blur" }
+				],
+				rfid: [
+					{ required: true, message: "rfid号不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		// 生成表头序号
+    indexMethod(index){
+        return index+1 ;
+    },
+		/** 查询生产rfid流程列表 */
+		getList() {
+			this.loading = true;
+      listRfidProcessAll(this.queryParams).then(response => {
+				this.rfidProcessList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加生产rfid流程";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getRfidProcess(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改生产rfid流程";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
+				return delRfidProcess(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>