From a541742fd68adfd5d4a77d1f7f0fc69045c72ac2 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 12 七月 2024 08:15:16 +0800
Subject: [PATCH] 采购单据，入库单据
---
Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs | 76 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs b/Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs
index 48381e9..3e0f48b 100644
--- a/Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ProcurePlanServer.cs
@@ -41,8 +41,10 @@
.WhereIF(!string.IsNullOrWhiteSpace(model.StartTime), tb1 => tb1.CreateTime >= Convert.ToDateTime(model.StartTime))
.WhereIF(!string.IsNullOrWhiteSpace(model.EndTime), tb1 => tb1.CreateTime <= Convert.ToDateTime(model.EndTime).AddDays(1))
.WhereIF(!string.IsNullOrWhiteSpace(model.SkuName), (tb1,tb2) => tb2.SkuName.Contains(model.SkuName))
+ .WhereIF(!string.IsNullOrWhiteSpace(model.SkuNo), (tb1,tb2) => tb2.SkuNo.Contains(model.SkuNo))
.Where(tb1 => tb1.IsDel == "0")
- .OrderByDescending(tb1 => tb1.Id)
+ .OrderBy(tb1=>tb1.Status)
+ .OrderByDescending(tb1 => tb1.CreateTime)
.Distinct()
.Select((tb1, tb2, tb3, tb4) => new ProcurePlanNoticeDto() {
Id = tb1.Id,
@@ -64,44 +66,43 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- public List<ProcurePlanNoticeDetailDto> GetProcurePlanNoticeDetailList(ProcurePlanNoticeDetailVm model, out int count)
+ public async Task<List<ProcurePlanNoticeDetailDto>> GetProcurePlanNoticeDetailList(ProcurePlanNoticeDetailVm model, RefAsync<int> count)
{
- string sqlString = string.Empty;
- string sqlCount = string.Empty;
- int rowCount = 1;
- try
- {
- if (model.Page == 0)
+ var modelList = await Db.Queryable<BllProcurePlanNoticeDetail, SysUserInfor, SysUserInfor, SysMaterials,
+ SysUnit, SysPackag>((tb1, tb2, tb3, tb4, tb5, tb6) => new JoinQueryInfos(
+ JoinType.Left, tb1.CreateUser == tb2.Id,
+ JoinType.Left, tb1.UpdateUser == tb3.Id,
+ JoinType.Left, tb1.SkuNo == tb4.SkuNo,
+ JoinType.Left, tb4.UnitNo == tb5.UnitNo,
+ JoinType.Left, tb1.PackagNo == tb6.PackagNo))
+ .Where(tb1 => tb1.ParentId == model.ParentId && tb1.IsDel == "0")
+ .OrderByDescending(tb1 => tb1.SkuNo)
+ .Distinct()
+ .Select((tb1, tb2, tb3, tb4, tb5, tb6) => new ProcurePlanNoticeDetailDto()
{
- model.Page = 1;
- }
- sqlCount += $"SELECT COUNT(ID) FROM BllProcurePlanNoticeDetail where ParentId = '{model.ParentId}' and IsDel = '0';";
- var com = new Common();
- count = com.GetRowCount(sqlCount);
- if (count != 0)
- {
- rowCount = count;
- }
+ Id = tb1.Id,
+ ParentId = tb1.ParentId.ToString(),
+ OrderDetailCode = tb1.OrderDetailCode,
+ SkuNo = tb1.SkuNo,
+ SkuName = tb1.SkuName,
+ Standard = tb1.Standard,
+ Qty = tb1.Qty,
+ CompleteQty = tb1.CompleteQty,
+ PackagNo = tb1.PackagNo,
+ PackagName = tb6.PackagName,
+ UnitName = tb5.UnitName,
+ Status = tb1.Status,
+ CustomerNo = tb1.CustomerNo,
+ CustomerName = tb1.CustomerName,
+ CompleteTime = tb1.CompleteTime,
+ CreateTime = tb1.CreateTime,
+ CreateUserName = tb2.RealName,
+ UpdateTime = tb1.UpdateTime.ToString(),
+ UpdateUserName = tb3.RealName
- sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName, ";
- sqlString += "tb4.RealName as UpdateUserName,isnull(tb6.UnitName,tb5.UnitNo) as UnitName,tb7.PackagName ";
- sqlString += "FROM BllProcurePlanNoticeDetail AS tb1 ";
- sqlString += "LEFT JOIN SysUserInfor AS tb3 ON tb1.CreateUser = tb3.Id ";
- sqlString += "LEFT JOIN SysUserInfor AS tb4 ON tb1.UpdateUser = tb4.Id ";
- sqlString += "LEFT JOIN SysMaterials AS tb5 on tb1.SkuNo = tb5.SkuNo ";
- sqlString += "LEFT JOIN SysUnit AS tb6 on tb5.UnitNo = tb6.UnitNo ";
- sqlString += "LEFT JOIN SysPackag AS tb7 on tb1.PackagNo = tb7.PackagNo ";
- sqlString += $"WHERE tb1.ParentId = '{model.ParentId}' AND tb1.IsDel = '0' order by tb1.SkuNo desc ";
- sqlString += $"offset {((model.Page - 1) * model.Limit)} rows fetch next {rowCount} rows only;";
+ }).ToPageListAsync(model.Page, model.Limit, count);
- var modelList = Db.Ado.SqlQuery<ProcurePlanNoticeDetailDto>(sqlString);
-
- return modelList;
- }
- catch (Exception ex)
- {
- throw ex;
- }
+ return modelList;
}
/// <summary>
/// 閫氳繃閲囪喘鍗曠敓鎴愬叆搴撳崟鎹�
@@ -340,6 +341,7 @@
CustomerNo = CustomerModel.CustomerNo,
CustomerName = CustomerModel.CustomerName,
OrderCode = model.OrderCode,
+ UserName = model.Username,
CreateUser = 0
};
// 鎻掑叆鍏ュ簱鎬昏〃淇℃伅
@@ -353,7 +355,7 @@
Standard = skuModel.Standard,
LotNo = "",
LotText = "",
- Qty = 0,
+ Qty = (decimal)asnDetailModel.Qty,
FactQty=0,
CompleteQty=0,
PackagNo = skuModel.PackagNo,
@@ -364,7 +366,7 @@
OrderDetailCode = asnDetailModel.OrderDetailCode,
CreateUser = 0
};
- // 鎻掑叆鍏ュ簱鎬昏〃淇℃伅
+ // 鎻掑叆鍏ュ簱鏄庣粏琛ㄤ俊鎭�
Db.Insertable(arrDetailModel).ExecuteCommand();
#endregion
--
Gitblit v1.8.0