18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化合并

Browse Source
This commit is contained in:
tongfei
2024-03-18 11:05:03 +08:00
parent 896450fd23 5621ae5a83
commit 9ad272b956
25 changed files with 176 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

4
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1217,9 +1217,9 @@
对应金蝶单据明细id(销售出库同步金蝶下推使用) 对应金蝶单据明细id(销售出库同步金蝶下推使用)
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.MaterialId"> <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.MaterialNumber">
<summary> <summary>
物料Id 物料编码
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockCode"> <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockCode">

16
src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
View File

@@ -17,14 +17,22 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
/// 目标箱子 /// 目标箱子
/// </summary> /// </summary>
public string DestBox { get; set; } public string DestBox { get; set; }
///// <summary>
///// 原仓位ID
///// </summary>
//public int? SrcSubStockId { get; set; }
///// <summary>
///// 现仓位ID
///// </summary>
//public int? DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位ID /// 原仓位编码
/// </summary> /// </summary>
public int? SrcSubStockId { get; set; } public string SrcSubStockCode { get; set; }
/// <summary> /// <summary>
/// 现仓位ID /// 现仓位编码
/// </summary> /// </summary>
public int? DestSubStockId { get; set; } public string DestSubStockCode { get; set; }
/// <summary> /// <summary>
/// 操作人 /// 操作人
/// </summary> /// </summary>

8
src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs
View File

@@ -33,10 +33,14 @@ namespace WMS.Web.Core.Dto.Erp.OutStock
/// 对应金蝶单据明细id(销售出库同步金蝶下推使用) /// 对应金蝶单据明细id(销售出库同步金蝶下推使用)
/// </summary> /// </summary>
public int Erp_DetailId { get; set; } = 0; public int Erp_DetailId { get; set; } = 0;
///// <summary>
///// 物料Id
/////</summary>
//public int MaterialId { get; set; }
/// <summary> /// <summary>
/// 物料Id /// 物料编码
///</summary> ///</summary>
public int MaterialId { get; set; } public string MaterialNumber { get; set; }
/// <summary> /// <summary>
/// 仓库ID /// 仓库ID
///</summary> ///</summary>

12
src/WMS.Web.Core/Dto/MoveBoxRecord/MoveBoxRecordQueryRequest.cs
View File

@@ -9,14 +9,22 @@ namespace WMS.Web.Core.Dto.MoveBoxRecord
/// </summary> /// </summary>
public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto public class MoveBoxRecordQueryRequest : PaginationBaseRequestDto
{ {
///// <summary>
///// 原仓位编码
///// </summary>
//public int? SrcSubStockId { get; set; }
///// <summary>
///// 目标仓位编码
///// </summary>
//public int? DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位编码 /// 原仓位编码
/// </summary> /// </summary>
public int? SrcSubStockId { get; set; } public string SrcSubStockCode { get; set; }
/// <summary> /// <summary>
/// 目标仓位编码 /// 目标仓位编码
/// </summary> /// </summary>
public int? DestSubStockId { get; set; } public string DestSubStockCode { get; set; }
/// <summary> /// <summary>
/// 类型：1- 整箱移货上级，2-整箱移货下级 /// 类型：1- 整箱移货上级，2-整箱移货下级
/// </summary> /// </summary>

6
src/WMS.Web.Domain/Entitys/Box.cs
View File

@@ -172,7 +172,7 @@ namespace WMS.Web.Domain.Entitys
foreach (var d in detailClone) 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) if (inventoryDetail == null)
{ {
var boxDetail = this.Details.FirstOrDefault(f => f.Id == d.Id); 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) 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) 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 else
md.Qty = d.Qty; md.Qty = d.Qty;
} }

20
src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs
View File

@@ -54,11 +54,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("DestBoxId")] [Column("DestBoxId")]
public int DestBoxId { get; set; } public int DestBoxId { get; set; }
/// <summary> ///// <summary>
/// 原箱仓位 ///// 原箱仓位
///</summary> /////</summary>
[Column("SrcSubStockId")] //[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; } //public int SrcSubStockId { get; set; }
/// <summary> /// <summary>
/// 原箱仓位 /// 原箱仓位
///</summary> ///</summary>
@@ -69,11 +69,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("DestStockCode")] [Column("DestStockCode")]
public string DestStockCode { get; set; } public string DestStockCode { get; set; }
/// <summary> ///// <summary>
/// 目标箱仓位或重新上架选择仓位 ///// 目标箱仓位或重新上架选择仓位
///</summary> /////</summary>
[Column("DestSubStockId")] //[Column("DestSubStockId")]
public int DestSubStockId { get; set; } //public int DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 目标箱仓位或重新上架选择仓位 /// 目标箱仓位或重新上架选择仓位
///</summary> ///</summary>

