| | |
| | | using 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; |
| | |
| | | using Model.ModelDto; |
| | | using Model.ModelDto.BllCheckDto; |
| | | using Model.ModelDto.PdaDto; |
| | | using Model.ModelDto.SysDto; |
| | | using Newtonsoft.Json; |
| | | using SqlSugar; |
| | | using Utility; |
| | |
| | | // .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)) |
| | | .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 = b.Qty, // DataBoxInfo的Qty字段 |
| | | 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 |
| | | |