diff --git a/src/views/modules/board/inspectBoard.vue b/src/views/modules/board/inspectBoard.vue
index f052c81..5ca15a7 100644
--- a/src/views/modules/board/inspectBoard.vue
+++ b/src/views/modules/board/inspectBoard.vue
@@ -57,16 +57,23 @@
           prop="partNo"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="90"
           label="产品编号">
         </el-table-column>
         <el-table-column
           prop="partDescSpec"
           header-align="center"
           align="left"
-          min-width="180"
+          min-width="140"
           label="产品名称">
         </el-table-column>
+        <el-table-column
+          prop="shiftNo"
+          header-align="center"
+          align="left"
+          min-width="45"
+          label="班次">
+        </el-table-column>
         <el-table-column
           prop="transQty"
           header-align="center"
diff --git a/src/views/modules/board/transFerBoard.vue b/src/views/modules/board/transFerBoard.vue
index daa1b88..bd9782b 100644
--- a/src/views/modules/board/transFerBoard.vue
+++ b/src/views/modules/board/transFerBoard.vue
@@ -18,7 +18,7 @@
           prop="transNo"
           header-align="center"
           align="left"
-          min-width="80"
+          min-width="95"
           style="font-size: 20px"
           label="入库通知单号">
         </el-table-column>
@@ -26,7 +26,7 @@
           prop="orderNo"
           header-align="center"
           align="left"
-          min-width="65"
+          min-width="95"
           style="font-size: 20px"
           label="生产订单号">
         </el-table-column>
@@ -34,7 +34,7 @@
           prop="type"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="55"
           style="font-size: 20px"
           label="订单类型">
         </el-table-column>
@@ -50,7 +50,7 @@
           prop="transDate"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="80"
           label="报工日期">
         </el-table-column>
         <el-table-column
@@ -64,7 +64,7 @@
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="150"
+          min-width="130"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -78,7 +78,7 @@
           prop="needReceiveFlag"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="57"
           label="检验通过">
           <template slot-scope="scope">
             {{scope.row.needReceiveFlag=='Y'?'是':'否'}}