26
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -40,16 +40,16 @@ namespace WMS.Web.Domain.Entitys
///</summary> ///</summary>
[Column("StockCode")] [Column("StockCode")]
public string StockCode { get; set; } public string StockCode { get; set; }
/// <summary> ///// <summary>
/// 原仓位Id ///// 原仓位Id
/// </summary> ///// </summary>
[Column("SrcSubStockId")] //[Column("SrcSubStockId")]
public int SrcSubStockId { get; set; } //public int SrcSubStockId { get; set; }
/// <summary> ///// <summary>
/// 目标仓位Id ///// 目标仓位Id
/// </summary> ///// </summary>
[Column("DestSubStockId")] //[Column("DestSubStockId")]
public int DestSubStockId { get; set; } //public int DestSubStockId { get; set; }
/// <summary> /// <summary>
/// 原仓位编码 /// 原仓位编码
/// </summary> /// </summary>
@@ -89,14 +89,14 @@ namespace WMS.Web.Domain.Entitys
/// 创建 /// 创建
/// </summary> /// </summary>
/// <param name="creatorId"></param> /// <param name="creatorId"></param>
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.BoxId = boxId;
this.Type = type; this.Type = type;
this.OrgCode = orgCode; this.OrgCode = orgCode;
this.StockCode = stockCode; this.StockCode = stockCode;
SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值 //SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值
DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0 //DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0
SrcSubStockCode = type == MoveBoxType.Up ? "" : subStockCode;//上架 原仓位是0 目标仓位有值 SrcSubStockCode = type == MoveBoxType.Up ? "" : subStockCode;//上架 原仓位是0 目标仓位有值
DestSubStockCode = type == MoveBoxType.Up ? subStockCode : ""; //下架 原仓位有值 目标仓位是0 DestSubStockCode = type == MoveBoxType.Up ? subStockCode : ""; //下架 原仓位有值 目标仓位是0
this.Qty = qty; this.Qty = qty;

10
src/WMS.Web.Domain/Entitys/OutStockBoxsDetails.cs
View File

@@ -34,11 +34,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("SerialNumbers")] [Column("SerialNumbers")]
public List<string> SerialNumbers { get; set; } = new List<string>(); public List<string> SerialNumbers { get; set; } = new List<string>();
/// <summary> ///// <summary>
/// 仓位 ///// 仓位
///</summary> /////</summary>
[Column("SubStockId")] //[Column("SubStockId")]
public int SubStockId { get; set; } //public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 仓位 /// 仓位
/// </summary> /// </summary>

8
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -99,17 +99,17 @@ namespace WMS.Web.Domain.Entitys
/// <summary> /// <summary>
/// 出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量) /// 出库 反写 任务单(返回 这个物料下面的来源单号出了多少数量)
/// </summary> /// </summary>
/// <param name="materialId"></param> /// <param name="materialNumber"></param>
/// <param name="qty"></param> /// <param name="qty"></param>
/// <returns></returns> /// <returns></returns>
public Result<List<(int erpDetailId, decimal qty)>> OutStock(int materialId, decimal qty, int outStockId) public Result<List<(int erpDetailId, decimal qty)>> OutStock(string materialNumber, decimal qty, int outStockId)
{ {
if (this.Status == OutStockStatus.Already) if (this.Status == OutStockStatus.Already)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskAlready); return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskAlready);
if (this.Status == OutStockStatus.Repeal) if (this.Status == OutStockStatus.Repeal)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockTaskRepeal); return Result<List<(int erpDetailId, decimal qty)>>.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<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OrderNoData); if (detail == null) return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OrderNoData);
if ((detail.AccruedQty - detail.RealityQty) < qty) if ((detail.AccruedQty - detail.RealityQty) < qty)
return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockQtyError); return Result<List<(int erpDetailId, decimal qty)>>.ReFailure(ResultCodes.OutStockQtyError);
@@ -221,7 +221,7 @@ namespace WMS.Web.Domain.Entitys
{ {
d.Id = 0; d.Id = 0;
d.Fid = 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) if (detail_new != null)
{ {
detail_new.AccruedQty += d.AccruedQty;//应出数量累加 detail_new.AccruedQty += d.AccruedQty;//应出数量累加

10
src/WMS.Web.Domain/Entitys/TakeStockDetails.cs
View File

@@ -50,11 +50,11 @@ namespace WMS.Web.Domain.Entitys
/// </summary> /// </summary>
[Column("StockCode")] [Column("StockCode")]
public string StockCode { get; set; } public string StockCode { get; set; }
/// <summary> ///// <summary>
/// 仓位 ///// 仓位
/// </summary> ///// </summary>
[Column("SubStockId")] //[Column("SubStockId")]
public int SubStockId { get; set; } //public int SubStockId { get; set; }
/// <summary> /// <summary>
/// 仓位 /// 仓位
/// </summary> /// </summary>

2
src/WMS.Web.Domain/QuartzJob/BoxQuartzJob.cs
View File

@@ -39,7 +39,7 @@ namespace WMS.Web.Domain.QuartzJob
var result = await _boxService.Sync(); var result = await _boxService.Sync();
//5.记录：结束时间 //5.记录：结束时间
var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"箱信息-同步箱信息数据：执行结束时间->{begindatetime}"); _logger.LogInformation($"箱信息-同步箱信息数据：执行结束时间->{enddatetime}");
} }
catch (Exception ex) catch (Exception ex)

