From f50cf678d6960dc6f39809aaedd45fdb95c13e4f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 20 三月 2024 17:48:27 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/SOSetting/ExportAllot.html | 11 +++++++++--
HTML/views/SOSetting/ComBoxInfo.html | 2 +-
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 14 +++++++++++++-
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs | 5 +++--
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/HTML/views/SOSetting/ComBoxInfo.html b/HTML/views/SOSetting/ComBoxInfo.html
index 187ee4d..5e5f425 100644
--- a/HTML/views/SOSetting/ComBoxInfo.html
+++ b/HTML/views/SOSetting/ComBoxInfo.html
@@ -132,7 +132,7 @@
field: 'CreateUserName', align: 'center', title: '鍒涘缓浜�', width: 120,
},
{
- field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 165,
+ field: 'CreateTime', align: 'center', title: '鎷ｈ揣鏃堕棿', width: 165,
templet: function (d) {
return formatDate(d.CreateTime);
},
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 611e0be..214848d 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -217,7 +217,13 @@
}}
{{ GetBtn7(d) }}
</script>
-
+ <script type="text/html" id="templetUpdateTime">
+ {{# function GetBtn71(d){
+ return formatDate(d.UpdateTime);
+ }
+ }}
+ {{ GetBtn71(d) }}
+ </script>
<script type="text/html" id="templetUnstackingMode">
{{# function GetBtn8(d){
switch (d.UnstackingMode) {
@@ -347,6 +353,7 @@
{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
{ field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 160, templet: '#templetCreateTime' },
+ { field: 'UpdateTime', align: 'center', title: '瀹屾垚鏃堕棿', width: 160, templet: '#templetUpdateTime' },
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true }
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -608,7 +615,7 @@
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
{ field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 110, },
{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 120, },
- //{field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 165,templet: '#templetCreateTime2'},
+ {field: 'CreateTime',align: 'center',title: '鎷ｈ揣',width: 165,templet: '#templetCreateTime2'},
{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 3b03e81..2f64311 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -242,7 +242,19 @@
{
foreach (var demo in list)
{
- var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+ //if (!string.IsNullOrWhiteSpace(boxNo3))
+ //{
+ // var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+ //}
+ //else if (!string.IsNullOrWhiteSpace(boxNo))
+ //{
+ // if (expr)
+ // {
+
+ // }
+
+ //}
+ var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
if (com != null)
{
demo.PickedQty = com.CompleteQty;
diff --git a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
index 5372791..5d2c4b5 100644
--- a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -46,7 +46,7 @@
m.SkuName,
m.Standard,
m.PalletNo,
- m.NowPalletNo
+ m.NowPalletNo,
})
.Select(a => new CompleteDetailDto()
{
@@ -64,7 +64,8 @@
Standard = a.Standard,
PalletNo = a.PalletNo,
CompleteQty = SqlFunc.AggregateSum(a.CompleteQty),
- NowPalletNo = a.NowPalletNo
+ NowPalletNo = a.NowPalletNo,
+ //CreateTime = a.CreateTime
}).ToOffsetPage(page, limit, ref total);
count = total;
return data;
--
Gitblit v1.8.0