diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index e62790db..b810d7a0 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.Core/Dto/Erp/Stock/ErpStockDto.cs b/src/WMS.Web.Core/Dto/Erp/Stock/ErpStockDto.cs new file mode 100644 index 00000000..900f00a5 --- /dev/null +++ b/src/WMS.Web.Core/Dto/Erp/Stock/ErpStockDto.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.Erp +{ + /// + /// 仓库信息 + /// + public class ErpStockDto + { + /// + /// id + /// + public int Id { get; set; } + /// + /// 编码 + /// + public string Code { get; set; } + /// + /// 名字 + /// + public string Name { get; set; } + /// + /// 业务组织(使用组织)编码 + /// + public string OrgCode { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs index c7e2edd4..d2e42ee0 100644 --- a/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/TakeStock/ErpTakeStockSaveDto.cs @@ -10,26 +10,29 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock /// public class ErpTakeStockSaveDto { + + public ErpTakeStockSaveDto() { } /* * 单据编号：FBillNo 日期：FDate (必填项) 库存组织：FStockOrgId (必填项) 单据类型：FBillTypeID (必填项) - 货主类型：FOwnerTypeIdHead (必填项) + 货主类型：FOwnerTypeIdHead (必填项) BD_OwnerOrg 物料编码：FMaterialId (必填项) 单位：FUnitID (必填项) 仓库：FStockId (必填项) 库存状态：FStockStatusId (必填项) - 货主类型：FOwnerTypeId (必填项) - 货主：FOwnerid (必填项) - 保管者类型：FKeeperTypeId (必填项) + 货主类型：FOwnerTypeId (必填项) BD_OwnerOrg + 货主：FOwnerid (必填项) + 保管者类型：FKeeperTypeId (必填项) BD_KeeperOrg 保管者：FKeeperId (必填项) 子仓库：FStockLocId */ + /// - /// 单据类型(标准盘亏单; 标准盘盈单) + /// 单据类型(标准盘亏单; 标准盘盈单 PY01_SYS) 盘亏 PK01_SYS /// [JsonProperty("FBillTypeID")] public string Type { get; set; } @@ -39,10 +42,10 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock [JsonProperty("FStockOrgId")] public string StockOrgId { get; set; } /// - /// 货主类型: 默认为业务组织 + /// 货主类型: 默认为业务组织 BD_OwnerOrg /// [JsonProperty("FBillTypeID")] - public string FOwnerTypeIdHead { get; set; } + public string FOwnerTypeIdHead { get; set; } = "BD_OwnerOrg"; /// /// 单据编号 /// @@ -62,50 +65,50 @@ namespace WMS.Web.Core.Dto.Erp.TakeStock public class ErpTakeStockDetailsSaveDto { /// - /// 库存状态 + /// 库存状态 KCZT001 /// [JsonProperty("FStockStatusId")] - public int FStockStatusId { get; set; } - /// - /// 货主类型: 默认为业务组织 + public string FStockStatusId { get; set; } = "KCZT001"; + /// + /// 货主类型: 默认为业务组织 BD_OwnerOrg /// [JsonProperty("FOwnerTypeId")] - public int FOwnerTypeId { get; set; } + public string FOwnerTypeId { get; set; } = "BD_OwnerOrg"; /// - /// 取仓库对应的货主信息 + /// 取仓库对应的货主信息 货主: 等于库存组织 /// [JsonProperty("FOwnerid")] - public int FOwnerid { get; set; } + public string FOwnerid { get; set; } /// /// 保管者类型 /// [JsonProperty("FKeeperTypeId")] - public int FKeeperTypeId { get; set; } + public string FKeeperTypeId { get; set; } = "BD_KeeperOrg"; /// - /// 保管者 + /// 保管者 仓库”库存组织” /// [JsonProperty("FKeeperId")] - public int FKeeperId { get; set; } + public string FKeeperId { get; set; } /// /// 物料ID /// [JsonProperty("FMaterialId")] - public int MaterialId { get; set; } + public string MaterialId { get; set; } /// /// 单位ID /// [JsonProperty("FUnitID")] - public int UnitId { get; set; } + public string UnitId { get; set; } /// /// 仓库ID /// [JsonProperty("FStockId")] - public int StockId { get; set; } + public string StockId { get; set; } /// /// 仓位ID /// [JsonProperty("FStockLocId")] - public int SubStockId { get; set; } + public string SubStockId { get; set; } /// /// 盘点前数量（wms系统数量） /// diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index 13ee7789..093c61e7 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; +using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Internal.Results; @@ -21,5 +22,11 @@ namespace WMS.Web.Domain.IService.Public /// /// Task> BillQueryForOrg(); + + /// + /// 获取仓库信息 + /// + /// + Task> BillQueryForStock(); } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 7334b330..ef7d12cf 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -178,5 +178,45 @@ namespace WMS.Web.Domain.Services.Public return ResultList.ReFailure("错误", 10002); } } + /// + /// 获取使用组织 + /// + /// + public async Task> BillQueryForStock() + { + try + { + var token_result = await this.Init(); + if (!token_result.IsSuccess) + return ResultList.ReFailure(token_result); + var query = new ErpBillQueryDto(token_result.Data); + var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString()); + param.FieldKeys = "FStockId,FName,FNumber,FUseOrgId"; + param.FilterString = "";//FOrgID=100008 + query.Data = JsonConvert.SerializeObject(param); + var json = JsonConvert.SerializeObject(query); + + var result_json = await _client.ExecuteBillQueryAsync(json); + var result = JsonConvert.DeserializeObject>>(result_json); + + var list = new List(); + foreach (var item in result) + { + var lis = new ErpStockDto(); + lis.Id = int.Parse(item[0]); + lis.Name = item[1]; + lis.Code = item[2]; + lis.OrgCode = item[3]; + list.Add(lis); + + } + return ResultList.ReSuccess(list); + + } + catch (Exception) + { + return ResultList.ReFailure("错误", 10002); + } + } } } diff --git a/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs b/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs index e04a2237..3c59312a 100644 --- a/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs +++ b/src/WMS.Web.Domain/Values/Erp/FormIdParam.cs @@ -41,5 +41,9 @@ namespace WMS.Web.Domain.Values.Erp /// 供应商 /// BD_Supplier=8, + /// + /// 仓库 + /// + BD_STOCK=9 } }