2
src/WMS.Web.Domain/QuartzJob/OutStockOrderQuartzJob.cs
View File

@@ -53,7 +53,7 @@ namespace WMS.Web.Domain.QuartzJob
var result = await _outStockTaskService.Sync(null, begin); var result = await _outStockTaskService.Sync(null, begin);
//5.记录：结束时间 //5.记录：结束时间
var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"); var enddatetime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
_logger.LogInformation($"出库单-同步金蝶出库单数据：执行结束时间->{begindatetime}"); _logger.LogInformation($"出库单-同步金蝶出库单数据：执行结束时间->{enddatetime}");
} }
catch (Exception ex) catch (Exception ex)

10
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -168,11 +168,11 @@ namespace WMS.Web.Domain.Services
{ {
ChangeBoxRecord entity = new ChangeBoxRecord(); ChangeBoxRecord entity = new ChangeBoxRecord();
entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId); entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialNumber, d.SerialNumbers, dt.SrcBoxId, dt.DestBoxId);
entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取 //entity.SrcSubStockId = boxi?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockCode = subStock_s?.Code ?? ""; entity.SrcSubStockCode = subStock_s?.Code ?? "";//原乡仓位需要去拉一下库存获取
if (subStock != null) if (subStock != null)
{ {
entity.DestSubStockId = dt.SubStockId; //entity.DestSubStockId = dt.SubStockId;
entity.DestBoxOrgCode = subStock.ErpOrgCode; entity.DestBoxOrgCode = subStock.ErpOrgCode;
entity.DestStockCode = subStock.StockCode; entity.DestStockCode = subStock.StockCode;
entity.DestSubStockCode = subStock.Code; entity.DestSubStockCode = subStock.Code;
@@ -278,9 +278,9 @@ namespace WMS.Web.Domain.Services
List<MoveBoxRecord> entityList = new List<MoveBoxRecord>(); List<MoveBoxRecord> entityList = new List<MoveBoxRecord>();
foreach (var d in dto) 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(); 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() entity.Details = d.Details.Select(s => new MoveBoxRecordDetails()
{ {
MaterialNumber = s.MaterialNumber, MaterialNumber = s.MaterialNumber,

4
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -134,7 +134,7 @@ namespace WMS.Web.Domain.Services
foreach (var b in boxInventoryDetails) foreach (var b in boxInventoryDetails)
{ {
var num = boxInventoryDetails.Where(w => w.MaterialId == b.MaterialId).Sum(s => s.Qty); 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 (taskDetail == null) return Result.ReFailure(ResultCodes.BoxOutStockTaskMaterialError);
//箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库 //箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库
if (num > (taskDetail.AccruedQty - taskDetail.RealityQty)) if (num > (taskDetail.AccruedQty - taskDetail.RealityQty))
@@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services
if (box == null) return Result.ReFailure(ResultCodes.BoxNoData); if (box == null) return Result.ReFailure(ResultCodes.BoxNoData);
var dtod = _mapper.Map<SaveOutStockDetailsRequest>(b); var dtod = _mapper.Map<SaveOutStockDetailsRequest>(b);
dtod.BoxId = box.BoxId; dtod.BoxId = box.BoxId;
dtod.SubStockId = box.SubStockId; dtod.SubStockCode = box.SubStockCode;
dto.Details.Add(dtod); dto.Details.Add(dtod);
} }
} }

8
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -114,7 +114,7 @@ namespace WMS.Web.Domain.Services
foreach (var erp in erps) 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) 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); 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的实体明细中 //给到dto的实体明细中
foreach (var mid in mIds) 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<OutStockTaskDetails>(emList.First()); var detail = _mapper.Map<OutStockTaskDetails>(emList.First());
var erpDetail = _mapper.Map<List<OutStockTaskErpDetails>>(emList); var erpDetail = _mapper.Map<List<OutStockTaskErpDetails>>(emList);
detail.ErpDetails.AddRange(erpDetail); 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(); var erp_o = erp_list.Where(w => w.SourceBillNo == ed.SourceBillNo).ToList();
if (erp_o.Count() == 0) continue; 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) if (erp_d.Count() == 0)
{ {
//金蝶删除明细数据后 wms对应数据修改为0 //金蝶删除明细数据后 wms对应数据修改为0

36
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -161,7 +161,20 @@ namespace WMS.Web.Domain.Services.Public
} }
return mat.BaseUnitName; return mat.BaseUnitName;
} }
public string GetMaterialUnitName(List<ErpMaterialDto> 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;
}
/// <summary> /// <summary>
/// 获取物料基本单位名称 /// 获取物料基本单位名称
/// </summary> /// </summary>
@@ -265,7 +278,26 @@ namespace WMS.Web.Domain.Services.Public
} }
return mat.BaseUnitNumber; return mat.BaseUnitNumber;
} }
/// <summary>
/// 获取物料基本单位编码
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialUnitNumber(List<ErpMaterialDto> 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;
}
/// <summary> /// <summary>
/// 获取组织名称 /// 获取组织名称
/// </summary> /// </summary>

