From 1bbddc04976e03f1c7f852234f98c6d43b47cf2a Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周六, 30 11月 2024 16:50:37 +0800
Subject: [PATCH] 细节
---
LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue | 58 +++++++++++-----------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs | 15 ++++++-
2 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
index 6be7dd6..e4169bc 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/shortageList/component/openAllprop.vue
@@ -35,47 +35,35 @@
<el-table :data="drawerList" border striped :max-height="480">
<el-table-column fixed="left" type="index" label="搴忓彿" width="55" align="center" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
+ <!-- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
<el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="info5" label="鐢熶骇鍗曞彿" show-overflow-tooltip="" />
+
<el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
<el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
+ <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" /> -->
- <!-- <el-table-column prop="placeCode" label="搴撲綅缂栫爜" show-overflow-tooltip="" />
- <el-table-column prop="inTime" label="杩涘叆鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip="" />
- <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip="" />
- <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip="" />
- <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip="" />
- <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip="" />
- <el-table-column prop="length" label="闀�" show-overflow-tooltip="" />
- <el-table-column prop="width" label="瀹�" show-overflow-tooltip="" />
- <el-table-column prop="thk" label="鍘�" show-overflow-tooltip="" />
- <el-table-column prop="stockStatus" label="搴撳瓨鐘舵��" show-overflow-tooltip="">
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.stockStatus, getEnumStockStatusData_Index) }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="stockStatusName" label="搴撳瓨鐘舵�佸悕绉�" show-overflow-tooltip="" />
- <el-table-column prop="operReason" label="鎿嶄綔鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="operUser" label="鎿嶄綔浜�" show-overflow-tooltip="" />
- <el-table-column prop="operTime" label="鎿嶄綔鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="lockStatus" label="閿佸畾鐘舵��" show-overflow-tooltip="">
- <template #default="scope">
- <el-tag>{{ getEnumDesc(scope.row.lockStatus, getEnumLockStatusData_Index) }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="lockReason" label="閿佸畾鍘熷洜" show-overflow-tooltip="" />
- <el-table-column prop="lockUser" label="閿佸畾浜�" show-overflow-tooltip="" />
- <el-table-column prop="lockTime" label="閿佸畾鏃堕棿" width="80" :formatter="formatDate_T_Date" show-overflow-tooltip="" />
- <el-table-column prop="remarks" label="澶囨敞" show-overflow-tooltip="" />
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
- <el-table-column prop="updateTime" label="淇敼鏃堕棿" width="130" :formatter="formatDate_T_Time" show-overflow-tooltip="" />
- <el-table-column prop="createUserName" label="鍒涘缓浜�" show-overflow-tooltip="" />
- <el-table-column prop="updateUserName" label="淇敼浜�" show-overflow-tooltip="" /> -->
+
+<el-table-column fixed="left" prop="info5" label="鐢熶骇鍗曞彿" min-width="150" show-overflow-tooltip="" />
+ <el-table-column prop="planNo" label="鎵规" show-overflow-tooltip />
+ <el-table-column prop="orderId" label="璁㈠崟鍙�" show-overflow-tooltip />
+ <el-table-column prop="packageCode" label="鍖呰鍙�" show-overflow-tooltip />
+ <el-table-column prop="upi" label="閮ㄤ欢鏉＄爜" show-overflow-tooltip />
+ <el-table-column prop="detailName" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip />
+ <el-table-column prop="length" label="闀垮害" show-overflow-tooltip />
+ <el-table-column prop="width" label="瀹藉害" show-overflow-tooltip />
+ <el-table-column prop="thk" label="鍘氬害" show-overflow-tooltip />
+ <el-table-column prop="info4" label="閿�鍞悎鍚屽崟鍙�" min-width="150" show-overflow-tooltip />
+ <el-table-column prop="info10" label="瀹㈡埛鍚嶇О" show-overflow-tooltip />
+ <el-table-column prop="info11" label="鑷彁or鍙戣揣" show-overflow-tooltip />
+ <el-table-column prop="info12" label="鍖呰閮ㄤ欢鎬绘暟閲�" min-width="150" show-overflow-tooltip />
+ <el-table-column prop="info13" label="鍖呰闈㈢Н" show-overflow-tooltip />
+ <el-table-column prop="info14" label="閮ㄤ欢鍚嶇О" show-overflow-tooltip />
+ <el-table-column prop="info15" label="閮ㄤ欢鏁伴噺" show-overflow-tooltip />
+ <el-table-column prop="info16" label="閮ㄤ欢灏哄" show-overflow-tooltip />
+
+
</el-table>
<Pagination :total="detailCount" v-model:page="detailForm.Page" v-model:limit="detailForm.PageSize" @pagination="getDetail" style="margin-top: 20px; text-align: center"></Pagination>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
index f311b76..f6a8077 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsStockQuan/WmsStockQuan/Dto/WmsStockQuanOutput.cs
@@ -233,9 +233,14 @@
/// </summary>
public string DetailName { get; set; }
-
+ /// <summary>
+ /// 闀�
+ /// </summary>
public float Length { get; set; }
+ /// <summary>
+ /// 瀹�
+ /// </summary>
public float Width { get; set; }
/// <summary>
@@ -246,7 +251,9 @@
/// 閿�鍞悎鍚屽崟鍙�
/// </summary>
public string? Info4 { get; set; }
-
+ /// <summary>
+ /// 鐢熶骇鍗曞彿
+ /// </summary>
public string? Info5 { get; set; }
/// <summary>
/// 瀹㈡埛鍚嶇О
@@ -276,6 +283,10 @@
/// 閮ㄤ欢鏁伴噺
/// </summary>
public int? Info15 { get; set; }
+
+ /// <summary>
+ /// 閮ㄤ欢灏哄
+ /// </summary>
public string? Info16 { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3