diff --git a/push-op-ui-test-old.bat b/push-op-ui-test-old.bat
new file mode 100644
index 0000000..bae3fb2
--- /dev/null
+++ b/push-op-ui-test-old.bat
@@ -0,0 +1,28 @@
+@echo off
+echo --------------------------------自定义参数，启动前先修改--------------------------------------
+set imageURI=140.249.53.142:30002/op-lanju/ld-op-front
+::echo 获取当前日期字符串
+for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
+::echo 获取当前时间字符串
+for /f "tokens=1,2 delims=:." %%a in ("%time%") do @set T=%%a%%b
+::echo 如当前小时小于10，将空格替换为0
+set T=%T: =0%
+::echo 显示输出日期时间字符串
+set imageVersion=%D%%T%
+::输出发版信息
+echo 镜像库地址:%imageURI% 
+echo 镜像版本:%imageVersion% 
+echo --------------------------------执行打包--------------------------------
+call npm run build:prod
+
+dir
+echo --------------------------------docker login...-------------------------------
+docker logout 140.249.53.142:30002
+docker login 140.249.53.142:30002 -u deploy -p Deploy@2022
+echo --------------------------------docker build...-------------------------------
+docker build -t %imageURI%:%imageVersion% .
+echo --------------------------------docker push...--------------------------------
+docker push %imageURI%:%imageVersion%
+@pause
+
+::docker pull 192.168.3.157:8001/library/nginx:1.20-alpine
\ No newline at end of file
diff --git a/push-op-ui-test.bat b/push-op-ui-test.bat
index bae3fb2..dc15a2f 100644
--- a/push-op-ui-test.bat
+++ b/push-op-ui-test.bat
@@ -1,6 +1,6 @@
 @echo off
 echo --------------------------------自定义参数，启动前先修改--------------------------------------
-set imageURI=140.249.53.142:30002/op-lanju/ld-op-front
+set imageURI=192.168.202.36:30002/op-lanju/op-ui-test
 ::echo 获取当前日期字符串
 for /f "tokens=1,2,3 delims=/- " %%a in ("%date%") do @set D=%%a%%b%%c
 ::echo 获取当前时间字符串
@@ -17,8 +17,7 @@ call npm run build:prod
 
 dir
 echo --------------------------------docker login...-------------------------------
-docker logout 140.249.53.142:30002
-docker login 140.249.53.142:30002 -u deploy -p Deploy@2022
+docker login 192.168.202.36:30002 -u deploy -p Deploy@2023
 echo --------------------------------docker build...-------------------------------
 docker build -t %imageURI%:%imageVersion% .
 echo --------------------------------docker push...--------------------------------
diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index ccdbd82..f277453 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -168,3 +168,20 @@ export function getIncomeChartList(query) {
 		data: query
 	});
 }
+
+//瀹氶噺鍊兼槑缁嗘姤琛�
+
+export function getDLTableMXTitle(query) {
+	return request({
+		url: '/quality/staticTable/getDLTableMXTitle',
+		method: 'get',
+		params: query
+	});
+}
+export function getDLTableMXList(query) {
+	return request({
+		url: '/quality/staticTable/getDLTableMXList',
+		method: 'get',
+		params: query
+	});
+}
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ef12da5..bfaf9f2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -321,6 +321,7 @@ export default {
       setTimeout(this.getUnReadList(), 30000);
     }, 30000);
     