@@ -126,6 +126,9 @@
     },
     methods: {
       tableRowClassName ({row, rowIndex}) {
+        if (row.type == '产成品') {
+          return 'green'
+        }
       },
       search () {
         let inData= {number:this.pageIndex};
@@ -192,7 +195,9 @@
     height: 13px;
     padding: 0px;
   }
-
+  .board2 .el-table .green {
+    background: #8cee8c;
+  }
   .board2 .el-table .success-row {
     background: #1bb61b;
   }
diff --git a/src/views/modules/board/transFerBoardForHunlian.vue b/src/views/modules/board/transFerBoardForHunlian.vue
index 14d1771..ef3957d 100644
--- a/src/views/modules/board/transFerBoardForHunlian.vue
+++ b/src/views/modules/board/transFerBoardForHunlian.vue
@@ -18,7 +18,7 @@
           prop="transNo"
           header-align="center"
           align="left"
-          min-width="80"
+          min-width="95"
           style="font-size: 20px"
           label="入库通知单号">
         </el-table-column>
@@ -26,7 +26,7 @@
           prop="orderNo"
           header-align="center"
           align="left"
-          min-width="65"
+          min-width="95"
           style="font-size: 20px"
           label="生产订单号">
         </el-table-column>
@@ -42,7 +42,7 @@
           prop="transDate"
           header-align="center"
           align="left"
-          min-width="105"
+          min-width="80"
           label="报工日期">
         </el-table-column>
         <el-table-column
@@ -56,7 +56,7 @@
           prop="partDesc"
           header-align="center"
           align="left"
-          min-width="150"
+          min-width="130"
           label="产品名称">
         </el-table-column>
         <el-table-column
@@ -76,14 +76,6 @@
           {{scope.row.needReceiveFlag=='Y'?'是':'否'}}
         </template>
         </el-table-column>
-
-        <el-table-column
-          prop="seqNo"
-          header-align="center"
-          align="right"
-          min-width="45"
-          label="派工单号">
-        </el-table-column>
       </el-table>
     </div>
 
diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue
new file mode 100644
index 0000000..c994223
--- /dev/null
+++ b/src/views/modules/production/cancelSfdcForWareHouse.vue
@@ -0,0 +1,519 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true"  label-position="top" label-width="100px" >
+      <el-form-item :label="'派工单号'">
+        <el-input v-model="searchData.seqNo" style="width: 130px"></el-input>
+      </el-form-item>
+
+      <el-form-item :label="' '">
+        <el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column
+        prop=""
+        header-align="center"
+        fixed="left"
+        align="center"
+        width="80"
+        label="操作">
+        <template slot-scope="scope" class="foo_container">
+          <a type="text" size="small" v-if="scope.row.reverseflag==='N'" @click="cancelSfdc(scope.row)">取消报工</a>
+        </template>
+      </el-table-column>
+      <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"
+        :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>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    getSfdcList,
+    cancelSfdc,
+
+  } from '@/api/production/generateReport.js'
+  import Chooselist from '@/views/modules/common/Chooselist'
+
+
+  export default {
+    name: 'cancelSfdc',
+    components: {
+      Chooselist
+    },
+    data () {
+      return {
+        site: this.$store.state.user.site,
+        // 导出+动态列 start
+        exportData: [],
+        userDev:this.$store.state.user.userDev,
+        exportName: "派工单列表"+this.getStrDate(),
+        columnList: [
+          {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "site",
+            columnLabel: "工厂编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "assJobSeqNo",
+            columnLabel: "派工单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          },
+          {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "orderNo",
+            columnLabel: "生产订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "itemNo",
+            columnLabel: "工序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operationDesc",
+            columnLabel: "工序名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 120,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "seqNo",
+            columnLabel: "次序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 50,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "partNo",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "workCenterNo",
+            columnLabel: "加工中心编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportDate",
+            columnLabel: "报工时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 130,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operatorId",
+            columnLabel: "操作员",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "operatorName",
+            columnLabel: "操作员姓名",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reverseflag",
+            columnLabel: "是否已取消报工",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportQty",
+            columnLabel: "报告数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "approveQty",
+            columnLabel: "合格数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "reportedManfTime",
+            columnLabel: "生产时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "shiftNo",
+            columnLabel: "班次编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "resourceId",
+            columnLabel: "机台编号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 70,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "resourceDesc",
+            columnLabel: "机台名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 100,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'left'
+          }
+        ],
+        visible:false,
+        // 导出 end
+        height: 200,
+        tableData: [],
+        searchData: {
+          seqNo:'',
+        },
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+        this.height2 = window.innerHeight -100
+      })
+    },
+    methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 24) {
+            strVal = this.searchData.workCenterNo
+          }
+          if (val === 5) {
+            strVal = this.searchData.partNo
+          }
+          if (val === 26) {
+            strVal = this.searchData.operatorName
+          }
+          if (val === 88) {
+            strVal = this.searchData.resourceId
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 24) {
+          this.searchData.workCenterNo = val.WorkCenterNo
+        }  else if (this.tagNo === 5) {
+          this.searchData.partNo = val.PartNo
+        }
+        if (this.tagNo === 26) {
+          this.searchData.operatorName = val.OperatorName
+        }
+        if (this.tagNo === 88) {
+          this.searchData.resourceId = val.ResourceID
+        }
+      },
+
+      search () {
+        if(this.searchData.seqNo==null||this.searchData.seqNo==''){
+          this.$alert('请输入派工单号！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        getSfdcList(this.searchData).then(({data}) => {
+          this.tableData = data.rows
+        })
+      },
+      cancelSfdc(row){
+        this.$confirm(`确定取消此报工记录`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancelSfdc(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.search ();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            }else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+      // 导出+动态列
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      createExportData() {
+        // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
+        return this.tableData;
+      },
+      getStrDate() {
+        let dd = new Date();
+        let Y = dd.getFullYear();
+        let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
+        let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
+        let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
+        return Y + M + D + H + MM + S;
+
+      },
+
+
+    },
+    created () {
+      // this.getTableUserColumn()
+    }
+  }
+</script>
+
+<style scoped>
+  .input_left{
+    text-align: left;
+  }
+  .input_reight{
+    text-align: right;
+  }
+  /deep/ input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+  }
+  input[type='number'] {
+    -moz-appearance: textfield !important;
+  }
+
+</style>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 15453f4..da9a220 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -645,7 +645,7 @@
           })
           return
         }
