From 8f3289a4dd118eafbb261907d485466633af21fd Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 23 六月 2025 16:54:06 +0800
Subject: [PATCH] 托盘明细-箱支明细增加有效期列
---
Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs | 2 +-
HTML/views/StatisticalReport/BoxInfor.html | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index dcefb00..4eb09eb 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -205,7 +205,14 @@
<!-- #region 鑷畾涔夎〃澶� -->
<script type="text/html" id="templetProductionTime">
{{# function GetBtn(d){
- return formatDate(d.ProductionTime);
+ return formatDate2(d.ProductionTime);
+ }
+ }}
+ {{ GetBtn(d) }}
+ </script>
+ <script type="text/html" id="templetExpirationTime">
+ {{# function GetBtn(d){
+ return formatDate2(d.ExpirationTime);
}
}}
{{ GetBtn(d) }}
@@ -482,6 +489,7 @@
{ field: 'Qty', title: '鏁伴噺', width: 90, align: 'center' },
{ field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center' },
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', templet: '#templetProductionTime' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈�', align: 'center', templet: '#templetExpirationTime' },
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus' },
{ field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center' },
{ field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center' },
diff --git a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
index 7d8f8b7..b94d8ee 100644
--- a/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/DataBoxInfoServer.cs
@@ -38,7 +38,7 @@
string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus)
{
string str = "select PalletNo,PalletNo2,PalletNo3,BoxNo,BoxNo2,BoxNo3,Status,LotNo,Qty,FullQty,SkuNo,SkuName," +
- "LotText,ProductionTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
+ "LotText,ProductionTime,ExpirationTime,InspectMark,BitBoxMark,InspectStatus,InspectTime from DataBoxInfo Where IsDel = @isdel";
//鍒ゆ柇id鏄惁涓虹┖
if (!string.IsNullOrEmpty(id))
{
--
Gitblit v1.8.0