From 99a274870321b572ebe1be973bb4d4a87d224617 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 21 Aug 2024 11:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=962=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/area/index.vue                  |  73 +++++++-
 src/views/wms/detailed/index.vue              | 110 ++++++------
 src/views/wms/major/index.vue                 | 169 +++++++-----------
 src/views/wms/matenews/index.vue              |  50 +++---
 src/views/wms/matetowsn/index.vue             |  13 +-
 src/views/wms/outorder/index.vue              |  17 +-
 src/views/wms/outorderfc/index.vue            |  27 ++-
 src/views/wms/productputrecords/index.vue     |  14 +-
 src/views/wms/put/index.vue                   |  12 +-
 .../wms/wmsProductProductionRecords/index.vue |   2 +-
 10 files changed, 289 insertions(+), 198 deletions(-)

diff --git a/src/views/wms/area/index.vue b/src/views/wms/area/index.vue
index d0ef17b..f2262c1 100644
--- a/src/views/wms/area/index.vue
+++ b/src/views/wms/area/index.vue
@@ -66,6 +66,7 @@
 					v-hasPermi="['wms:area:export']"
 				>导出</el-button>
 			</el-col>
+
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -105,6 +106,11 @@
 						@click="handleDelete(scope.row)"
 						v-hasPermi="['wms:area:remove']"
 					>删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="showPrint(scope.row)"
+          >打印</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -117,6 +123,17 @@
 			@pagination="getList"
 		/>
 
+    <el-dialog :title="printTitle" :visible.sync="printOpen" width="500px" append-to-body>
+      <div class="center-content" id="printFrom">
+        <canvas ref="qrCanvas"></canvas>
+        <ul class="no-bullets" >
+          <li class="material-info" style="font-size: 24px;">{{printData.areaCode}}</li>
+        </ul>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handlePrint(printData)">确 定</el-button>
+      </div>
+    </el-dialog>
 		<!-- 添加或修改库区对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
@@ -228,6 +245,7 @@
 
 <script>
 import { listArea, getArea, delArea, addArea, updateArea } from "@/api/wms/area";
