From 8193a4f5f70dbae83f5292aa6175476603653cd7 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 10:48:52 +0800
Subject: [PATCH] 添加临期预警过期时间，修改库存查询
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 314ce04..2455d1f 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
+using System.Reflection.Metadata;
using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
@@ -9,6 +11,7 @@
using Model.ModelDto;
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
+using Model.ModelDto.SysDto;
using Newtonsoft.Json;
using SqlSugar;
using Utility;
@@ -424,17 +427,107 @@
// .OrderBy(s => new { s.LotNo, s.LocatNo, s.PalletNo })
// .ToListAsync();
//}
- public async Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
+ public async Task<List<StockDetailWithQtyDto>> GetStockQueryList(string locatNo, string palletNo, string boxNo)
{
- return await Db.Queryable<DataStockDetail>()
- .LeftJoin<DataBoxInfo>((stk, box) => stk.LotNo == box.LotNo)
- .Where((stk, box) => stk.IsDel == "0")
- .WhereIF(!string.IsNullOrWhiteSpace(locatNo),(stk, box) => stk.LocatNo.Contains(locatNo))
- .WhereIF(!string.IsNullOrWhiteSpace(palletNo),(stk, box) => stk.PalletNo.Contains(palletNo))
- .WhereIF(!string.IsNullOrWhiteSpace(boxNo),(stk, box) => box.BoxNo.Contains(boxNo))
- .OrderBy((stk, box) => new { stk.LotNo, stk.LocatNo, stk.PalletNo, box.BoxNo })
- .Select((stk, box) => stk)
- .ToListAsync();
+ return await Db.Queryable<DataStockDetail>("a")
+ .InnerJoin<DataBoxInfo>((a, b) => a.LotNo == b.LotNo)
+ .Where((a, b) => a.IsDel == "0")
+ .WhereIF(!string.IsNullOrWhiteSpace(locatNo), (a, b) => a.LocatNo.Contains(locatNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(palletNo), (a, b) => a.PalletNo.Contains(palletNo))
+ .WhereIF(!string.IsNullOrWhiteSpace(boxNo), (a, b) => b.BoxNo.Contains(boxNo))
+ .GroupBy((a, b) => new
+ {
+ a.LotNo,
+ a.LotText,
+ a.SupplierLot,
+ a.OwnerNo,
+ a.OwnerName,
+ a.SupplierNo,
+ a.SupplierName,
+ a.SkuNo,
+ a.SkuName,
+ a.Standard,
+ a.LockQty,
+ a.FrozenQty,
+ a.InspectQty,
+ a.ASNNo,
+ a.ASNDetailNo,
+ a.SONo,
+ a.WareHouseNo,
+ a.RoadwayNo,
+ a.AreaNo,
+ a.LocatNo,
+ a.PalletNo,
+ a.PalletNo2,
+ a.PalletNo3,
+ a.PalletTags,
+ a.CompleteTime,
+ a.ProductionTime,
+ a.ExpirationTime,
+ a.Status,
+ a.InspectMark,
+ a.BitPalletMark,
+ a.InspectStatus,
+ a.InspectTime,
+ a.PackagNo,
+ a.IsBale,
+ a.IsBelt,
+ a.UDF5,
+ a.IsDel,
+ a.CreateTime,
+ a.CreateUser,
+ a.UpdateTime,
+ a.UpdateUser,
+ a.Demo
+ })
+ .OrderBy((a, b) => new { a.LotNo, a.LocatNo, a.PalletNo })
+ .Select((a, b) => new StockDetailWithQtyDto
+ {
+ LotNo = a.LotNo,
+ LotText = a.LotText,
+ SupplierLot = a.SupplierLot,
+ OwnerNo = a.OwnerNo,
+ OwnerName = a.OwnerName,
+ SupplierNo = a.SupplierNo,
+ SupplierName = a.SupplierName,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ Standard = a.Standard,
+ Qty = SqlFunc.AggregateSum(b.Qty), // DataBoxInfo鐨凲ty瀛楁
+ LockQty = a.LockQty,
+ FrozenQty = a.FrozenQty,
+ InspectQty = a.InspectQty,
+ ASNNo = a.ASNNo,
+ ASNDetailNo = a.ASNDetailNo,
+ SONo = a.SONo,
+ WareHouseNo = a.WareHouseNo,
+ RoadwayNo = a.RoadwayNo,
+ AreaNo = a.AreaNo,
+ LocatNo = a.LocatNo,
+ PalletNo = a.PalletNo,
+ PalletNo2 = a.PalletNo2,
+ PalletNo3 = a.PalletNo3,
+ PalletTags = a.PalletTags,
+ CompleteTime = a.CompleteTime,
+ ProductionTime = a.ProductionTime,
+ ExpirationTime = a.ExpirationTime,
+ Status = a.Status,
+ InspectMark = a.InspectMark,
+ BitPalletMark = a.BitPalletMark,
+ InspectStatus = a.InspectStatus,
+ InspectTime = a.InspectTime,
+ PackagNo = a.PackagNo,
+ IsBale = a.IsBale,
+ IsBelt = a.IsBelt,
+ UDF5 = a.UDF5,
+ IsDel = a.IsDel,
+ CreateTime = a.CreateTime,
+ CreateUser = a.CreateUser,
+ UpdateTime = a.UpdateTime,
+ UpdateUser = a.UpdateUser,
+ Demo = a.Demo
+ })
+ .ToListAsync();
}
#endregion
@@ -1585,9 +1678,9 @@
}
//寮�鍚簨鍔�
Db.BeginTran();
-
+
//搴撳瓨绠辨敮鏄庣粏淇℃伅
- var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo).ToList();
+ var boxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == boxNo && w.Status == "2").ToList();
if (boxList.Count != 1)
{
throw new Exception("璇ョ鐮佷俊鎭敊璇紝瀛樺湪澶氫釜姝ょ鐮佷俊鎭�");
--
Gitblit v1.8.0