-        if (this.saveHeaderData.qtyApprove == null || this.saveHeaderData.qtyApprove <= 0) {
+        if (this.saveHeaderData.qtyApprove == null || this.saveHeaderData.qtyApprove < 0) {
           this.$alert('合格数量错误！', '错误信息', {
             confirmButtonText: '确定'
           })
diff --git a/src/views/modules/production/print_stock_label_preview.js b/src/views/modules/production/print_stock_label_preview.js
new file mode 100644
index 0000000..a668ed3
--- /dev/null
+++ b/src/views/modules/production/print_stock_label_preview.js
@@ -0,0 +1,131 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printMaterialLabel(printList) {
+  const LODOP = getLodop()
+  if (LODOP) {
+    //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
+    LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", "");
+    // LODOP.SET_PRINTER_INDEXA("小标签打印机");
+    //循环调用打印机
+    for(let i = 0; i < printList.length; i++){
+      let printData = printList[i];
+      LODOP.NewPage();
+      LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo);
+      LODOP.ADD_PRINT_TEXT(112,8,133,25,"WareHouse ID:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(112,110,140,25,printData.wareHouseDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(154,8,103,24,"Batch No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(154,110,140,20,printData.batchNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(133,8,124,25,"Location ID:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(133,110,139,25,printData.locationId);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(41,56,195,55,printData.partNo+'|'+printData.partDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(175,8,82,25,"Order No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(91,8,81,25,"Q.T.Y:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(91,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:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(194,110,244,25,printData.transDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+      LODOP.ADD_PRINT_TEXT(9,140,100,30,"库存标签");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      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.PRINT_DESIGN();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
+    console.log("操作成功！")
+  }
+}
+
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"WareHouseId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.wareHouseId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,77,24,"BatchNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.batchNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,98,25,"LocationId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.locationId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,72,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,82,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,56,25,"Qty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qty);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,92,25,"TransDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/production/print_transNo_label.js b/src/views/modules/production/print_transNo_label.js
index a9d00f5..3b19e1f 100644
--- a/src/views/modules/production/print_transNo_label.js
+++ b/src/views/modules/production/print_transNo_label.js
@@ -10,6 +10,13 @@ export function printTransNoLabel(printList) {
     //循环调用打印机
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
+      let remark='';
+      if(printData.partNo.substring(0,2)=='FP'){
+        remark='产成品'
+      }
+      if(printData.partNo.substring(0,2)=='SP'){
+        remark='半成品'
+      }
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
       LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo);
@@ -68,10 +75,13 @@ export function printTransNoLabel(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(174,267,100,21,remark);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      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_transNo_label_preview.js b/src/views/modules/production/print_transNo_label_preview.js
new file mode 100644
index 0000000..92d1f37
--- /dev/null
+++ b/src/views/modules/production/print_transNo_label_preview.js
@@ -0,0 +1,140 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printTransNoLabel(printList) {
+  const LODOP = getLodop()
+  if (LODOP) {
+    //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
+    LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", "");
+    //LODOP.SET_PRINTER_INDEXA("小标签打印机");
+    //循环调用打印机
+    for(let i = 0; i < printList.length; i++){
+      let printData = printList[i];
+      let remark='';
+      if(printData.partNo.substring(0,2)=='FP'){
+        remark='产成品'
+      }
+      if(printData.partNo.substring(0,2)=='SP'){
+        remark='半成品'
+      }
+      LODOP.NewPage();
+      LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+      LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.transNo);
+      LODOP.ADD_PRINT_TEXT(82,8,108,25,"Part:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(82,55,195,56,printData.partNo+'|'+printData.partDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(155,8,77,24,"Job No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(155,110,140,20,printData.seqNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(134,8,113,22,"Equip No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(134,110,139,25,printData.workCenterNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(41,8,98,25,"Trans No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(41,110,136,25,printData.transNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(175,8,94,25,"Order No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(175,110,141,25,printData.orderNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(61,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(61,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:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(194,110,244,25,printData.transDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(224,5,256,24,"Manufactured by A&M Polymer");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(224,212,156,25,"IATF:16949 Certified");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.ADD_PRINT_LINE(218,2,217,374,0,1);
+      LODOP.ADD_PRINT_TEXT(12,122,135,30,"入库通知单");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      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(174,267,100,21,remark);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+    }
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
+    console.log("操作成功！")
+  }
+}
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.transNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,77,24,"SeqNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.seqNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,113,25,"WorkCenterNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.workCenterNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,98,25,"TransNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.transNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,94,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,96,25,"TransQty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.transQty);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,97,25,"TransDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/production/stockPrint.vue b/src/views/modules/production/stockPrint.vue
index 4faaf16..abe9144 100644
--- a/src/views/modules/production/stockPrint.vue
+++ b/src/views/modules/production/stockPrint.vue
@@ -146,7 +146,7 @@
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
     printMaterialLabel,
-  } from "@/views/modules/production/print_stock_label.js"
+  } from "@/views/modules/production/print_stock_label_preview.js"
   export default {
     name: 'soscheduleRouting',
     components: {
diff --git a/src/views/modules/production/transFerPrint.vue b/src/views/modules/production/transFerPrint.vue
index 892aa7d..141c8a5 100644
--- a/src/views/modules/production/transFerPrint.vue
+++ b/src/views/modules/production/transFerPrint.vue
@@ -130,7 +130,7 @@
   import Chooselist from '@/views/modules/common/Chooselist'
   import {
     printTransNoLabel,
-  } from "@/views/modules/production/print_transNo_label.js"
+  } from "@/views/modules/production/print_transNo_label_preview.js"
   export default {
     name: 'soscheduleRouting',
     components: {