+import QRCode from "qrcode";
 
 export default {
 	name: "Area",
@@ -243,6 +261,24 @@ export default {
 			multiple: true,
 			// 显示搜索条件
 			showSearch: true,
+      //打印弹出层标题
+      printTitle:"",
+      //是否显示打印弹出层
+      printOpen: false,
+      // 打印
+      printData: {
+        areaCode: null,
+        printable: 'printFrom',
+        ignore: ['no-print'],
+        workCenter: "暂无数据",
+        SAPNo: null,
+        manufacture: null,
+        auditor: null,
+        printDate: null,
+        factory: null,
+        productDate: null,
+        workTable: [],
+      },
 			// 总条数
 			total: 0,
 			// 库区表格数据
@@ -309,7 +345,9 @@ export default {
       indexMethod(index){
       return index+1 ;
     },
-		/** 查询库区列表 */
+
+
+      /** 查询库区列表 */
 		getList() {
 			this.loading = true;
 			listArea(this.queryParams).then(response => {
@@ -323,6 +361,25 @@ export default {
 			this.open = false;
 			this.reset();
 		},
+
+    showPrint(row) {
+      console.log(row.areaCode)
+    //const storageId = row.storageId || this.ids;
+       this.printData.areaCode = row.areaCode;
+        this.printOpen = true;
+        // 使用 Vue 的 nextTick 来确保 DOM 已经更新
+        this.$nextTick(() => {
+          const canvas = this.$refs.qrCanvas;
+          const options = {
+            width: 200,  // 设定二维码的宽度
+            height: 200  // 设定二维码的高度
+          };
+          QRCode.toCanvas(canvas,row.areaCode, options, error => {
+            if (error) console.error(error);
+          });
+        });
+
+    },
 		// 表单重置
 		reset() {
 			this.form = {
@@ -370,6 +427,20 @@ export default {
 			this.resetForm("queryForm");
 			this.handleQuery();
 		},
+    handlePrint(params) {
+      console.log(params)
+      printJS({
+        printable: params.printable || 'printFrom', // 标签元素id
+        type: params.type || 'html',
+        maxWidth: 1500, // 最大宽度
+        font_size: "",// 设置字体大小
+        header: params.header, // '表单',
+        targetStyles: ['*'],
+        style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
+        ignoreElements: params.ignore || [], // ['no-print']
+        properties: params.properties || null
+      })
+    },
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.areaId)
diff --git a/src/views/wms/detailed/index.vue b/src/views/wms/detailed/index.vue
index 141ba5a..61a34ed 100644
--- a/src/views/wms/detailed/index.vue
+++ b/src/views/wms/detailed/index.vue
@@ -25,14 +25,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="入库单号" prop="orderNo">
-				<el-input
-					v-model="queryParams.orderNo"
-					placeholder="请输入入库单号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="入库单号" prop="orderNo">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.orderNo"-->
+<!--					placeholder="请输入入库单号"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 			<el-form-item label="产品名称" prop="productName">
 				<el-input
 					v-model="queryParams.productName"
@@ -57,14 +57,14 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="条码" prop="barCode">
-				<el-input
-					v-model="queryParams.barCode"
-					placeholder="请输入条码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+<!--			<el-form-item label="条码" prop="barCode">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.barCode"-->
+<!--					placeholder="请输入条码"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
 			<el-form-item label="数量" prop="amount">
 				<el-input
 					v-model="queryParams.amount"
@@ -90,30 +90,30 @@
 <!--				/>-->
 <!--			</el-form-item>-->
 
-			<el-form-item label="创建时间" prop="gmtCreate">
-				<el-date-picker clearable
-					v-model="queryParams.gmtCreate"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择创建时间">
-				</el-date-picker>
-			</el-form-item>
-			<el-form-item label="最后更新人" prop="lastModifiedBy">
-				<el-input
-					v-model="queryParams.lastModifiedBy"
-					placeholder="请输入最后更新人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="最后更新时间" prop="gmtModified">
-				<el-date-picker clearable
-					v-model="queryParams.gmtModified"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择最后更新时间">
-				</el-date-picker>
-			</el-form-item>
+<!--			<el-form-item label="创建时间" prop="gmtCreate">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.gmtCreate"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="请选择创建时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="最后更新人" prop="lastModifiedBy">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.lastModifiedBy"-->
+<!--					placeholder="请输入最后更新人"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="最后更新时间" prop="gmtModified">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.gmtModified"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="请选择最后更新时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
 
 
 			<el-form-item>
@@ -171,14 +171,17 @@
 		<el-table v-loading="loading" :data="detailedList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="唯一序列号" align="center" prop="storageId" v-if="false" />
+      <el-table-column label="产品名称" align="center" prop="productName" width="280" />
+      <el-table-column label="产品编码" align="center" prop="productCode" width="250">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.productCode) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工厂编码" align="center" prop="factoryCode"  />
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" />
 			<el-table-column label="库位编码" align="center" prop="wlCode" />
-			<el-table-column label="入库单号" align="center" prop="orderNo" />
-			<el-table-column label="产品名称" align="center" prop="productName" />
-			<el-table-column label="产品编码" align="center" prop="productCode" />
 			<el-table-column label="托盘号" align="center" prop="sn" />
-			<el-table-column label="条码" align="center" prop="barCode" />
 			<el-table-column label="数量" align="center" prop="amount" />
 			<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
 			<el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" />
@@ -190,20 +193,6 @@
 			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
 			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
 			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
-			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="最后更新人" align="center" prop="lastModifiedBy" />
-			<el-table-column label="最后更新时间" align="center" prop="gmtModified" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="有效标记" align="center" prop="activeFlag" v-if="false" />
-			<el-table-column label="工厂编码" align="center" prop="factoryCode" v-if="false" />
-			<el-table-column label="sap工厂编码" align="center" prop="sapFactoryCode" v-if="false" />
 
 		</el-table>
 
@@ -457,6 +446,11 @@ export default {
 				this.title = "修改成品库存明细";
 			});
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
diff --git a/src/views/wms/major/index.vue b/src/views/wms/major/index.vue
index 4a9cbaa..66849b4 100644
--- a/src/views/wms/major/index.vue
+++ b/src/views/wms/major/index.vue
@@ -33,22 +33,22 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="库位编码" prop="wlCode">
-				<el-input
-					v-model="queryParams.wlCode"
-					placeholder="请输入库位编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-      <el-form-item label="库位名称" prop="wlName">
-        <el-input
-          v-model="queryParams.wlName"
-          placeholder="请输入库位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--			<el-form-item label="库位编码" prop="wlCode">-->
+<!--				<el-input-->
+<!--					v-model="queryParams.wlCode"-->
+<!--					placeholder="请输入库位编码"-->
+<!--					clearable-->
+<!--					@keyup.enter.native="handleQuery"-->
+<!--				/>-->
+<!--			</el-form-item>-->
+<!--      <el-form-item label="库位名称" prop="wlName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.wlName"-->
+<!--          placeholder="请输入库位名称"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 			<el-form-item label="产品编码" prop="productCode">
 				<el-input
 					v-model="queryParams.productCode"
@@ -65,30 +65,10 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="总数量" prop="amount">
-				<el-input
-					v-model="queryParams.amount"
-					placeholder="请输入总数量"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="冻结数量" prop="storageAmount">
-				<el-input
-					v-model="queryParams.storageAmount"
-					placeholder="请输入冻结数量"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="占用数量" prop="occupyAmount">
-				<el-input
-					v-model="queryParams.occupyAmount"
-					placeholder="请输入占用数量"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
+
+
+
+
 <!--			<el-form-item label="LPN" prop="lpn">-->
 <!--				<el-input-->
 <!--					v-model="queryParams.lpn"-->
@@ -105,14 +85,14 @@
 <!--					@keyup.enter.native="handleQuery"-->
 <!--				/>-->
 <!--			</el-form-item>-->
-			<el-form-item label="入库时间" prop="receiveDate">
-				<el-date-picker clearable
-					v-model="queryParams.receiveDate"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择入库时间">
-				</el-date-picker>
-			</el-form-item>
+<!--			<el-form-item label="入库时间" prop="receiveDate">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.receiveDate"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="请选择入库时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
 <!--			<el-form-item label="生产时间" prop="productDate">-->
 <!--				<el-date-picker clearable-->
 <!--					v-model="queryParams.productDate"-->
@@ -201,14 +181,14 @@
 <!--					@keyup.enter.native="handleQuery"-->
 <!--				/>-->
 <!--			</el-form-item>-->
-			<el-form-item label="创建时间" prop="gmtCreate">
-				<el-date-picker clearable
-					v-model="queryParams.gmtCreate"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择创建时间">
-				</el-date-picker>
-			</el-form-item>
+<!--			<el-form-item label="创建时间" prop="gmtCreate">-->
+<!--				<el-date-picker clearable-->
+<!--					v-model="queryParams.gmtCreate"-->
+<!--					type="date"-->
+<!--					value-format="yyyy-MM-dd"-->
+<!--					placeholder="请选择创建时间">-->
+<!--				</el-date-picker>-->
+<!--			</el-form-item>-->
 <!--			<el-form-item label="最后更新人" prop="lastModifiedBy">-->
 <!--				<el-input-->
 <!--					v-model="queryParams.lastModifiedBy"-->
@@ -305,30 +285,19 @@
 		<el-table v-loading="loading" :data="majorList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="唯一序列" align="center" prop="storageId" v-if="false" />
+      <el-table-column label="产品编码" align="center" prop="productCode" width="150"/>
+      <el-table-column label="产品名称" align="center" prop="productName" width="250"/>
+      <el-table-column label="工厂号" align="center" prop="factoryCode" />
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="区域编号" align="center" prop="regionCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" />
-			<el-table-column label="库存类型：CP－成品" align="center" prop="storageType" />
-			<el-table-column label="库位编码" align="center" prop="wlCode" />
-			<el-table-column label="产品编码" align="center" prop="productCode" />
-			<el-table-column label="产品名称" align="center" prop="productName" />
-			<el-table-column label="总数量" align="center" prop="amount" />
-			<el-table-column label="冻结数量" align="center" prop="storageAmount" />
-			<el-table-column label="占用数量" align="center" prop="occupyAmount" />
-			<el-table-column label="LPN" align="center" prop="lpn" />
-<!--			<el-table-column label="入库批次号" align="center" prop="productBatch" />-->
-			<el-table-column label="入库时间" align="center" prop="receiveDate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.receiveDate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-<!--			<el-table-column label="生产时间" align="center" prop="productDate" width="180">-->
-<!--				<template slot-scope="scope">-->
-<!--					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>-->
-<!--				</template>-->
-<!--			</el-table-column>-->
-			<el-table-column label="单位" align="center" prop="userDefined1" />
-			<el-table-column label="SAP库位" align="center" prop="userDefined2" />
+      <el-table-column label="单位" align="center" prop="userDefined1" />
+      <el-table-column label="非限制使用的库存" align="center" prop="amount" />
+      <el-table-column label="冻结数量" align="center" prop="storageAmount" />
+      <el-table-column label="占用数量" align="center" prop="occupyAmount" />
+      <el-table-column label="总数量" align="center" prop="amount" />
+		<el-table-column label="批次" align="center" prop="productBatch" />
+			<el-table-column label="SAP库位" align="center" prop="userDefined2" v-if="false" />
 			<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
 			<el-table-column label="备用4" align="center" prop="userDefined4" v-if="false" />
 			<el-table-column label="备用5" align="center" prop="userDefined5" v-if="false" />
@@ -337,21 +306,21 @@
 			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
 			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
 			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
-			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="最后更新人" align="center" prop="lastModifiedBy" />
-			<el-table-column label="最后更新时间" align="center" prop="gmtModified" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="有效标记" align="center" prop="activeFlag" />
-			<el-table-column label="工厂号" align="center" prop="factoryCode" />
-			<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" />
-			<el-table-column label="库位名称" align="center" prop="wlName" />
+<!--			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column label="最后更新人" align="center" prop="lastModifiedBy" />-->
+<!--			<el-table-column label="最后更新时间" align="center" prop="gmtModified" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column label="有效标记" align="center" prop="activeFlag" />-->
+
+<!--			<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" />-->
+<!--			<el-table-column label="库位名称" align="center" prop="wlName" />-->
 <!--			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--				<template slot-scope="scope">-->
 <!--					<el-button-->
@@ -419,14 +388,14 @@
 <!--				<el-form-item label="入库批次号" prop="productBatch">-->
 <!--					<el-input v-model="form.productBatch" placeholder="请输入入库批次号" />-->
 <!--				</el-form-item>-->
-				<el-form-item label="入库时间" prop="receiveDate">
-					<el-date-picker clearable
-						v-model="form.receiveDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择入库时间">
-					</el-date-picker>
-				</el-form-item>
+<!--				<el-form-item label="入库时间" prop="receiveDate">-->
+<!--					<el-date-picker clearable-->
+<!--						v-model="form.receiveDate"-->
+<!--						type="date"-->
+<!--						value-format="yyyy-MM-dd"-->
+<!--						placeholder="请选择入库时间">-->
+<!--					</el-date-picker>-->
+<!--				</el-form-item>-->
 <!--				<el-form-item label="生产时间" prop="productDate">-->
 <!--					<el-date-picker clearable-->
 <!--						v-model="form.productDate"-->
diff --git a/src/views/wms/matenews/index.vue b/src/views/wms/matenews/index.vue
index f29f803..9926a91 100644
--- a/src/views/wms/matenews/index.vue
+++ b/src/views/wms/matenews/index.vue
@@ -10,7 +10,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			
+
 			<el-form-item label="库区" prop="waCode">
 				<el-input
 					v-model="queryParams.waCode"
@@ -28,7 +28,7 @@
 				/>
 			</el-form-item>
 
-    
+
 			<el-form-item label="物料号" prop="materialCode">
 				<el-input
 					v-model="queryParams.materialCode"
@@ -115,12 +115,17 @@
 			<el-table-column label="仓库" align="center" prop="whCode" />
 			<el-table-column label="库区" align="center" prop="waCode" />
 			<el-table-column label="库位编码" align="center" prop="wlCode" />
-			<el-table-column label="物料号" align="center" prop="materialCode" />
-			<el-table-column label="物料描述" align="center" prop="materialDesc" />
-			<el-table-column label="总数量" align="center" prop="amount" />
+      <el-table-column label="物料号" align="center" prop="materialCode" width="250">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料描述" align="center" prop="materialDesc" width="250"/>
+      <el-table-column label="工厂号" align="center" prop="factoryCode" />
+      <el-table-column label="非限制使用的库存" align="center" prop="amount" />
 			<el-table-column label="冻结数量" align="center" prop="storageAmount" />
 			<el-table-column label="占用数量" align="center" prop="occupyAmount" />
-		
+      <el-table-column label="总数量" align="center" prop="amount" />
 			<el-table-column label="单位" align="center" prop="userDefined1" />
 			<el-table-column label="SAP库位" align="center" prop="userDefined2" v-if="false" />
 			<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
@@ -130,20 +135,20 @@
 			<el-table-column label="备用7" align="center" prop="userDefined7" v-if="false" />
 			<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
 			<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
-			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
-			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="更新人" align="center" prop="lastModifiedBy" />
-			<el-table-column label="更新时间" align="center" prop="gmtModified" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="有效标记" align="center" prop="activeFlag" v-if="false" />
-			<el-table-column label="工厂号" align="center" prop="factoryCode" />
+<!--			<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />-->
+<!--			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column label="更新人" align="center" prop="lastModifiedBy" />-->
+<!--			<el-table-column label="更新时间" align="center" prop="gmtModified" width="180">-->
+<!--				<template slot-scope="scope">-->
+<!--					<span>{{ parseTime(scope.row.gmtModified, '{y}-{m}-{d}') }}</span>-->
+<!--				</template>-->
+<!--			</el-table-column>-->
+<!--			<el-table-column label="有效标记" align="center" prop="activeFlag" v-if="false" />-->
+
 			<el-table-column label="SAP工厂号" align="center" prop="sapFactoryCode" v-if="false" />
 
 
@@ -421,6 +426,11 @@ export default {
 			this.resetForm("queryForm");
 			this.handleQuery();
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.storageId)
diff --git a/src/views/wms/matetowsn/index.vue b/src/views/wms/matetowsn/index.vue
index 8dfb43b..0d98b8e 100644
--- a/src/views/wms/matetowsn/index.vue
+++ b/src/views/wms/matetowsn/index.vue
@@ -126,8 +126,12 @@
 			<el-table-column label="仓库" align="center" prop="whCode" />
 			<el-table-column label="库区" align="center" prop="waCode" />
 			<el-table-column label="库位编码" align="center" prop="wlCode" />
-			<el-table-column label="物料号" align="center" prop="materialCode" />
-			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+      <el-table-column label="物料号" align="center" prop="materialCode" width="250">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料描述" align="center" prop="materialDesc" width="300"/>
 			<el-table-column label="托盘号" align="center" prop="sn" />
 			<el-table-column label="数量" align="center" prop="amount" />
 			<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
@@ -349,6 +353,11 @@ export default {
 			this.open = false;
 			this.reset();
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		// 表单重置
 		reset() {
 			this.form = {
diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue
index f489f03..c386e2c 100644
--- a/src/views/wms/outorder/index.vue
+++ b/src/views/wms/outorder/index.vue
@@ -45,10 +45,14 @@
 			<el-table-column label="序号" type="index" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
-			<el-table-column label="出库单号" align="center" prop="produceCode" />
-			<el-table-column label="型号编码" align="center" prop="materialCode" />
-			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<el-table-column label="批次号" align="center" prop="userDefined1" />
+			<el-table-column label="出库单号" align="center" prop="produceCode" width="200px"/>
+      <el-table-column label="型号编码" align="center" prop="materialCode" width="200px">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="型号名称" align="center" prop="materialDesc"  width="200px"/>
+			<el-table-column label="批次号" align="center" prop="userDefined1"  width="300px"/>
 			<el-table-column label="计划日期" align="center" prop="planDate" width="180" v-if="false">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
@@ -593,6 +597,11 @@ export default {
 				this.$modal.msgSuccess("操作完成");
 			});
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		/** 提交按钮 */
 		submitForm() {
 			const _this = this
diff --git a/src/views/wms/outorderfc/index.vue b/src/views/wms/outorderfc/index.vue
index ff0f5d9..2722a60 100644
--- a/src/views/wms/outorderfc/index.vue
+++ b/src/views/wms/outorderfc/index.vue
@@ -6,7 +6,7 @@
 				<el-input v-model="queryParams.produceCode" placeholder="请输入出库单号" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
-			<el-form-item label="批次号" prop="materialCode">
+			<el-form-item label="型号编码" prop="materialCode">
 				<el-input v-model="queryParams.userDefined1" placeholder="请输入型号编码" clearable
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
@@ -45,11 +45,15 @@
 			<el-table-column label="序号" type="index"  v-if="false" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
-			<el-table-column label="出库单号" align="center" prop="produceCode" />
-      <el-table-column label="需求时间" align="center" prop="userDefined5" />
-			<el-table-column label="型号编码" align="center" prop="materialCode" />
-			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<el-table-column label="批次号" align="center" prop="userDefined1" />
+			<el-table-column label="出库单号" align="center" prop="produceCode" width="250"/>
+      <el-table-column label="需求时间" align="center" prop="userDefined5" width="250"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" width="250">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.materialCode) }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/>
+			<el-table-column label="批次号" align="center" prop="userDefined1" width="250"/>
 <!--			<el-table-column label="计划日期" align="center" prop="planDate" width="180" v-if="false">-->
 <!--				<template slot-scope="scope">-->
 <!--					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>-->
@@ -59,7 +63,7 @@
 			<el-table-column label="单位" align="center" prop="unit" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
-      <el-table-column label="需求时间" align="center" prop="userDefined5" />
+      <el-table-column label="需求时间" align="center" prop="userDefined5" width="250"/>
 			<el-table-column label="仓库编号" align="center" prop="locCode" />
 			<el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" v-if="false" />
@@ -81,7 +85,7 @@
 					<span v-else-if="scope.row.userDefined10 === '3'">过账失败</span>
 				</template>
 			</el-table-column>
-      <el-table-column label="过账凭证" align="center" prop="userDefined9" />
+      <el-table-column label="过账凭证" align="center" prop="userDefined9" width="250"/>
 
       <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
 
@@ -140,7 +144,7 @@
 			<el-table :data="addoutorderList" @selection-change="handleSelectionChange1">
 				<el-table-column type="selection" width="55" align="center" :index="indexMethod" />
 				<el-table-column label="序号" type="index"> </el-table-column>
-				<el-table-column label="物料描述" align="center" prop="materialDesc" />
+				<el-table-column label="物料描述" align="center" prop="materialDesc"  width="255"/>
 				<el-table-column label="物料编号" align="center" prop="materialCode"   />
 
 				<el-table-column label="单位" align="center" prop="unit" />
@@ -543,6 +547,11 @@ export default {
 			};
 			this.resetForm("form");
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.queryParams.pageNum = 1;
diff --git a/src/views/wms/productputrecords/index.vue b/src/views/wms/productputrecords/index.vue
index ed7b8ae..e6c7484 100644
--- a/src/views/wms/productputrecords/index.vue
+++ b/src/views/wms/productputrecords/index.vue
@@ -170,8 +170,12 @@
 			<el-table-column label="ID" align="center" prop="id" v-if="false" />
 			<el-table-column label="报工单号" align="center" prop="workOrder" />
 			<el-table-column label="生产工单号" align="center" prop="productOrder" />
-			<el-table-column label="产品名称" align="center" prop="productName" />
-			<el-table-column label="产品编码" align="center" prop="productCode" />
+			<el-table-column label="产品名称" align="center" prop="productName" width="250px"/>
+      <el-table-column label="产品编码" align="center" prop="productCode" width="200px">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.productCode) }}</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
 			<el-table-column label="库区编码" align="center" prop="waCode" />
 			<el-table-column label="库位编码" align="center" prop="wlCode" />
@@ -390,6 +394,12 @@ export default {
 				this.title = "修改成品生产入库记录报";
 			});
 		},
+
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
diff --git a/src/views/wms/put/index.vue b/src/views/wms/put/index.vue
index c45b00d..a5b02c7 100644
--- a/src/views/wms/put/index.vue
+++ b/src/views/wms/put/index.vue
@@ -283,7 +283,12 @@
 			<el-table-column label="库区编码" align="center" prop="waCode" v-if="false"/>
 			<el-table-column label="库位编码" align="center" prop="wlCode" v-if="false"/>
 			<el-table-column label="产品名称"   align="center" prop="productName" width="200px"/>
-			<el-table-column label="产品编码" align="center" prop="productCode" />
+<!--			<el-table-column label="产品编码" align="center" prop="productCode" />-->
+      <el-table-column label="产品编码" align="center" prop="productCode" width="250">
+        <template slot-scope="scope">
+          <span>{{ formatProductCode(scope.row.productCode) }}</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="产品分类" align="center" prop="productSort" v-if="false"/>
 <!--			<el-table-column label="规格型号" align="center" prop="specification" />-->
 			<el-table-column label="单位" align="center" prop="unitOfMeasure" />
@@ -604,6 +609,11 @@ export default {
         this.$modal.msgSuccess("过账完成");
       }).catch(() => {});
 		},
+    formatProductCode(code) {
+      // 检查是否有效，去掉前7个零
+      if (!code) return code; // 处理 null 或 undefined 情况
+      return code.replace(/^0{1,7}/, ''); // 替换前1到7个0
+    },
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
diff --git a/src/views/wms/wmsProductProductionRecords/index.vue b/src/views/wms/wmsProductProductionRecords/index.vue
index 2a8a88a..25b2e79 100644
--- a/src/views/wms/wmsProductProductionRecords/index.vue
+++ b/src/views/wms/wmsProductProductionRecords/index.vue
@@ -102,7 +102,7 @@
       <el-table-column label="工单号" align="center" prop="productOrder" width="200px"/>
       <el-table-column label="批次" align="center" prop="batchCode" width="200px"/>
       <el-table-column label="产品名称"   align="center" prop="productName" width="200px"/>
-      <el-table-column label="产品编码" align="center" prop="productCode">
+       <el-table-column label="产品编码" align="center" prop="productCode" width="200px">
         <template slot-scope="scope">
           <span>{{ formatProductCode(scope.row.productCode) }}</span>
         </template>