42
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1698,7 +1698,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1731,7 +1731,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FApproveDate else//没有指定单号搜索 则带时间范围 FApproveDate
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -1749,7 +1749,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1794,7 +1794,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1826,7 +1826,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FApproveDate else//没有指定单号搜索 则带时间范围 FApproveDate
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -1843,7 +1843,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1888,7 +1888,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -1920,7 +1920,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FApproveDate else//没有指定单号搜索 则带时间范围 FApproveDate
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -1937,7 +1937,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -1982,7 +1982,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2014,7 +2014,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FAPPROVEDATE else//没有指定单号搜索 则带时间范围 FAPPROVEDATE
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -2031,7 +2031,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2076,7 +2076,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2108,7 +2108,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FApproveDate else//没有指定单号搜索 则带时间范围 FApproveDate
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -2125,7 +2125,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2170,7 +2170,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2204,7 +2204,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FAPPROVEDATE else//没有指定单号搜索 则带时间范围 FAPPROVEDATE
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FAPPROVEDATE>='" + beginStr + "' and FAPPROVEDATE<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -2221,7 +2221,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);
@@ -2270,7 +2270,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件 //3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data); var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_OUTSTOCK.ToString()); 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; param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！ //查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间 //1.创建时间在两天前和当天时间之间
@@ -2302,7 +2302,7 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString += " and FBillNo in (" + srt_b + ")"; param.FilterString += " and FBillNo in (" + srt_b + ")";
} }
else//没有指定单号搜索 则带时间范围 FApproveDate else//没有指定单号搜索 则带时间范围 FApproveDate
param.FilterString += " and FCreateDate>='" + beginStr + "' and FCreateDate<='" + endStr + "'"; param.FilterString += " and FApproveDate>='" + beginStr + "' and FApproveDate<='" + endStr + "'";
query.Data = JsonConvert.SerializeObject(param); query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query); var json = JsonConvert.SerializeObject(query);
@@ -2320,7 +2320,7 @@ namespace WMS.Web.Domain.Services.Public
lis.SaleBillNo = item[1]; lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]); lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]); lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]); lis.MaterialNumber = item[4];
lis.StockCode = item[5]; lis.StockCode = item[5];
lis.SubStockId = Convert.ToInt32(item[6]); lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]); lis.AccruedQty = Convert.ToDecimal(item[7]);

