diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 3788cb46..1472a459 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index a930eacc..05654938 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1217,9 +1217,9 @@ 对应金蝶单据明细id(销售出库同步金蝶下推使用) - + - 物料Id + 物料编码 diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs index 01578005..141be577 100644 --- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs @@ -17,14 +17,22 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord /// 目标箱子 /// public string DestBox { get; set; } + ///// + ///// 原仓位ID + ///// + //public int? SrcSubStockId { get; set; } + ///// + ///// 现仓位ID + ///// + //public int? DestSubStockId { get; set; } /// - /// 原仓位ID + /// 原仓位编码 /// - public int? SrcSubStockId { get; set; } + public string SrcSubStockCode { get; set; } /// - /// 现仓位ID + /// 现仓位编码 /// - public int? DestSubStockId { get; set; } + public string DestSubStockCode { get; set; } /// /// 操作人 /// diff --git a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs index 605bfbf4..44a95ce8 100644 --- a/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs @@ -33,10 +33,14 @@ namespace WMS.Web.Core.Dto.Erp.OutStock /// 对应金蝶单据明细id(销售出库同步金蝶下推使用) /// public int Erp_DetailId { get; set; } = 0; + ///// + ///// 物料Id + ///// + //public int MaterialId { get; set; } /// - /// 物料Id + /// 物料编码 /// - public int MaterialId { get; set; } + public string MaterialNumber { get; set; } /// /// 仓库ID /// diff --git a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs index 1b93a0ec..0b39fcca 100644 --- a/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs +++ b/src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs @@ -9,14 +9,22 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord /// public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto { + ///// + ///// 原仓位编码 + ///// + //public int? SrcSubStockId { get; set; } + ///// + ///// 目标仓位编码 + ///// + //public int? DestSubStockId { get; set; } /// /// 原仓位编码 /// - public int? SrcSubStockId { get; set; } + public string SrcSubStockCode { get; set; } /// /// 目标仓位编码 /// - public int? DestSubStockId { get; set; } + public string DestSubStockCode { get; set; } /// /// 类型：1- 整箱移货上级，2-整箱移货下级 /// diff --git a/src/WMS.Web.Domain/Entitys/Box.cs b/src/WMS.Web.Domain/Entitys/Box.cs index 2b99ae77..e1ff7aa3 100644 --- a/src/WMS.Web.Domain/Entitys/Box.cs +++ b/src/WMS.Web.Domain/Entitys/Box.cs @@ -172,7 +172,7 @@ namespace WMS.Web.Domain.Entitys foreach (var d in detailClone) { //如果箱信息存在 箱库存不存在 删除箱信息数据 - var inventoryDetail = inventory.Details.FirstOrDefault(f => f.MaterialId == d.MaterialId); + var inventoryDetail = inventory.Details.FirstOrDefault(f => f.MaterialNumber == d.MaterialNumber); if (inventoryDetail == null) { var boxDetail = this.Details.FirstOrDefault(f => f.Id == d.Id); @@ -182,9 +182,9 @@ namespace WMS.Web.Domain.Entitys //箱库存存在 箱信息不存在 添加 foreach (var d in inventory.Details) { - var md = this.Details.FirstOrDefault(w => w.MaterialId == d.MaterialId); + var md = this.Details.FirstOrDefault(w => w.MaterialNumber == d.MaterialNumber); if (md == null) - this.Details.Add(new BoxDetails() { MaterialId = d.MaterialId, Qty = d.Qty }); + this.Details.Add(new BoxDetails() { MaterialNumber = d.MaterialNumber, Qty = d.Qty }); else md.Qty = d.Qty; } diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs index 64964642..17873e02 100644 --- a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -54,11 +54,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("DestBoxId")] public int DestBoxId { get; set; } - /// - /// 原箱仓位 - /// - [Column("SrcSubStockId")] - public int SrcSubStockId { get; set; } + ///// + ///// 原箱仓位 + ///// + //[Column("SrcSubStockId")] + //public int SrcSubStockId { get; set; } /// /// 原箱仓位 /// @@ -69,11 +69,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("DestStockCode")] public string DestStockCode { get; set; } - /// - /// 目标箱仓位或重新上架选择仓位 - /// - [Column("DestSubStockId")] - public int DestSubStockId { get; set; } + ///// + ///// 目标箱仓位或重新上架选择仓位 + ///// + //[Column("DestSubStockId")] + //public int DestSubStockId { get; set; } /// /// 目标箱仓位或重新上架选择仓位 /// diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs index 16fe9942..b5322dbb 100644 --- a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -40,16 +40,16 @@ namespace WMS.Web.Domain.Entitys /// [Column("StockCode")] public string StockCode { get; set; } - /// - /// 原仓位Id - /// - [Column("SrcSubStockId")] - public int SrcSubStockId { get; set; } - /// - /// 目标仓位Id - /// - [Column("DestSubStockId")] - public int DestSubStockId { get; set; } + ///// + ///// 原仓位Id + ///// + //[Column("SrcSubStockId")] + //public int SrcSubStockId { get; set; } + ///// + ///// 目标仓位Id + ///// + //[Column("DestSubStockId")] + //public int DestSubStockId { get; set; } /// /// 原仓位编码 /// @@ -89,14 +89,14 @@ namespace WMS.Web.Domain.Entitys /// 创建 /// /// - public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId,string subStockCode) + public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int creatorId,string subStockCode) { this.BoxId = boxId; this.Type = type; this.OrgCode = orgCode; this.StockCode = stockCode; - SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值 - DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0 + //SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值 + //DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0 SrcSubStockCode = type == MoveBoxType.Up ? "" : subStockCode;//上架 原仓位是0 目标仓位有值 DestSubStockCode = type == MoveBoxType.Up ? subStockCode : ""; //下架 原仓位有值 目标仓位是0 this.Qty = qty; diff --git a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs index 270dc604..7090c6f2 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs @@ -34,11 +34,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("SerialNumbers")] public List SerialNumbers { get; set; } = new List(); - /// - /// 仓位 - /// - [Column("SubStockId")] - public int SubStockId { get; set; } + ///// + ///// 仓位 + ///// + //[Column("SubStockId")] + //public int SubStockId { get; set; } /// /// 仓位 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 72bea07f..f5dcc81d 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -99,17 +99,17 @@ namespace WMS.Web.Domain.Entitys /// /// 出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量) /// - /// + /// /// /// - public Result> OutStock(int materialId, decimal qty, int outStockId) + public Result> OutStock(string materialNumber, decimal qty, int outStockId) { if (this.Status == OutStockStatus.Already) return Result>.ReFailure(ResultCodes.OutStockTaskAlready); if (this.Status == OutStockStatus.Repeal) return Result>.ReFailure(ResultCodes.OutStockTaskRepeal); - var detail = this.Details.FirstOrDefault(f => f.MaterialId == materialId); + var detail = this.Details.FirstOrDefault(f => f.MaterialNumber == materialNumber); if (detail == null) return Result>.ReFailure(ResultCodes.OrderNoData); if ((detail.AccruedQty - detail.RealityQty) < qty) return Result>.ReFailure(ResultCodes.OutStockQtyError); @@ -221,7 +221,7 @@ namespace WMS.Web.Domain.Entitys { d.Id = 0; d.Fid = 0; - var detail_new = details_new.FirstOrDefault(f => f.MaterialId == d.MaterialId); + var detail_new = details_new.FirstOrDefault(f => f.MaterialNumber == d.MaterialNumber); if (detail_new != null) { detail_new.AccruedQty += d.AccruedQty;//应出数量累加 diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index 5fc83588..56303753 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -50,11 +50,11 @@ namespace WMS.Web.Domain.Entitys /// [Column("StockCode")] public string StockCode { get; set; } - /// - /// 仓位 - /// - [Column("SubStockId")] - public int SubStockId { get; set; } + ///// + ///// 仓位 + ///// + //[Column("SubStockId")] + //public int SubStockId { get; set; } /// /// 仓位 /// diff --git a/src/WMS.Web.Domain/QuartzJob/BoxQuartzJob.cs b/src/WMS.Web.Domain/QuartzJob/BoxQuartzJob.cs index 614823f6..0e29cb86 100644 --- a/src/WMS.Web.Domain/QuartzJob/BoxQuartzJob.cs +++ b/src/WMS.Web.Domain/QuartzJob/BoxQuartzJob.cs @@ -39,7 +39,7 @@ namespace WMS.Web.Domain.QuartzJob var result = await _boxService.Sync(); //5.记录：结束时间 var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); - _logger.LogInformation($"箱信息-同步箱信息数据：执行结束时间->{begindatetime}"); + _logger.LogInformation($"箱信息-同步箱信息数据：执行结束时间->{enddatetime}"); } catch (Exception ex) diff --git a/src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs b/src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs index 3cc9c1c3..56adf153 100644 --- a/src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs +++ b/src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs @@ -53,7 +53,7 @@ namespace WMS.Web.Domain.QuartzJob var result = await _outStockTaskService.Sync(null, begin); //5.记录：结束时间 var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); - _logger.LogInformation($"出库单-同步金蝶出库单数据：执行结束时间->{begindatetime}"); + _logger.LogInformation($"出库单-同步金蝶出库单数据：执行结束时间->{enddatetime}"); } catch (Exception ex) diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs index a48ae2b1..ed8c79f5 100644 --- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs +++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs @@ -168,11 +168,11 @@ namespace WMS.Web.Domain.Services { ChangeBoxRecord entity = new ChangeBoxRecord(); entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId); - entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 - entity.SrcSubStockCode = subStock_s?.Code ?? ""; + //entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 + entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取 if (subStock != null) { - entity.DestSubStockId = dt.SubStockId; + //entity.DestSubStockId = dt.SubStockId; entity.DestBoxOrgCode = subStock.ErpOrgCode; entity.DestStockCode = subStock.StockCode; entity.DestSubStockCode = subStock.Code; @@ -278,9 +278,9 @@ namespace WMS.Web.Domain.Services List entityList = new List(); foreach (var d in dto) { - var subStock = await _basbicsRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId); + var subStock = await _basbicsRepositories.GetSubUcStockAsync(d.SubStockCode, loginInfo.UserInfo.CompanyId); var entity = new MoveBoxRecord(); - entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId, subStock?.Code); + entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, d.Qty, subStock?.ErpOrgCode, d.SubStockCode, loginInfo.UserInfo.StaffId, subStock?.Code); entity.Details = d.Details.Select(s => new MoveBoxRecordDetails() { MaterialNumber = s.MaterialNumber, diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs index cf6586d6..1d53cbb5 100644 --- a/src/WMS.Web.Domain/Services/OutStockService.cs +++ b/src/WMS.Web.Domain/Services/OutStockService.cs @@ -134,7 +134,7 @@ namespace WMS.Web.Domain.Services foreach (var b in boxInventoryDetails) { var num = boxInventoryDetails.Where(w => w.MaterialId == b.MaterialId).Sum(s => s.Qty); - var taskDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialNumber == b.MaterialId); + var taskDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialNumber == b.MaterialNumber); if (taskDetail == null) return Result.ReFailure(ResultCodes.BoxOutStockTaskMaterialError); //箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库 if (num > (taskDetail.AccruedQty - taskDetail.RealityQty)) @@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services if (box == null) return Result.ReFailure(ResultCodes.BoxNoData); var dtod = _mapper.Map(b); dtod.BoxId = box.BoxId; - dtod.SubStockId = box.SubStockId; + dtod.SubStockCode = box.SubStockCode; dto.Details.Add(dtod); } } diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index b94c624c..f85bc17c 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -114,7 +114,7 @@ namespace WMS.Web.Domain.Services foreach (var erp in erps) { //仓库不同 拆分成不同的 - var detail = outStockTask.Details.FirstOrDefault(w => w.MaterialId == erp.MaterialId); + var detail = outStockTask.Details.FirstOrDefault(w => w.MaterialNumber == erp.MaterialNumber); if (detail == null) { //添加一条物料明细 @@ -167,11 +167,11 @@ namespace WMS.Web.Domain.Services entity.Create((OutStockType)e.Type, e.StockCode, e.OrgCode, e.DeliveryOrgId, e.ReceiptCustomerId, (DateTime)e.CreateTime); //找到当前对应来源单据编号的集合数据 - var mIds = eList.GroupBy(g => g.MaterialId).Select(s => s.Key).ToList(); + var mIds = eList.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList(); //给到dto的实体明细中 foreach (var mid in mIds) { - var emList = eList.Where(w => w.MaterialId == mid).ToList(); + var emList = eList.Where(w => w.MaterialNumber == mid).ToList(); var detail = _mapper.Map(emList.First()); var erpDetail = _mapper.Map>(emList); detail.ErpDetails.AddRange(erpDetail); @@ -205,7 +205,7 @@ namespace WMS.Web.Domain.Services var erp_o = erp_list.Where(w => w.SourceBillNo == ed.SourceBillNo).ToList(); if (erp_o.Count() == 0) continue; - var erp_d = erp_list.Where(w => w.MaterialId == d.MaterialId && ed.Erp_DetailId == w.Erp_DetailId).ToList(); + var erp_d = erp_list.Where(w => w.MaterialNumber == d.MaterialNumber && ed.Erp_DetailId == w.Erp_DetailId).ToList(); if (erp_d.Count() == 0) { //金蝶删除明细数据后 wms对应数据修改为0 diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs index 340f1fe7..cd659b96 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs @@ -161,7 +161,20 @@ namespace WMS.Web.Domain.Services.Public } return mat.BaseUnitName; } - + public string GetMaterialUnitName(List erpMaterials, string materialNumber) + { + if (erpMaterials == null || erpMaterials.Count == 0) + return ""; + var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault(); + if (mat == null) + { + var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult(); + if (!result.IsSuccess) + return ""; + return result.Data == null ? "" : result.Data.BaseUnitName; + } + return mat.BaseUnitName; + } /// /// 获取物料基本单位名称 /// @@ -265,7 +278,26 @@ namespace WMS.Web.Domain.Services.Public } return mat.BaseUnitNumber; } - + /// + /// 获取物料基本单位编码 + /// + /// + /// + /// + public string GetMaterialUnitNumber(List erpMaterials, string materialNumber) + { + if (erpMaterials == null || erpMaterials.Count == 0) + return ""; + var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault(); + if (mat == null) + { + var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult(); + if (!result.IsSuccess) + return ""; + return result.Data == null ? "" : result.Data.BaseUnitNumber; + } + return mat.BaseUnitNumber; + } /// /// 获取组织名称 /// diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 3d3ea0dd..bbd4f310 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -1698,7 +1698,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString()); - param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FQty,F_ENTRYREMARKS,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID + param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FQty,F_ENTRYREMARKS,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -1731,7 +1731,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FApproveDate - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1749,7 +1749,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -1794,7 +1794,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString()); - param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber"; + param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -1826,7 +1826,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FApproveDate - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1843,7 +1843,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -1888,7 +1888,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString()); - param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber"; + param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -1920,7 +1920,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FApproveDate - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -1937,7 +1937,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -1982,7 +1982,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); - param.FieldKeys = "FBillNo,'',FOwnerIdHead,FSubProOwnerIdH,FMaterialID,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; + param.FieldKeys = "FBillNo,'',FOwnerIdHead,FSubProOwnerIdH,FMaterialID.FNumber,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -2014,7 +2014,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FAPPROVEDATE - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2031,7 +2031,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -2076,7 +2076,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString()); - param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; + param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId.FNumber,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -2108,7 +2108,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FApproveDate - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2125,7 +2125,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -2170,7 +2170,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); - param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID,FStockOrgId.FNumber"; + param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY.FNumber,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID,FStockOrgId.FNumber"; param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -2204,7 +2204,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FAPPROVEDATE - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2221,7 +2221,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); @@ -2270,7 +2270,7 @@ namespace WMS.Web.Domain.Services.Public //3.获取金蝶采购订单：拼接参数和条件 var query = new ErpBillQueryDto(token_result.Data); var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString()); - param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID + param.FieldKeys = "FBillNo,FSoorDerno,FStockOrgId,FCustomerID,FMaterialID.FNumber,FStockID.FNumber,FStockLocID,FSALUNITQTY,F_ENTRYREMARKS,FCreateDate,FEntity_FENTRYID,FStockOrgId.FNumber";//FEntryID param.Limit = 10000; //查询条件：备注其中的条件值以金蝶的值为准！！！ //1.创建时间在两天前和当天时间之间 @@ -2302,7 +2302,7 @@ namespace WMS.Web.Domain.Services.Public param.FilterString += " and FBillNo in (" + srt_b + ")"; } else//没有指定单号搜索 则带时间范围 FApproveDate - param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; + param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'"; query.Data = JsonConvert.SerializeObject(param); var json = JsonConvert.SerializeObject(query); @@ -2320,7 +2320,7 @@ namespace WMS.Web.Domain.Services.Public lis.SaleBillNo = item[1]; lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]); - lis.MaterialId = Convert.ToInt32(item[4]); + lis.MaterialNumber = item[4]; lis.StockCode = item[5]; lis.SubStockId = Convert.ToInt32(item[6]); lis.AccruedQty = Convert.ToDecimal(item[7]); diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 6ed5f088..568ec638 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -69,7 +69,7 @@ namespace WMS.Web.Domain.Services //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = entity.MaterialId, + MaterialNumber = entity.MaterialNumber, SerialNumber = entity.SerialNumber, OrgId = box.OrgId, SupplierId = box.SupplierId, @@ -134,7 +134,7 @@ namespace WMS.Web.Domain.Services //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = entity.MaterialId, + MaterialNumber = entity.MaterialNumber, SerialNumber = entity.SerialNumber, OrgId = box.OrgId, SupplierId = box.SupplierId, @@ -192,15 +192,15 @@ namespace WMS.Web.Domain.Services foreach (var entity in entityList) { var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); - var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); + var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); if (outstockDetail == null) continue; //修改序列号和箱绑定关系 - entity.OutStock(outStock, entity.MaterialId); + entity.OutStock(outStock, entity.MaterialNumber); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = entity.MaterialId, + MaterialNumber = entity.MaterialNumber, SerialNumber = entity.SerialNumber, OrgId = box.OrgId, SupplierId = box.SupplierId, @@ -211,7 +211,7 @@ namespace WMS.Web.Domain.Services }; if (outStock.Type == OutStockType.Sal) { - var detail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); + var detail = outStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var res_c = await _erpService.BillQueryForCustomer(); var customer = res_c.Data.FirstOrDefault(f => f.Id == outStock.ReceiptCustomerId); op.Remark += "\r\n" + "销售订单号:" + string.Join(",", detail.ErpDetails.Select(s => s.SaleBillNo)); @@ -321,7 +321,7 @@ namespace WMS.Web.Domain.Services { var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0; var box = boxList.FirstOrDefault(f => f.Id == boxId); - var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); + var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId); //修改序列号和箱绑定关系 entity.InStock(instockDetail.SourceBillNo, inStock.Type); @@ -330,7 +330,7 @@ namespace WMS.Web.Domain.Services //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = entity.MaterialId, + MaterialNumber = entity.MaterialNumber, SerialNumber = entity.SerialNumber, OrgId = box?.OrgId ?? 0, SupplierId = box?.SupplierId ?? 0, @@ -397,7 +397,7 @@ namespace WMS.Web.Domain.Services //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = entity.MaterialId, + MaterialNumber = entity.MaterialNumber, SerialNumber = entity.SerialNumber, OrgId = box.OrgId, SupplierId = box.SupplierId, @@ -457,17 +457,17 @@ namespace WMS.Web.Domain.Services if (takeStockDetail == null) continue; var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId); var s_entity = entityList.FirstOrDefault(f => f.SerialNumber.Equals(s)); - if (box != null && box.Details.FirstOrDefault(f => f.MaterialId == takeStockDetail.MaterialId) == null) + if (box != null && box.Details.FirstOrDefault(f => f.MaterialNumber == takeStockDetail.MaterialNumber) == null) { //如果这个物料不存在箱箱信息 添加进去 - box.TakeStock(takeStockDetail.MaterialId, takeStockDetail.AfterQty); + box.TakeStock(takeStockDetail.MaterialNumber, takeStockDetail.AfterQty); box_New_List.Add(box); } if (s_entity == null) { //序列号 - SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialId, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now); + SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now); sList.Add(s_new); } else @@ -479,7 +479,7 @@ namespace WMS.Web.Domain.Services //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { - MaterialId = takeStockDetail.MaterialId, + MaterialNumber = takeStockDetail.MaterialNumber, SerialNumber = s, OrgId = box.OrgId, SupplierId = box.SupplierId, diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 2c8b92d4..99b98620 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -89,11 +89,11 @@ namespace WMS.Web.Domain.Services TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); takeStock.Details = _mapper.Map>(profitList); - var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); + var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) { - var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); + var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; d.SubStockCode = subStock?.Code; @@ -110,11 +110,11 @@ namespace WMS.Web.Domain.Services TakeStock takeStock = new TakeStock(); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Details = _mapper.Map>(lossList); - var subIds = takeStock.Details.Select(s => s.SubStockId).ToList(); + var subIds = takeStock.Details.Select(s => s.SubStockCode).ToList(); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId); foreach (var d in takeStock.Details) { - var subStock = subStocks.FirstOrDefault(f => f.Id == d.SubStockId); + var subStock = subStocks.FirstOrDefault(f => f.Code == d.SubStockCode); d.OrgCode = subStock?.ErpOrgCode; d.StockCode = subStock?.StockCode; d.SubStockCode = subStock?.Code; @@ -243,7 +243,7 @@ namespace WMS.Web.Domain.Services var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode && f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId); decimal qty = erpInventory?.Qty ?? 0; - var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId); + var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialNumber); detils.Add(new ErpTakeStockDetailsSaveDto() { FOwnerid = new ErpNumberDto(d.OrgCode), diff --git a/src/WMS.Web.Repositories/BoxRepositories.cs b/src/WMS.Web.Repositories/BoxRepositories.cs index a98c762f..7f1efa92 100644 --- a/src/WMS.Web.Repositories/BoxRepositories.cs +++ b/src/WMS.Web.Repositories/BoxRepositories.cs @@ -68,15 +68,15 @@ namespace WMS.Web.Repositories var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync(); //获取物料信息 显示物料三件套 - var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialId).ToList(); + var mIds = list.SelectMany(s => s.Details).Select(s => s.MaterialNumber).ToList(); foreach (var r in resList) { foreach (var detail in r.Details) { - detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId); - detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId); - detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId); - detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialId == detail.MaterialId).Select(s => s.SerialNumber).ToList(); + detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber); + detail.MaterialNumber = detail.MaterialNumber; + detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber); + detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialNumber == detail.MaterialNumber).Select(s => s.SerialNumber).ToList(); } r.TotalQty = r.Details.Sum(s => s.Qty); } diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs index 75aa2cd2..295a901f 100644 --- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs @@ -149,10 +149,10 @@ namespace WMS.Web.Repositories query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); if (!string.IsNullOrEmpty(dto.DestBox)) query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); - if (dto.SrcSubStockId != null) - query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); - if (dto.DestSubStockId != null) - query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); + if (dto.SrcSubStockCode != null) + query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode); + if (dto.DestSubStockCode != null) + query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode); if (dto.CreateBeginDate != null) query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); if (dto.CreateEndDate != null) @@ -172,8 +172,8 @@ namespace WMS.Web.Repositories DestBox = s.destBox.BoxBillNo, Qty=s.changeBox.Qty, DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), - SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockId), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockId), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), CreateTime = s.changeBox.CreateTime.DateToStringSeconds() #endregion diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs index 9f0d9a82..f741195d 100644 --- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs +++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs @@ -161,10 +161,10 @@ namespace WMS.Web.Repositories .OrderByDescending(o => o.moveBox.Id) .Where(adv => 1 == 1); - if (dto.SrcSubStockId != null) - query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId); - if (dto.DestSubStockId != null) - query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId); + if (dto.SrcSubStockCode != null) + query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode); + if (dto.DestSubStockCode != null) + query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode); if (!string.IsNullOrEmpty(dto.Creator)) query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); if (!string.IsNullOrEmpty(dto.Box)) @@ -182,8 +182,8 @@ namespace WMS.Web.Repositories #region dto组装 BillNo = s.moveBox.BillNo, Box = s.box.BoxBillNo, - SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockId), - DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockId), + SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode), + DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode), Qty = s.moveBox.Qty, Type = s.moveBox.Type.GetRemark(), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId), diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 741c15c1..7e35aeca 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -198,7 +198,7 @@ namespace WMS.Web.Repositories MaterialNumber = s.detail.MaterialNumber, Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber), Qty = s.detail.Qty, - Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), + Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Remark = s.order.Remark #endregion diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs index 6cd7ca78..8d8e40f5 100644 --- a/src/WMS.Web.Repositories/TakeStockRepositories.cs +++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs @@ -257,9 +257,9 @@ namespace WMS.Web.Repositories #region dto组装 Id = s.order.Id, BillNo = s.order.BillNo, - Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), + Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockId), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.detail.SubStockCode), Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber), MaterialNumber = s.detail.MaterialNumber,