diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 82c73bc1..512b7390 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -590,6 +590,121 @@ 创建时间 + + + Erp同步数据时单据头 + + + + + 校验Json数据包是否重复传入,一旦重复传入,接口调用失败,默认false(非必录) + + + + + 单据体 + + + + + 盘点单 + + + + + 单据类型(标准盘亏单; 标准盘盈单) + + + + + 库存组织 (取仓库对应的库存组织) + + + + + 货主类型: 默认为业务组织 + + + + + 单据编号 + + + + + 盘点日期 + + + + + 明细 + + + + + 库存状态 + + + + + 货主类型: 默认为业务组织 + + + + + 取仓库对应的货主信息 + + + + + 保管者类型 + + + + + 保管者 + + + + + 物料ID + + + + + 单位ID + + + + + 仓库ID + + + + + 仓位ID + + + + + 盘点前数量(wms系统数量) + + + + + 盘点实际数量(实际仓库数量) + + + + + 盘点后数量 + + + + + 备注 + + 入库任务单-详情信息 diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpSave.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpSave.cs new file mode 100644 index 00000000..489e374b --- /dev/null +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpSave.cs @@ -0,0 +1,23 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Erp +{ + /// + /// Erp同步数据时单据头 + /// + public class ErpSave + { + /// + /// 校验Json数据包是否重复传入,一旦重复传入,接口调用失败,默认false(非必录) + /// + [JsonProperty("ValidateRepeatJson")] + public bool ValidateRepeatJson { get; set; } = false; + /// + /// 单据体 + /// + public T Model { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs new file mode 100644 index 00000000..c7e2edd4 --- /dev/null +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -0,0 +1,130 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Erp.TakeStock +{ + /// + /// 盘点单 + /// + public class ErpTakeStockSaveDto + { + /* + * 单据编号:FBillNo + 日期:FDate (必填项) + + 库存组织:FStockOrgId (必填项) + 单据类型:FBillTypeID (必填项) + 货主类型:FOwnerTypeIdHead (必填项) + + 物料编码:FMaterialId (必填项) + 单位:FUnitID (必填项) + 仓库:FStockId (必填项) + 库存状态:FStockStatusId (必填项) + 货主类型:FOwnerTypeId (必填项) + 货主:FOwnerid (必填项) + 保管者类型:FKeeperTypeId (必填项) + 保管者:FKeeperId (必填项) + 子仓库:FStockLocId + */ + /// + /// 单据类型(标准盘亏单; 标准盘盈单) + /// + [JsonProperty("FBillTypeID")] + public string Type { get; set; } + /// + /// 库存组织 (取仓库对应的库存组织) + /// + [JsonProperty("FStockOrgId")] + public string StockOrgId { get; set; } + /// + /// 货主类型: 默认为业务组织 + /// + [JsonProperty("FBillTypeID")] + public string FOwnerTypeIdHead { get; set; } + /// + /// 单据编号 + /// + [JsonProperty("FBillNo")] + public string BillNo { get; set; } + /// + /// 盘点日期 + /// + [JsonProperty("FDate")] + public DateTime Date { get; set; } + /// + /// 明细 + /// + [JsonProperty("FBillEntry")] + public List Details = new List(); + } + public class ErpTakeStockDetailsSaveDto + { + /// + /// 库存状态 + /// + [JsonProperty("FStockStatusId")] + public int FStockStatusId { get; set; } + /// + /// 货主类型: 默认为业务组织 + /// + [JsonProperty("FOwnerTypeId")] + public int FOwnerTypeId { get; set; } + /// + /// 取仓库对应的货主信息 + /// + [JsonProperty("FOwnerid")] + public int FOwnerid { get; set; } + /// + /// 保管者类型 + /// + [JsonProperty("FKeeperTypeId")] + public int FKeeperTypeId { get; set; } + /// + /// 保管者 + /// + [JsonProperty("FKeeperId")] + public int FKeeperId { get; set; } + /// + /// 物料ID + /// + [JsonProperty("FMaterialId")] + public int MaterialId { get; set; } + /// + /// 单位ID + /// + [JsonProperty("FUnitID")] + public int UnitId { get; set; } + /// + /// 仓库ID + /// + [JsonProperty("FStockId")] + public int StockId { get; set; } + /// + /// 仓位ID + /// + [JsonProperty("FStockLocId")] + public int SubStockId { get; set; } + /// + /// 盘点前数量(wms系统数量) + /// + [JsonProperty("FAcctQty")] + public decimal BeforeQty { get; set; } + /// + /// 盘点实际数量(实际仓库数量) + /// + [JsonProperty("FCountQty")] + public decimal AfterQty { get; set; } + /// + /// 盘点后数量 + /// + [JsonProperty("FGainQty")] + public decimal FinalQty { get; set; } + /// + /// 备注 + /// + [JsonProperty("Fnote")] + public string Fnote { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs index 13bb71b0..0e0a4201 100644 --- a/src/WMS.Web.Domain/Services/TakeStockService.cs +++ b/src/WMS.Web.Domain/Services/TakeStockService.cs @@ -43,7 +43,7 @@ namespace WMS.Web.Domain.Services public async Task Save(List dto, LoginInDto loginInfo) { TakeStock entity = new TakeStock(); - entity.Details = _mapper.Map>(dto); + //entity.Details = _mapper.Map>(dto); entity.Create(loginInfo.UserInfo.StaffId); //需要填写序列号