26
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -69,7 +69,7 @@ namespace WMS.Web.Domain.Services
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,
@@ -134,7 +134,7 @@ namespace WMS.Web.Domain.Services
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,
@@ -192,15 +192,15 @@ namespace WMS.Web.Domain.Services
foreach (var entity in entityList) foreach (var entity in entityList)
{ {
var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); 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; if (outstockDetail == null) continue;
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.OutStock(outStock, entity.MaterialId); entity.OutStock(outStock, entity.MaterialNumber);
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,
@@ -211,7 +211,7 @@ namespace WMS.Web.Domain.Services
}; };
if (outStock.Type == OutStockType.Sal) 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 res_c = await _erpService.BillQueryForCustomer();
var customer = res_c.Data.FirstOrDefault(f => f.Id == outStock.ReceiptCustomerId); var customer = res_c.Data.FirstOrDefault(f => f.Id == outStock.ReceiptCustomerId);
op.Remark += "\r\n" + "销售订单号:" + string.Join(",", detail.ErpDetails.Select(s => s.SaleBillNo)); 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 boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId); 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); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId);
//修改序列号和箱绑定关系 //修改序列号和箱绑定关系
entity.InStock(instockDetail.SourceBillNo, inStock.Type); entity.InStock(instockDetail.SourceBillNo, inStock.Type);
@@ -330,7 +330,7 @@ namespace WMS.Web.Domain.Services
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box?.OrgId ?? 0, OrgId = box?.OrgId ?? 0,
SupplierId = box?.SupplierId ?? 0, SupplierId = box?.SupplierId ?? 0,
@@ -397,7 +397,7 @@ namespace WMS.Web.Domain.Services
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = entity.MaterialId, MaterialNumber = entity.MaterialNumber,
SerialNumber = entity.SerialNumber, SerialNumber = entity.SerialNumber,
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,
@@ -457,17 +457,17 @@ namespace WMS.Web.Domain.Services
if (takeStockDetail == null) continue; if (takeStockDetail == null) continue;
var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId); var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId);
var s_entity = entityList.FirstOrDefault(f => f.SerialNumber.Equals(s)); 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); box_New_List.Add(box);
} }
if (s_entity == null) 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); sList.Add(s_new);
} }
else else
@@ -479,7 +479,7 @@ namespace WMS.Web.Domain.Services
//记录序列号操作日志 //记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate() SerialNumberOperate op = new SerialNumberOperate()
{ {
MaterialId = takeStockDetail.MaterialId, MaterialNumber = takeStockDetail.MaterialNumber,
SerialNumber = s, SerialNumber = s,
OrgId = box.OrgId, OrgId = box.OrgId,
SupplierId = box.SupplierId, SupplierId = box.SupplierId,

10
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -89,11 +89,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Profit);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(profitList); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(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); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) 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.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode; d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code; d.SubStockCode = subStock?.Code;
@@ -110,11 +110,11 @@ namespace WMS.Web.Domain.Services
TakeStock takeStock = new TakeStock(); TakeStock takeStock = new TakeStock();
takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss); takeStock.Create(loginInfo.UserInfo.StaffId, TakeStockType.Loss);
takeStock.Details = _mapper.Map<List<TakeStockDetails>>(lossList); takeStock.Details = _mapper.Map<List<TakeStockDetails>>(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); var subStocks = await _transactionRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
foreach (var d in takeStock.Details) 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.OrgCode = subStock?.ErpOrgCode;
d.StockCode = subStock?.StockCode; d.StockCode = subStock?.StockCode;
d.SubStockCode = subStock?.Code; 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 var erpInventory = res_s.Data.FirstOrDefault(f => f.MaterialNumber == number && f.StockCode == d.StockCode
&& f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId); && f.OrgCode == d.OrgCode && f.Erp_SubStockId == subStockId);
decimal qty = erpInventory?.Qty ?? 0; decimal qty = erpInventory?.Qty ?? 0;
var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId); var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialNumber);
detils.Add(new ErpTakeStockDetailsSaveDto() detils.Add(new ErpTakeStockDetailsSaveDto()
{ {
FOwnerid = new ErpNumberDto(d.OrgCode), FOwnerid = new ErpNumberDto(d.OrgCode),

10
src/WMS.Web.Repositories/BoxRepositories.cs
View File

@@ -68,15 +68,15 @@ namespace WMS.Web.Repositories
var serialList = await _context.SerialNumbers.Where(f => ids.Contains(f.BoxId)).ToListAsync(); 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 r in resList)
{ {
foreach (var detail in r.Details) foreach (var detail in r.Details)
{ {
detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialId); detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, detail.MaterialNumber);
detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, detail.MaterialId); detail.MaterialNumber = detail.MaterialNumber;
detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialId); detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, detail.MaterialNumber);
detail.SerialNumbers = serialList.Where(w => w.BoxId == r.Id && w.MaterialId == detail.MaterialId).Select(s => s.SerialNumber).ToList(); 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); r.TotalQty = r.Details.Sum(s => s.Qty);
} }

