From 2be1922b035c182c3c516427aa68be54badd6938 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:15:52 +0800
Subject: [PATCH] 登录页修改
---
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs | 125 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
index 5372791..cd09b0a 100644
--- a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -26,48 +26,101 @@
try
{
var total = 0;
- Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
+ var detailInfo = Db.Queryable<BllCompleteDetail>().Where(w => w.ExportAllotId == id).ToList();
+ var num = detailInfo.Count(w=> string.IsNullOrEmpty(w.BoxNo) && string.IsNullOrEmpty(w.BoxNo3));
+ if (detailInfo.Count>0 && num == 0) //绠辩爜鍜屾敮鐮侀兘涓虹┖鐨勬暟閲忕瓑涓�0 璇佹槑鏄鐮佹嫞璐�
+ {
+ Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
.And(it => it.ExportAllotId == id)
.And(it => it.IsDel == "0")
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var data = GetAllWhereAsync(item)
- .GroupBy(m=>new
- {
- m.SONo,
- m.SODetailNo,
- m.StockId,
- m.ExportAllotId,
+ var data = GetAllWhereAsync(item)
+ .GroupBy(m => new
+ {
+ m.SONo,
+ m.SODetailNo,
+ m.StockId,
+ m.ExportAllotId,
- m.BoxNo,
- m.LotNo,
- m.LotText,
- m.SupplierLot,
- m.SkuNo,
- m.SkuName,
- m.Standard,
- m.PalletNo,
- m.NowPalletNo
- })
- .Select(a => new CompleteDetailDto()
- {
- SONo = a.SONo,
- SODetailNo = a.SODetailNo,
- StockId = a.StockId,
- ExportAllotId = a.ExportAllotId,
+ m.BoxNo,
+ m.LotNo,
+ m.LotText,
+ m.SupplierLot,
+ m.SkuNo,
+ m.SkuName,
+ m.Standard,
+ m.PalletNo,
+ m.NowPalletNo,
+ })
+ .Select(a => new CompleteDetailDto()
+ {
+ SONo = a.SONo,
+ SODetailNo = a.SODetailNo,
+ StockId = a.StockId,
+ ExportAllotId = a.ExportAllotId,
- BoxNo = a.BoxNo,
- LotNo = a.LotNo,
- LotText = a.LotText,
- SupplierLot = a.SupplierLot,
- SkuNo = a.SkuNo,
- SkuName = a.SkuName,
- Standard = a.Standard,
- PalletNo = a.PalletNo,
- CompleteQty = SqlFunc.AggregateSum(a.CompleteQty),
- NowPalletNo = a.NowPalletNo
+ BoxNo = a.BoxNo,
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ PalletNo = a.PalletNo,
+ CompleteQty = SqlFunc.AggregateSum(a.CompleteQty),
+ NowPalletNo = a.NowPalletNo,
+ //CreateTime = a.CreateTime
+ }).ToOffsetPage(page, limit, ref total);
+ count = total;
+ return data;
+ }
+ else //绠辩爜鎴栨敮鐮佷负绌鸿鏄庢槸鎸夋暟閲忔嫞璐э紝澧炲姞 CreateTime 鍒嗙粍鏉′欢
+ {
+ Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
+ .And(it => it.ExportAllotId == id)
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+ var data = GetAllWhereAsync(item)
+ .GroupBy(m => new
+ {
+ m.SONo,
+ m.SODetailNo,
+ m.StockId,
+ m.ExportAllotId,
+
+ m.BoxNo,
+ m.LotNo,
+ m.LotText,
+ m.SupplierLot,
+ m.SkuNo,
+ m.SkuName,
+ m.Standard,
+ m.PalletNo,
+ m.NowPalletNo,
+ m.CreateTime
+ })
+ .Select(a => new CompleteDetailDto()
+ {
+ SONo = a.SONo,
+ SODetailNo = a.SODetailNo,
+ StockId = a.StockId,
+ ExportAllotId = a.ExportAllotId,
+
+ BoxNo = a.BoxNo,
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ PalletNo = a.PalletNo,
+ CompleteQty = SqlFunc.AggregateSum(a.CompleteQty),
+ NowPalletNo = a.NowPalletNo,
+ //CreateTime = a.CreateTime
}).ToOffsetPage(page, limit, ref total);
- count = total;
- return data;
+ count = total;
+ return data;
+ }
}
catch (Exception e)
{
--
Gitblit v1.8.0