diff --git a/src/api/model/cm.js b/src/api/model/cm.js
index 04b1af07..4fabad08 100644
--- a/src/api/model/cm.js
+++ b/src/api/model/cm.js
@@ -86,5 +86,13 @@ export default {
 					`${config.API_URL}/cm/labeltemplate/${id}/`);
 			}
 		},
+		commands:{
+			name: "获取标签指令",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/cm/labeltemplate/commands/`,
+					data);
+			}
+		}
 	}
 }
diff --git a/src/views/sys/labeltemplate.vue b/src/views/sys/labeltemplate.vue
index af830ba8..8ed9a0b2 100644
--- a/src/views/sys/labeltemplate.vue
+++ b/src/views/sys/labeltemplate.vue
@@ -13,7 +13,7 @@
 			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="模板名称" prop="name" min-width="100"></el-table-column>
-				<el-table-column label="创建时间" prop="description" min-width="150"></el-table-column>
+				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
 						<el-button link size="small" @click="labelTemplateEdit(scope.row)" type="primary">编辑</el-button>
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index b6cb73ab..43c665dc 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -303,7 +303,6 @@ export default {
 			wprList:[],
 			tableData: [],
 			selection: [],
-			templateList:[],
 			stateOptions:[
 				{ value: 10, name: "合格"},
 				{ value: 20, name: "不合格"},
@@ -344,15 +343,8 @@ export default {
 		that.params.belong_dept =that.deptId;
 		that.$TOOL.data.set('bx_deptID',that.deptId);
 		that.apiObj = that.$API.wpm.wmaterial.list;
-		that.getPrintTemplate();
 	},
 	methods: {
-		getPrintTemplate(){
-			let that = this;
-			that.$API.cm.labeltemplate.list.req({process:that.process,page:0}).then((res) => {
-			    that.templateList = res;
-			})
-		},
 		handleWatch(row) {
 			let that = this;
 			that.$API.wpm.batchlog.dag.req({batch:row.batch}).then((res) => {
@@ -468,55 +460,61 @@ export default {
 		//打印物料标签
 		printMaterial(row,type){
 			let that = this;
-			let str =[]
-			if(that.templateList.length==1){
-				str = that.templateList[0].commands;
-			}else if(that.templateList.length>1){
-
-			}else{
-
-			}
 			if(that.printer_name!==''&&that.printer_name!==null&&that.printer_name!==undefined){
+				let params = {};
+				params.tid = row.id;
 				if(type=='wm'){
-					that.apiObjPrint.req({tid:row.id}).then((res) => {
-						let code = res.code_label;
-						let str = [
-							"SIZE 70 mm,100 mm",
-							"GAP 7 mm,7 mm",
-							"CLS",
-							"REFERENCE 0,0",
-							'QRCODE 30,400,H,5,A,0,"' +code +'"',
-							"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-							"WINTEXT 240,550,28,90,0,0,Simhei," +"批次号：" + res.batch,
-							"WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
-							"PRINT 1",
-						]; 
+					if(that.route_code=='paiyicibang'){
+						params.label_template_name = '排一次棒打印模板';
+					}else{
+						params.extra_data={count:row.count};
+						params.label_template_name = '其他工序打印模板';
+					}
+					that.apiObjPrint.req(params).then((res) => {
 						let obj = {};
-						obj.printer_commands = str;
+						obj.printer_commands = res.commands;
 						obj.printer_name = that.printer_name;
 						that.$API.wpm.prints.req(obj).then((response) => {
 							that.$message.success("打印成功");
 						});
 					})
-				}else{
-					let code = row.number;
-					let str = [
-						"SIZE 70 mm,100 mm",
-						"GAP 7 mm,7 mm",
-						"CLS",
-						"REFERENCE 0,0",
-						'QRCODE 30,400,H,5,A,0,"' +code +'"',
-						"WINTEXT 240,550,28,90,0,0,Simhei," + row.number,
-						"PRINT 1",
-					]; 
-					let obj = {};
-					obj.printer_commands = str;
-					obj.printer_name = that.printer_name;
-					that.$API.wpm.prints.req(obj).then((response) => {
-						that.$message.success("打印成功");
+				}else if(type=='wpr'){
+					let params = {};
+					let name = row.material_name.split('|')[0];
+					if(that.route_code=='paiban'){
+						params.label_template_name = '排扳单件打印模板';
+						let oinfo = [];
+						for(let key in row.oinfo){
+						    oinfo.push(row.oinfo[key])
+						}
+						let data = {sigao:'',duibian:'',istest:'否',number:row.number,name:name};
+						if(oinfo.length>0){
+							oinfo.forEach((item)=>{
+							    if(item.name=="丝高"){
+									data.sigao = item.val;
+								}else if(item.name=="对边"){
+									data.duibian = item.val;
+								}else{
+									data.istest = item.val?'是':'否';
+								}
+							})
+						}
+						params.data = data;
+					}else{
+						params.label_template_name = '单件打印模板';
+						params.data = {number:row.number,name:name};
+					}
+					that.$API.cm.labeltemplate.commands.req(params).then((res) => {
+						let obj = {};
+						obj.printer_commands = res.commands;
+						obj.printer_name = that.printer_name;
+						that.$API.wpm.prints.req(obj).then((response) => {
+							that.$message.success("打印成功");
+						});
 					});
 				}
 			}else{
+				that.$message.warning("请先设置打印机");
 			}
 		},
 		inmCheck(row){