12
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -149,10 +149,10 @@ namespace WMS.Web.Repositories
query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%")); query = query.Where(w => EF.Functions.Like(w.srcBox.BoxBillNo, "%" + dto.SrcBox + "%"));
if (!string.IsNullOrEmpty(dto.DestBox)) if (!string.IsNullOrEmpty(dto.DestBox))
query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%")); query = query.Where(w => EF.Functions.Like(w.destBox.BoxBillNo, "%" + dto.DestBox + "%"));
if (dto.SrcSubStockId != null) if (dto.SrcSubStockCode != null)
query = query.Where(w => w.changeBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.changeBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockId != null) if (dto.DestSubStockCode != null)
query = query.Where(w => w.changeBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.changeBox.DestSubStockCode == dto.DestSubStockCode);
if (dto.CreateBeginDate != null) if (dto.CreateBeginDate != null)
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate); query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
if (dto.CreateEndDate != null) if (dto.CreateEndDate != null)
@@ -172,8 +172,8 @@ namespace WMS.Web.Repositories
DestBox = s.destBox.BoxBillNo, DestBox = s.destBox.BoxBillNo,
Qty=s.changeBox.Qty, Qty=s.changeBox.Qty,
DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode), DestBoxOrg= _singleDataService.GetSingleData(SingleAction.Orgs, companyId, s.changeBox.DestBoxOrgCode),
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.changeBox.DestSubStockCode),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.changeBox.CreatorId),
CreateTime = s.changeBox.CreateTime.DateToStringSeconds() CreateTime = s.changeBox.CreateTime.DateToStringSeconds()
#endregion #endregion

12
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -161,10 +161,10 @@ namespace WMS.Web.Repositories
.OrderByDescending(o => o.moveBox.Id) .OrderByDescending(o => o.moveBox.Id)
.Where(adv => 1 == 1); .Where(adv => 1 == 1);
if (dto.SrcSubStockId != null) if (dto.SrcSubStockCode != null)
query = query.Where(w => w.moveBox.SrcSubStockId == dto.SrcSubStockId); query = query.Where(w => w.moveBox.SrcSubStockCode == dto.SrcSubStockCode);
if (dto.DestSubStockId != null) if (dto.DestSubStockCode != null)
query = query.Where(w => w.moveBox.DestSubStockId == dto.DestSubStockId); query = query.Where(w => w.moveBox.DestSubStockCode == dto.DestSubStockCode);
if (!string.IsNullOrEmpty(dto.Creator)) if (!string.IsNullOrEmpty(dto.Creator))
query = query.Where(w => ids.Contains(w.moveBox.CreatorId)); query = query.Where(w => ids.Contains(w.moveBox.CreatorId));
if (!string.IsNullOrEmpty(dto.Box)) if (!string.IsNullOrEmpty(dto.Box))
@@ -182,8 +182,8 @@ namespace WMS.Web.Repositories
#region dto组装 #region dto组装
BillNo = s.moveBox.BillNo, BillNo = s.moveBox.BillNo,
Box = s.box.BoxBillNo, Box = s.box.BoxBillNo,
SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockId), SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.SrcSubStockCode),
DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockId), DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.moveBox.DestSubStockCode),
Qty = s.moveBox.Qty, Qty = s.moveBox.Qty,
Type = s.moveBox.Type.GetRemark(), Type = s.moveBox.Type.GetRemark(),
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId), Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.moveBox.CreatorId),

2
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -198,7 +198,7 @@ namespace WMS.Web.Repositories
MaterialNumber = s.detail.MaterialNumber, MaterialNumber = s.detail.MaterialNumber,
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
Qty = s.detail.Qty, Qty = s.detail.Qty,
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
Remark = s.order.Remark Remark = s.order.Remark
#endregion #endregion

4
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -257,9 +257,9 @@ namespace WMS.Web.Repositories
#region dto组装 #region dto组装
Id = s.order.Id, Id = s.order.Id,
BillNo = s.order.BillNo, 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), 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), Erp_SubStock = _erpBasicDataExtendService.GetSubStockName(subStocks, s.detail.Erp_SubStockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber), MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialNumber),
MaterialNumber = s.detail.MaterialNumber, MaterialNumber = s.detail.MaterialNumber,