+
   },
   components: {
     Breadcrumb,
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index 8a6a320..b0587d9 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -54,8 +54,8 @@
             <el-row class="my-print-foot">
               <el-col :offset="1" :span="13">
                 <div class="card-div2">浜у搧鍚嶇О: {{ item.productName  }}</div><br />
+                <div class="card-div2">浜у搧缂栫爜: {{ item.productCode }}</div><br />
                 <div class="card-div2">鎵规鍙�: {{ item.batchCode }}</div><br />
-                <div class="card-div2">鐢熶骇鏃ユ湡: {{ item.productDateStr }}</div><br />
                 <div class="card-div2">鏉挎: {{ item.palletNo }}</div><br />
                 <div class="card-div2"><span>鏁伴噺: {{ item.batchQuantity }}&nbsp;{{ item.unit }}</span>
                                        <span style="margin-left: 15%;">瀛愬崟鏁伴噺: {{ item.umrez }}&nbsp;PC</span></div><br />
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index 23c1ea5..0a53cb9 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -1323,12 +1323,14 @@ export default {
     handleDelete(row) {
 
       var statusesArray = this.statuses;
+      /**
       for (var i = 0; i < statusesArray.length; i++) {
         if (statusesArray[i] == 'w2') {
           this.$modal.msgError("宸茬粡娲诲姩鐨勮鍗曚笉鍏佽鎿嶄綔");
           return
         }
       }
+      **/
 
       const workorderIds = row.workorderId || this.ids;
 
diff --git a/src/views/quality/qcTableDLReport/index.vue b/src/views/quality/qcTableDLReport/index.vue
new file mode 100644
index 0000000..a78a999
--- /dev/null
+++ b/src/views/quality/qcTableDLReport/index.vue
@@ -0,0 +1,473 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+      class="edit-el-form"
+    >
+      <el-form-item label="璁㈠崟缂栫爜" prop="workorderCodeSap">
+        <el-input
+          v-model="queryParams.workorderCodeSap"
+          placeholder="璇疯緭鍏ヨ鍗曠紪鐮�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="绾夸綋" prop="checkLoc">
+        <el-select clearable v-model="queryParams.checkLoc">
+					<el-option
+						v-for="item in prodLineList"
+						:key="item.lineCode"
+						:label="item.lineName"
+						:value="item.lineCode"
+					></el-option>
+				</el-select>
+      </el-form-item>
+
+      <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="typeCode">
+        <el-select
+          v-model="queryParams.typeCode"
+          placeholder="蹇呴�夋楠岀被鍨�"
+          @change="getCheckTypeList"
+        >
+          <el-option
+            v-for="dict in dict.type.check_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="妫�楠岃妭鐐�" prop="checkType">
+        <el-select
+          v-model="queryParams.checkType"
+          placeholder="蹇呴�夋楠岃妭鐐�"
+          @change="getProjectListFunc"
+        >
+          <el-option
+            v-for="dict in checkTypeList"
+            :key="dict.checkType"
+            :label="dict.checkName"
+            :value="dict.checkType"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="瀹氶噺妫�娴嬮」" prop="projectId">
+        <el-select
+          v-model="queryParams.projectId"
+          
+          collapse-tags
+          placeholder="蹇呴�夊畾閲忔娴嬮」"
+        >
+          <el-option
+            v-for="item in projectNoOptions"
+            :key="item.recordId"
+            :label="item.ruleName"
+            :value="item.recordId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鐢熶骇鏃堕棿" prop="incomeTimeArray">
+        <el-date-picker
+          v-model="queryParams.incomeTimeArray"
+          format="yyyy-MM-dd"
+          type="datetimerange"
+          range-separator="鑷�"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        >
+        </el-date-picker>
+      </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="tableList" @selection-change="handleSelectionChange" height="450">
+			<el-table-column type="index" width="50" align="center" :index="indexMethod" label="搴忓彿"fixed/>
+			<!--<el-table-column label="绾夸綋缂栫爜" align="center" prop="checkLoc" width="90" />-->
+      <el-table-column label="绾夸綋鍚嶇О" align="center" prop="equipmentName" width="90" />
+			<el-table-column label="浜у搧缂栫爜" align="center" prop="materialCode" width="110" :formatter="productCodeFormate"/>
+			<el-table-column label="浜у搧鍚嶇О" align="center" prop="materialName" width="180" :show-overflow-tooltip="true"/>
+			
+			<el-table-column label="璁㈠崟鍙�" align="center" prop="workorderCodeSap" width="100" :formatter="orderCodeFormate"/>
+      <!--<el-table-column label="宸ュ崟鍙�" align="center" prop="workorderCode" width="130"/>-->
+      <el-table-column label="鎵规鍙�" align="center" prop="batchNo" width="150" />
+      <el-table-column label="妫�娴嬮」" align="center" prop="ruleName" width="250" :show-overflow-tooltip="true"/>
+      <el-table-column label="娴嬮噺鍊�" align="center">
+        <template v-for="(column, index) in showTitles">
+          <el-table-column align="center" width="70" :prop="column.id" :key="column.id" :label="column.titleName"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="CPK鍝佺被" align="center" prop="cpkTypeName" width="100" />
+      <el-table-column label="鏃ユ湡" align="center" prop="incomeTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+		</el-table>
+    <!--
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />-->
+    <!-- 鍥炬爣鍒嗘瀽 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1300px"
+      append-to-body
+    >  
+
+      <el-button type="primary" round v-if="title == 'CPK鍒嗘瀽'" @click="handleExportCPK">瀵煎嚭CPK</el-button>
+      <div
+        class="echartbox"
+        id="echart1"
+        style="margin: auto; margin-top: 20px; width: 1220px; height: 545px"
+      ></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getDLTableMXTitle,
+  getDLTableMXList,
+  getCheckTypeList,
+  getSupplierList,
+  getProjectOptionList,
+} from "@/api/quality/qcTable";
+import {
+  getProdLineList
+} from '@/api/plan/workorder'
+import * as echarts from "echarts";
+import moment from "moment/moment";
+export default {
+  name: "qcTableDLReport",
+  dicts: ["check_type"],
+  data() {
+    return {
+      prodLineList:[],
+      detailListLoading: true,
+      refreshNewWorkerTable: true,
+      // 閫夋嫨棰嗘枡鍗�
+      selectPrepare: [],
+      // 鎵撳嵃
+      formRef: "form",
+      validateRules: [],
+      printDialogVisible: false,
+      // 閬僵灞�
+      loading: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 琛ㄦ牸鏁版嵁
+      tableList: [],
+      showTitles:[],
+      detailTitleCol2: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkNo: null,
+        typeCode: null,
+        checkType: null,
+        orderNo: null,
+        productId: null,
+        materialCode: null,
+        prodType: null,
+        materialName: null,
+        productSpc: null,
+        wetDetailPlanId: null,
+        incomeTime: null,
+        incomeBatchNo: null,
+        incomeTimeArray: [],
+        ymArrayStart: null,
+        ymArrayEnd: null,
+      },
+      workCenterList: [],
+      checkTypeList: [],
+      projectNoOptions: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {},
+      openReport: false,
+      titleReport: "宸ュ崟鎶ュ伐璇︽儏",
+      legenddata: [],
+      seriesdata: [],
+      xAxisdata: [],
+      detailechartslist: [],
+      titledata: "",
+    };
+  },
+  created() {
+    getProdLineList().then(response => {
+      this.prodLineList = response
+    })
+    this.getDate();
+    this.getList();
+  },
+  methods: {
+    //浜у搧缂栫爜鏍煎紡鍖�
+    productCodeFormate(row, column, cellValue) {
+      return cellValue.slice(7, 18); //杩斿洖鍊�
+    },
+    //璁㈠崟缂栫爜鏍煎紡鍖�
+    orderCodeFormate(row, column, cellValue) {
+      if (cellValue != null) {
+        return cellValue.slice(3, 18); //杩斿洖鍊�
+      }
+    },
+    /**鑾峰彇榛樿鏌ヨ鏃堕棿娈�**/
+    getDate() {
+      let start = this.Fungetdate(0);
+      let end = this.Fungetdate(0);
+      this.queryParams.incomeTimeArray.push(start, end);
+    },
+    Fungetdate(num) {
+      var dd = new Date();
+      dd.setDate(dd.getDate() + num);
+      var y = dd.getFullYear();
+      var m = dd.getMonth() + 1; //鑾峰彇褰撳墠鏈堜唤鐨勬棩鏈�
+      var d = dd.getDate();
+      return y + "-" + m + "-" + d;
+    },
+    /**鑾峰彇杞﹂棿鏁版嵁**/
+    getWorkCenterList() {
+      getWorkcenterList(this.queryParams).then((response) => {
+        this.workCenterList = response;
+      });
+    },
+    getCheckTypeList(val) {
+      //鑾峰彇妫�楠岃妭鐐�
+      getCheckTypeList(val).then((response) => {
+        this.checkTypeList = response;
+      });
+      //鑾峰彇缁熻鍗曚綅
+      getSupplierList(val).then((response) => {
+        this.workCenterList = response;
+      });
+    },
+    //鑾峰彇瀹氶噺妫�娴嬮」
+    getProjectListFunc(val) {
+      getProjectOptionList(val).then((response) => {
+        this.projectNoOptions = response;
+      });
+    },
+    indexMethod(index) {
+      return index + 1;
+    },
+    /** 鏌ヨ鍒楄〃 */
+    getList() {
+      this.loading = true;
+
+      if (this.queryParams.incomeTimeArray.length > 0) {
+        this.queryParams.ymArrayStart = moment(this.queryParams.incomeTimeArray[0]).format("YYYY-MM-DD");
+        this.queryParams.ymArrayEnd = moment(this.queryParams.incomeTimeArray[1]).format("YYYY-MM-DD");
+      }
+
+      getDLTableMXTitle(this.queryParams).then((response) => {
+        this.showTitles = [];
+        let col1 = response.titleCol1;
+        if(col1 != null){
+          for (let i = 1; i <= col1.length; i++) {
+            var titleobj1 = {};
+            titleobj1.id = "act" + i;
+            titleobj1.titleName = col1[i-1];
+            this.showTitles.push(titleobj1);
+          }
+        }
+        getDLTableMXList(this.queryParams);
+      });
+
+      getDLTableMXList(this.queryParams).then((response) => {
+        this.tableList = response//.rows;
+        //this.total = response.total;
+        this.loading = false;
+      });
+    },
+    		//浜у搧缂栫爜鏍煎紡鍖�
+		productCodeFormate(row, column, cellValue){
+      if(cellValue !=null){
+			  return cellValue.slice(7,18);  //杩斿洖鍊�
+      }
+		},
+    //璁㈠崟缂栫爜鏍煎紡鍖�
+    orderCodeFormate(row, column, cellValue){
+      if(cellValue !=null){
+        return cellValue.slice(3,18);  //杩斿洖鍊�
+      }
+
+		},
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.openReport = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      this.form = {
+        prepareId: null,
+        checkNo: null,
+        workorderName: null,
+        parentOrder: null,
+        orderId: null,
+        orderNo: null,
+        productId: null,
+        materialCode: null,
+        prodType: null,
+        materialName: null,
+        productSpc: null,
+        wetDetailPlanId: null,
+        incomeTime: null,
+        incomeBatchNo: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        factoryCode: null,
+      };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.getDate();
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.prepareId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+      this.selectPrepare = selection;
+    },
+
+    /** 鎻愪氦鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.prepareId != null) {
+            updatePrepare(this.form).then((response) => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPrepare(this.form).then((response) => {
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download(
+        "quality/staticTable/exportDLTableMXList",
+        {
+          ...this.queryParams,
+        },
+        `DLMxTable_${new Date().getTime()}.xlsx`
+      );
+    },
+    // 鍙栨秷
+    cancel() {
+      this.open = false;
+    }
+  },
+};
+</script>
+<style>
+.my-print-head {
+  margin-top: 20px;
+  font-weight: bold;
+}
+.my-print-nav {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.my-print-table {
+}
+.my-print-foot {
+  margin-top: 20px;
+}
+#.el-table .cell {
+  white-space: pre-line !important;
+}
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap; /*杩欐槸閲嶇偣銆傛枃鏈崲琛�*/
+}
+/deep/ .el-table__expand-icon {
+  display: none;
+}
+.expandClass .el-table__expand-icon {
+  display: none;
+}
+</style>
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index fecca57..292986f 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -681,9 +681,9 @@ export default {
 		},
 		/** 瀵煎嚭鎸夐挳鎿嶄綔 */
 		handleExport() {
-			this.download('qcWarehousing/warehousing/export', {
+			this.download('quality/qcWarehousing/export', {
 				...this.queryParams
-			}, `warehousing_${new Date().getTime()}.xlsx`)
+			}, `product_${new Date().getTime()}.xlsx`)
 		},
 		// 鏁版嵁鐘舵�佷慨鏀�
 		handleStatusChange(row) {
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 9bb99f2..5cd3aab 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -32,6 +32,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="CPK鍝佺被" prop="cpkType">
+        <el-select
+            v-model="queryParams.cpkType"
+            placeholder="璇烽�夋嫨鍝佺被"
+          >
+            <el-option
+              v-for="dict in dict.type.qms_category"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -186,6 +199,12 @@
         prop="mvgr5"
         width="150"
       />
+      <el-table-column
+        label="CPK鍝佺被"
+        align="center"
+        prop="cpkTypeName"
+        width="150"
+      />
       <!-- 涓枃鎻忚堪涔熷氨鏄骇鍝佸悕绉� -->
       <!-- <el-table-column label="鑻辨枃鎻忚堪" align="center" prop="productDescEn" />
 						<el-table-column label="浜у搧绫诲埆" align="center" prop="productGroup">
@@ -522,9 +541,9 @@
         </el-form-item>
 
 
-        <el-form-item label="CPK鍝佺被" prop="other">
+        <el-form-item label="CPK鍝佺被" prop="cpkType">
           <el-select
-            v-model="form.other"
+            v-model="form.cpkType"
             placeholder="璇烽�夋嫨璐ㄩ噺鍝佺被"
             style="width: 320px"
           >