diff --git a/src/views/modules/production/PartProperties.vue b/src/views/modules/production/PartProperties.vue
new file mode 100644
index 0000000..aa9b061
--- /dev/null
+++ b/src/views/modules/production/PartProperties.vue
@@ -0,0 +1,202 @@
+<template>
+  <div>
+    <el-dialog v-drag
+      :title="'物料属性'"
+      :close-on-click-modal="false"
+      width="600px"
+      @close="closeDialog()"
+      :visible.sync="visible">
+      <el-form :model="dataForm" :inline="true" label-position="top" ref="dataForm"
+               label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="物料编码" prop="taskHeader">
+              <el-input style="width: 120px" v-model="dataForm.partNo"></el-input>
+            </el-form-item>
+            <el-form-item label="物料描述" prop="taskHeader">
+              <el-input style="width: 300px" v-model="dataForm.partDesc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" style="margin-top: 30px">
+            <el-table
+              :data="dataList"
+              border
+              :height="height"
+              highlight-current-row
+              style="width: 100%;">
+              <el-table-column
+                v-for="(item,index) in columnList" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="'center'"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                show-overflow-tooltip
+                :fixed="item.fixed==''?false:item.fixed"
+                :min-width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
+
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="visible = false">关闭</el-button>
+    </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+  import {chatHistoryList,info} from '@/api/taskmanage/chatHistory.js'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        height: 300,
+        // 展示列集
+        columnList: [
+          {
+            columnProp: "itemNo",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 40,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: null
+          },
+          {
+            columnProp: "itemDesc",
+            columnLabel: "属性描述",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: null
+          },
+          {
+            columnProp: "content",
+            columnLabel: "文本属性值",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: null
+          },
+          {
+            columnProp: "content",
+            columnLabel: "数字属性值",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 50,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          },
+          {
+            columnProp: "content",
+            columnLabel: "属性值类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 40,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: null
+          },
+          {
+            columnProp: "content",
+            columnLabel: "属性编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 40,
+            format: null,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: null
+          },
+        ],
+
+        dataList: [],
+        dataListSelections: [],
+        dataForm: {
+          site:'',
+          partNo:'',
+          partDesc:'',
+        },
+      }
+    },
+    components: {
+
+    },
+    methods: {
+      init(row) {
+        this.dataForm.site=row.site;
+        this.dataForm.partNo = row.partNo;
+        this.dataForm.partDesc = row.partDesc;
+        this.visible = true
+        this.getDataList()
+      },
+      getDataList() {
+        chatHistoryList(this.dataForm).then(({data}) => {
+          if (data && data.code == 0) {
+            this.dataList = data.data
+          } else {
+            this.dataList = []
+          }
+        })
+
+      },
+
+      closeDialog() {
+        //Object.assign(this.$data, this.$options.data())
+      }
+    },
+    created() {
+
+    }
+  }
+</script>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index f0389e2..7092362 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -413,7 +413,7 @@
 <!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.preparationTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
         <el-form-item label="制造时间">
-          <el-input type="number" style="width: 178px;"  v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
+          <el-input type="number" style="width: 178px;" disabled  v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
 <!--          <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.manufacturingTime" size="medium" :min="0" :controls="false"></el-input-number>-->
         </el-form-item>
         <el-form-item label="清理时间" label-width="0px">
diff --git a/src/views/modules/production/print_part_label.js b/src/views/modules/production/print_part_label.js
index 8455087..5effe64 100644
--- a/src/views/modules/production/print_part_label.js
+++ b/src/views/modules/production/print_part_label.js
@@ -130,8 +130,8 @@ export function printPartLabel(printList) {
     }
     LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
     // LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
-    LODOP.PRINT();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
     console.log("操作成功！")
   }
 }
diff --git a/src/views/modules/production/print_seqNo_label.js b/src/views/modules/production/print_seqNo_label.js
index d383415..50cedb8 100644
--- a/src/views/modules/production/print_seqNo_label.js
+++ b/src/views/modules/production/print_seqNo_label.js
@@ -46,7 +46,7 @@ export function printSeqNoLabel(printList) {
       LODOP.ADD_PRINT_TEXT(66,8,96,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired+' | '+printData.weight+'公斤');
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired+printData.umid+' | '+printData.weight+'公斤');
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:");
@@ -68,11 +68,13 @@ export function printSeqNoLabel(printList) {
       LODOP.ADD_PRINT_TEXT(194,266,110,25,"工厂编码:"+printData.site);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-
+      LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
-    LODOP.PRINT();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
     console.log("操作成功！")
   }
 }
diff --git a/src/views/modules/production/print_stock_label.js b/src/views/modules/production/print_stock_label.js
index c945a3a..cba3aab 100644
--- a/src/views/modules/production/print_stock_label.js
+++ b/src/views/modules/production/print_stock_label.js
@@ -16,7 +16,7 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(90,8,133,25,"WareHouse ID:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.wareHouseId);
+      LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.wareHouseDesc);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(143,8,103,24,"Batch No:");
@@ -46,7 +46,7 @@ export function printMaterialLabel(printList) {
       LODOP.ADD_PRINT_TEXT(66,8,81,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qty);
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qty+printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,113,25,"Trans Date:");
diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js
index 79a92cf..ff66cc8 100644
--- a/src/views/modules/production/print_transNo_label.js
+++ b/src/views/modules/production/print_transNo_label.js
@@ -46,7 +46,7 @@ export function printTransNoLabel(printList) {
       LODOP.ADD_PRINT_TEXT(66,8,121,25,"Trans Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.transQty);
+      LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.transQty+printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(194,8,97,25,"Trans Date:");
@@ -70,7 +70,7 @@ export function printTransNoLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
     // LODOP.PRINT_DESIGN();
-    //LODOP.PREVIEW();
+    // LODOP.PREVIEW();
     LODOP.PRINT();
     console.log("操作成功！")
   }
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 9af5796..0d73f71 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -105,7 +105,7 @@
         label="操作">
         <template slot-scope="scope" class="foo_container">
           <a type="text" size="small" @click="toPrint(scope.row)">打印</a>
-          <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
+          <a v-if="scope.row.circulationSeqNo==null" type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
           <a type="text" size="small" @click="printPartCard(scope.row)">物料标识卡</a>
         </template>
       </el-table-column>
@@ -476,10 +476,6 @@
       },
       toPrint(row){
         let array=[];
-        let data={
-            seqNo:row.seqNo,
-
-        }
         array.push(row)
         printSeqNoLabel(array)
       },
diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue
index 4a1972b..1ec31e0 100644
--- a/src/views/modules/production/stockPrint.vue
+++ b/src/views/modules/production/stockPrint.vue
@@ -246,8 +246,10 @@
           batchNo:row.batchNo,
           locationId:row.locationId,
           partDesc:row.partDesc,
+          wareHouseDesc:row.wareHouseDesc,
           orderNo:row.orderNo,
           qty:row.qty,
+          umid:row.umid,
           transDate:row.transDate
         }
         array.push(data)