diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index ad9e5609..c9311ffc 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -500,51 +500,6 @@ 名称 - - - erp:组装拆卸单-响应对象 - - - - - 单据编号 - - - - - 成品货主和子件货主 - - - - - 物料ID - - - - - 仓库 - - - - - 仓库编码 - - - - - 数量 - - - - - 创建日期 - - - - - 备注 - - ERP：单据查询-dto @@ -670,51 +625,6 @@ 单据类型 - - - erp:其他入库单 - - - - - 单据编号 - - - - - 库存组织 - - - - - 物料ID - - - - - 收货仓库ID - - - - - 收货仓库-code - - - - - 实收数量 - - - - - 创建时间 - - - - - 备注 - - erp 提交和审核 @@ -770,96 +680,6 @@ 单据体 - - - erp:直接调拨单-入库 - - - - - 编号 - - - - - 调入库存组织 - - - - - 物料ID - - - - - 调入仓库ID - - - - - 调入仓库编码 - - - - - 调拨数量 - - - - - 创建时间 - - - - - 明细备注 - - - - - erp：分步式调入单-响应对象 - - - - - 单据编号 - - - - - 库存组织 - - - - - 物料ID - - - - - 调入仓库ID - - - - - 调入仓库code - - - - - 调入数量 - - - - - 明细备注 - - - - - 创建时间 - - 对应金蝶，物料信息 @@ -1080,76 +900,6 @@ 名字 - - - erp-采购入库-返回数据源 - - - - - 采购订单号 - - - - - 供应商 - - - - - 采购组织 - - - - - 规则型号 - - - - - 物料名称 - - - - - 物料ID - - - - - 仓库ID - - - - - 采购数量 - - - - - 明细备注 - - - - - 创建时间 - - - - - 出厂价格 - - - - - 仓库编码 - - - - - 已交数量 - - 仓库信息 diff --git a/src/WMS.Web.Core/Dto/Erp/ErpAssembledAppDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpAssembledAppDto.cs deleted file mode 100644 index 66d783a9..00000000 --- a/src/WMS.Web.Core/Dto/Erp/ErpAssembledAppDto.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Dto.Erp -{ - /// - /// erp:组装拆卸单-响应对象 - /// - public class ErpAssembledAppDto - { - /// - /// 单据编号 - /// - public string BillNo { get; set; } - - /// - /// 成品货主和子件货主 - /// - public int OrgId { get; set; } - - /// - /// 物料ID - /// - public int MaterialId { get; set; } - - /// - /// 仓库 - /// - public int StockId { get; set; } - - /// - /// 仓库编码 - /// - public string StockCode { get; set; } - - /// - /// 数量 - /// - public decimal Qty { get; set; } - - /// - /// 创建日期 - /// - public DateTime CreateTime { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } - } -} diff --git a/src/WMS.Web.Core/Dto/Erp/ErpMiscellaneousDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpMiscellaneousDto.cs deleted file mode 100644 index b7275f6f..00000000 --- a/src/WMS.Web.Core/Dto/Erp/ErpMiscellaneousDto.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Dto.Erp -{ - /// - /// erp:其他入库单 - /// - [Serializable] - public class ErpMiscellaneousDto - { - /// - /// 单据编号 - /// - public string BillNo { get; set; } - /// - /// 库存组织 - /// - public int StockOrgId { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } - - /// - /// 收货仓库ID - /// - public int StockId { get; set; } - - /// - /// 收货仓库-code - /// - public string StockCode { get; set; } - - /// - /// 实收数量 - /// - public decimal Qty { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } - } -} diff --git a/src/WMS.Web.Core/Dto/Erp/ErpTransferDirectDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpTransferDirectDto.cs deleted file mode 100644 index bb4758d9..00000000 --- a/src/WMS.Web.Core/Dto/Erp/ErpTransferDirectDto.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Dto.Erp -{ - /// - /// erp:直接调拨单-入库 - /// - public class ErpTransferDirectDto - { - /// - /// 编号 - /// - public string BillNo { get; set; } - /// - /// 调入库存组织 - /// - public int StockOrgId { get; set; } - /// - /// 物料ID - /// - public int MaterialId { get; set; } - /// - /// 调入仓库ID - /// - public int DestStockId { get; set; } - /// - /// 调入仓库编码 - /// - public string DestStockCode { get; set; } - /// - /// 调拨数量 - /// - public decimal Qty { get; set; } - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 明细备注 - /// - public string Remark { get; set; } - } -} diff --git a/src/WMS.Web.Core/Dto/Erp/ErpTransferinDto.cs b/src/WMS.Web.Core/Dto/Erp/ErpTransferinDto.cs deleted file mode 100644 index 0381d6a4..00000000 --- a/src/WMS.Web.Core/Dto/Erp/ErpTransferinDto.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Dto.Erp -{ - /// - /// erp：分步式调入单-响应对象 - /// - public class ErpTransferinDto - { - /// - /// 单据编号 - /// - public string BillNo { get; set; } - /// - /// 库存组织 - /// - public int StockOrgId { get; set; } - - /// - /// 物料ID - /// - public int MaterialId { get; set; } - - /// - /// 调入仓库ID - /// - public int DestStockId { get; set; } - - /// - /// 调入仓库code - /// - public string DestStockCode { get; set; } - - /// - /// 调入数量 - /// - public decimal Qty { get; set; } - - /// - /// 明细备注 - /// - public string Remark { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - } -} diff --git a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs b/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs deleted file mode 100644 index db31dd7b..00000000 --- a/src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs +++ /dev/null @@ -1,76 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Text; - -namespace WMS.Web.Core.Dto.Erp.Purchase -{ - /// - /// erp-采购入库-返回数据源 - /// - [Serializable] - public class ErpPurchaseInStockResultDto - { - /// - /// 采购订单号 - /// - public string FBillNo{ get; set; } - - /// - /// 供应商 - /// - public int FSupplierId { get; set; } - /// - /// 采购组织 - /// - public int FPurchaseOrgId { get; set; } - /// - /// 规则型号 - /// - public string FModel { get; set; } - /// - /// 物料名称 - /// - public string FMaterialName { get; set; } - /// - /// 物料ID - /// - public int FMaterialId { get; set; } - /// - /// 仓库ID - /// - public int FSOSTOCKID { get; set; } - /// - /// 采购数量 - /// - public decimal FQty { get; set; } - /// - /// 明细备注 - /// - public string FEntryNote { get; set; } - /// - /// 创建时间 - /// - public DateTime FCreateDate { get; set; } - - /// - /// 出厂价格 - /// - public decimal FCHUCHANGPRICE { get; set; } - - /// - /// 仓库编码 - /// - public string StockFNumber { get; set; } - - /// - /// 已交数量 - /// - public decimal FStockInQty { get; set; } - - public string FDocumentStatus { get; set; } - public string FBillTypeID { get; set; } - public string FMRPCloseStatus { get; set; } - public string FBillTypeFName { get; set; } - } -} diff --git a/src/WMS.Web.Domain/IService/Public/IErpService.cs b/src/WMS.Web.Domain/IService/Public/IErpService.cs index e540470c..403bb89e 100644 --- a/src/WMS.Web.Domain/IService/Public/IErpService.cs +++ b/src/WMS.Web.Domain/IService/Public/IErpService.cs @@ -6,7 +6,6 @@ using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.OutStock; -using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Dto.Erp.Supplier; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index 674d00e5..d5655d35 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Text; using WMS.Web.Core.Dto.Erp; -using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Domain.Entitys; @@ -38,7 +37,6 @@ namespace WMS.Web.Domain.Mappers #region ERP-dto映射到wsm的任务表中 - //ERP-同步结果对象统一映射 CreateMap() .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo)) @@ -54,60 +52,6 @@ namespace WMS.Web.Domain.Mappers .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.Qty)) .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.Remark)) .ReverseMap(); - - - //ERP采购订单 - CreateMap() - .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.FBillNo)) - .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate)); - - CreateMap() - .ForMember(x => x.SupplierId, ops => ops.MapFrom(x => x.FSupplierId)) - .ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.FPurchaseOrgId)) - .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.FMaterialId)) - .ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.StockFNumber)) - .ForMember(x => x.DeliveredQty, ops => ops.MapFrom(x => x.FStockInQty)) - .ForMember(x => x.FactoryPrice, ops => ops.MapFrom(x => x.FCHUCHANGPRICE)) - .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.FQty)) - .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.FEntryNote)) - .ReverseMap(); - - - //ERP其他入库单 - CreateMap() - .ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.StockOrgId)) - .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.MaterialId)) - .ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.StockCode)) - .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.Qty)) - .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.Remark)); - - CreateMap() - .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo)) - .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime)); - - //ERP直接调拨入库单 - CreateMap() - .ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.StockOrgId)) - .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.MaterialId)) - .ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.DestStockCode)) - .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.Qty)) - .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.Remark)); - - CreateMap() - .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo)) - .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime)); - - //ERP分步式入库单 - CreateMap() - .ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.StockOrgId)) - .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.MaterialId)) - .ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.DestStockCode)) - .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.Qty)) - .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.Remark)); - - CreateMap() - .ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo)) - .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime)); #endregion } diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs index fed0d694..cd4aa729 100644 --- a/src/WMS.Web.Domain/Services/InStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto.Erp; -using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 2cb50cd5..68903152 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -7,7 +7,6 @@ using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto; using WMS.Web.Core.Dto.Erp.OutStock; -using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Dto.Login; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index d03309ab..675912c1 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -16,7 +16,6 @@ using WMS.Web.Core.Dto.Erp; using WMS.Web.Core.Dto.Erp.Customer; using WMS.Web.Core.Dto.Erp.Org; using WMS.Web.Core.Dto.Erp.OutStock; -using WMS.Web.Core.Dto.Erp.Purchase; using WMS.Web.Core.Dto.Erp.Supplier; using WMS.Web.Core.Dto.Erp.TakeStock; using WMS.Web.Core.Internal.Results;