From 0464969366317154fdbb51e106ca778b855bdd08 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 17 八月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs | 150 +++++++++++++++----------------------------------
1 files changed, 46 insertions(+), 104 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
index bf98076..a0520ce 100644
--- a/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/CompleteDetailServer.cs
@@ -3,7 +3,9 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
+using Model.ModelVm.BllSoVm;
using SqlSugar;
using WMS.DAL;
using WMS.Entity.BllSoEntity;
@@ -13,118 +15,58 @@
namespace WMS.BLL.BllSoServer
{
- public class CompleteDetailServer: DbHelper<BllCompleteDetail>,ICompleteDetailServer
+ public class CompleteDetailServer : DbHelper<BllCompleteDetail>, ICompleteDetailServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
- public CompleteDetailServer():base(Db)
+ public CompleteDetailServer() : base(Db)
{
}
//鏌ヨ鎷ｈ揣鏄庣粏绠辩爜淇℃伅锛堝垎缁勫悗锛�
- public List<CompleteDetailDto> GetCompleteDetailList(int id, int page, int limit, out int count)
+ public async Task<List<CompleteDetailDto>> GetCompleteDetailList(GetCompleteDetailVm model, RefAsync<int> count)
{
- try
- {
- var total = 0;
- var detailInfo = Db.Queryable<BllCompleteDetail>().First(w => string.IsNullOrEmpty(w.BoxNo) || string.IsNullOrEmpty(w.BoxNo3));
- if (detailInfo == null)
+ Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
+ .And(it => it.ExportAllotId == model.Id)
+ .And(it => it.IsDel == "0")
+ .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+ var data = await GetAllWhereAsync(item)
+ .GroupBy(m => new
{
- 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.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,
-
- 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 鍒嗙粍鏉′欢
+ m.BoxNo,
+ m.LotNo,
+ m.LotText,
+ m.SupplierLot,
+ m.SkuNo,
+ m.SkuName,
+ m.Standard,
+ m.PalletNo,
+ m.NowPalletNo
+ })
+ .Select(a => new CompleteDetailDto()
{
- 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,
+ 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,
- 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,
+ }).ToPageListAsync(model.Page, model.Limit, count);
- 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;
- }
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
+ return data;
}
//鏌ヨ鎷ｈ揣鏄庣粏鏀爜璇︾粏淇℃伅
@@ -135,7 +77,7 @@
Expression<Func<BllCompleteDetail, bool>> item = Expressionable.Create<BllCompleteDetail>()
.AndIF(!string.IsNullOrWhiteSpace(boxNo), it => it.BoxNo == boxNo.Trim())
.AndIF(!string.IsNullOrWhiteSpace(boxNo3), it => it.BoxNo3.Contains(boxNo3.Trim()))
- .ToExpression();
+ .ToExpression();
var data = GetAllWhereAsync(item)
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
@@ -159,7 +101,7 @@
CompleteQty = a.CompleteQty,
NowPalletNo = a.NowPalletNo,
- CreateUserName = b.RealName,
+ CreateUserName = b.RealName,
UpdateUserName = c.RealName,
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime,
@@ -201,7 +143,7 @@
{
page = 1;
}
-
+
sqlString += sqlPub + $" order by 1 offset {((page - 1) * limit)} rows fetch next {limit} rows only;";
var com = new Common();
@@ -210,7 +152,7 @@
var modelList = Db.Ado.SqlQuery<CompleteDetailDto>(sqlString);
return modelList;
}
- else
+ else
{
string sqlString = string.Empty;
string sqlCount = string.Empty;
--
Gitblit v1.8.0