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

删除不要的erp对象

Browse Source
This commit is contained in:
tongfei
2023-11-13 14:16:52 +08:00
parent af4c2e59a7
commit e6fc59e796
11 changed files with 0 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,51 +500,6 @@
名称
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto">
<summary>
erp:组装拆卸单-响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.OrgId">
<summary>
成品货主和子件货主
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.StockId">
<summary>
仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.StockCode">
<summary>
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.Qty">
<summary>
数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.CreateTime">
<summary>
创建日期
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpAssembledAppDto.Remark">
<summary>
备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
<summary>
ERP：单据查询-dto
@@ -670,51 +625,6 @@
单据类型
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto">
<summary>
erp:其他入库单
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockOrgId">
<summary>
库存组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockId">
<summary>
收货仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockCode">
<summary>
收货仓库-code
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.Qty">
<summary>
实收数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.Remark">
<summary>
备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpOperateDto">
<summary>
erp 提交和审核
@@ -770,96 +680,6 @@
单据体
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto">
<summary>
erp:直接调拨单-入库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.BillNo">
<summary>
编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.StockOrgId">
<summary>
调入库存组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.DestStockId">
<summary>
调入仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.DestStockCode">
<summary>
调入仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.Qty">
<summary>
调拨数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferDirectDto.Remark">
<summary>
明细备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpTransferinDto">
<summary>
erp：分步式调入单-响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.StockOrgId">
<summary>
库存组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.DestStockId">
<summary>
调入仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.DestStockCode">
<summary>
调入仓库code
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.Qty">
<summary>
调入数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.Remark">
<summary>
明细备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpTransferinDto.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpMaterialDto">
<summary>
对应金蝶，物料信息
@@ -1080,76 +900,6 @@
名字
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto">
<summary>
erp-采购入库-返回数据源
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FBillNo">
<summary>
采购订单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FSupplierId">
<summary>
供应商
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FPurchaseOrgId">
<summary>
采购组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FModel">
<summary>
规则型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FMaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FMaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FSOSTOCKID">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FQty">
<summary>
采购数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FEntryNote">
<summary>
明细备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FCreateDate">
<summary>
创建时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FCHUCHANGPRICE">
<summary>
出厂价格
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.StockFNumber">
<summary>
仓库编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto.FStockInQty">
<summary>
已交数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpStockDto">
<summary>
仓库信息

52
src/WMS.Web.Core/Dto/Erp/ErpAssembledAppDto.cs
View File

@@ -1,52 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
/// <summary>
/// erp:组装拆卸单-响应对象
/// </summary>
public class ErpAssembledAppDto
{
/// <summary>
/// 单据编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 成品货主和子件货主
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 仓库
/// </summary>
public int StockId { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 创建日期
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

51
src/WMS.Web.Core/Dto/Erp/ErpMiscellaneousDto.cs
View File

@@ -1,51 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
/// <summary>
/// erp:其他入库单
/// </summary>
[Serializable]
public class ErpMiscellaneousDto
{
/// <summary>
/// 单据编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 库存组织
/// </summary>
public int StockOrgId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 收货仓库ID
/// </summary>
public int StockId { get; set; }
/// <summary>
/// 收货仓库-code
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 实收数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

45
src/WMS.Web.Core/Dto/Erp/ErpTransferDirectDto.cs
View File

@@ -1,45 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
/// <summary>
/// erp:直接调拨单-入库
/// </summary>
public class ErpTransferDirectDto
{
/// <summary>
/// 编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 调入库存组织
/// </summary>
public int StockOrgId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 调入仓库ID
/// </summary>
public int DestStockId { get; set; }
/// <summary>
/// 调入仓库编码
/// </summary>
public string DestStockCode { get; set; }
/// <summary>
/// 调拨数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 明细备注
/// </summary>
public string Remark { get; set; }
}
}

51
src/WMS.Web.Core/Dto/Erp/ErpTransferinDto.cs
View File

@@ -1,51 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
/// <summary>
/// erp：分步式调入单-响应对象
/// </summary>
public class ErpTransferinDto
{
/// <summary>
/// 单据编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 库存组织
/// </summary>
public int StockOrgId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 调入仓库ID
/// </summary>
public int DestStockId { get; set; }
/// <summary>
/// 调入仓库code
/// </summary>
public string DestStockCode { get; set; }
/// <summary>
/// 调入数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 明细备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
}
}

76
src/WMS.Web.Core/Dto/Erp/Purchase/ErpPurchaseInStockResultDto.cs
View File

@@ -1,76 +0,0 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp.Purchase
{
/// <summary>
/// erp-采购入库-返回数据源
/// </summary>
[Serializable]
public class ErpPurchaseInStockResultDto
{
/// <summary>
/// 采购订单号
/// </summary>
public string FBillNo{ get; set; }
/// <summary>
/// 供应商
/// </summary>
public int FSupplierId { get; set; }
/// <summary>
/// 采购组织
/// </summary>
public int FPurchaseOrgId { get; set; }
/// <summary>
/// 规则型号
/// </summary>
public string FModel { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string FMaterialName { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int FMaterialId { get; set; }
/// <summary>
/// 仓库ID
/// </summary>
public int FSOSTOCKID { get; set; }
/// <summary>
/// 采购数量
/// </summary>
public decimal FQty { get; set; }
/// <summary>
/// 明细备注
/// </summary>
public string FEntryNote { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime FCreateDate { get; set; }
/// <summary>
/// 出厂价格
/// </summary>
public decimal FCHUCHANGPRICE { get; set; }
/// <summary>
/// 仓库编码
/// </summary>
public string StockFNumber { get; set; }
/// <summary>
/// 已交数量
/// </summary>
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; }
}
}

1
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -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;

56
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -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<ErpInStockResultDto, InStockTask>()
.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<ErpPurchaseInStockResultDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.FBillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate));
CreateMap<ErpPurchaseInStockResultDto, InStockTaskDetails>()
.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<ErpMiscellaneousDto, InStockTaskDetails>()
.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<ErpMiscellaneousDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
//ERP直接调拨入库单
CreateMap<ErpTransferDirectDto, InStockTaskDetails>()
.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<ErpTransferDirectDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
//ERP分步式入库单
CreateMap<ErpTransferinDto, InStockTaskDetails>()
.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<ErpTransferinDto, InStockTask>()
.ForMember(x => x.SourceBillNo, ops => ops.MapFrom(x => x.BillNo))
.ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.CreateTime));
#endregion
}

1
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -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;

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

@@ -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;

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

@@ -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;