From 9c890c219d1dbd3f356590dea338bbeadedf1050 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 26 Oct 2023 11:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs | 58 +++++++++++++ src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs | 54 ++++++++++++ src/WMS.Web.Domain/Entitys/OutStock.cs | 54 ++++++++++++ src/WMS.Web.Domain/Entitys/OutStockDetails.cs | 64 ++++++++++++++ src/WMS.Web.Domain/Entitys/OutStockTask.cs | 5 +- .../Entitys/OutStockTaskDetails.cs | 2 +- src/WMS.Web.Domain/Entitys/TakeStock.cs | 52 ++++++++++++ .../Entitys/TakeStockDetails.cs | 84 +++++++++++++++++++ src/WMS.Web.Domain/Values/MoveBoxType.cs | 24 ++++++ src/WMS.Web.Domain/Values/OutStockStatus.cs | 34 ++++++++ src/WMS.Web.Domain/Values/OutStockType.cs | 39 +++++++++ src/WMS.Web.Domain/Values/TakeStockType.cs | 24 ++++++ 12 files changed, 491 insertions(+), 3 deletions(-) create mode 100644 src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs create mode 100644 src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs create mode 100644 src/WMS.Web.Domain/Entitys/OutStock.cs create mode 100644 src/WMS.Web.Domain/Entitys/OutStockDetails.cs create mode 100644 src/WMS.Web.Domain/Entitys/TakeStock.cs create mode 100644 src/WMS.Web.Domain/Entitys/TakeStockDetails.cs create mode 100644 src/WMS.Web.Domain/Values/MoveBoxType.cs create mode 100644 src/WMS.Web.Domain/Values/OutStockStatus.cs create mode 100644 src/WMS.Web.Domain/Values/OutStockType.cs create mode 100644 src/WMS.Web.Domain/Values/TakeStockType.cs diff --git a/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs new file mode 100644 index 00000000..4d97efa6 --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/ChangeBoxRecord.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms改箱记录 + /// + [Serializable] + [Table("t_wms_changebox_record")] + public class ChangeBoxRecord : EntityBase + { + public ChangeBoxRecord() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 物料ID + /// + [Column("MaterialId")] + public int MaterialId { get; set; } + /// + /// 原箱子ID + /// + [Column("SrcBoxId")] + public int SrcBoxId { get; set; } + /// + /// 目标箱子ID + /// + [Column("DestBoxId")] + public int DestBoxId { get; set; } + /// + /// 原仓位ID + /// + [Column("SrcSubStockId")] + public int SrcSubStockId { get; set; } + /// + /// 目标仓位ID + /// + [Column("DestSubStockId")] + public int DestSubStockId { get; set; } + /// + /// 操作人 + /// + [Column("CreatorId")] + public int CreatorId { get; set; } + /// + /// 操作时间 + /// + [Column("CreateTime")] + public DateTime CreateTime { get; set; } = DateTime.Now; + } +} diff --git a/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs new file mode 100644 index 00000000..46ee276d --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms移箱记录 + /// + [Serializable] + [Table("t_wms_movebox_record")] + public class MoveBoxRecord : EntityBase + { + public MoveBoxRecord() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 箱号ID + /// + [Column("BoxId")] + public int BoxId { get; set; } + /// + /// 原仓位ID + /// + [Column("SrcSubStockId")] + public int SrcSubStockId { get; set; } + /// + /// 目标仓位ID + /// + [Column("DestSubStockId")] + public int DestSubStockId { get; set; } + /// + /// 类型：1-整箱移货上级，2-整箱移货下级 + /// + [Column("Type")] + public MoveBoxType Type { get; set; } = MoveBoxType.Up; + /// + /// 操作人 + /// + [Column("CreatorId")] + public int CreatorId { get; set; } + /// + /// 操作时间 + /// + [Column("CreateTime")] + public DateTime CreateTime { get; set; } = DateTime.Now; + } +} diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs new file mode 100644 index 00000000..3e4812c9 --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/OutStock.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms出库单 + /// + [Serializable] + [Table("t_wms_outstock")] + public class OutStock : EntityBase + { + public OutStock() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 单据状态 + /// + [Column("Status")] + public OutStockStatus Status { get; set; } = OutStockStatus.Wait; + /// + /// 单据类型 + /// + [Column("Type")] + public OutStockType Type { get; set; } = OutStockType.Sal; + + /// + /// 创建人 + /// + [Column("CreatorId")] + public int CreatorId { get; set; } + /// + /// 创建时间（出库时间） + /// + [Column("CreateTime")] + public DateTime CreateTime { get; set; } = DateTime.Now; + /// + /// 同步成功或者失败 null 就是未同步 + /// + [Column("SuccessSync")] + public bool? SuccessSync { get; set; } + /// + /// 明细 + /// + public List Details = new List(); + } +} diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs new file mode 100644 index 00000000..7bb3d13b --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Entitys +{ + /// + ///wms出库单明细 + /// + [Serializable] + [Table("t_wms_outstock_details")] + public class OutStockDetails : EntityBase + { + + public OutStockDetails() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 单据头Id + /// + [Column("FID")] + public int OutStockId { get; set; } + /// + /// 来源单号 + /// + [Column("SourceBillNo")] + public string SourceBillNo { get; set; } + /// + /// 销售订单号 + /// + [Column("SaleBillNo")] + public string SaleBillNo { get; set; } + /// + /// 发货组织 + /// + [Column("DeliveryOrgId")] + public int DeliveryOrgId { get; set; } + /// + /// 收货客户 + /// + [Column("ReceiptCustomerId")] + public int ReceiptCustomerId { get; set; } + /// + /// 物料Id + /// + [Column("MaterialId")] + public int MaterialId { get; set; } + /// + /// 仓库ID + /// + [Column("StockId")] + public int StockId { get; set; } + /// + /// 出库数量 + /// + [Column("Qty")] + public decimal Qty { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs index 189b715f..cb7184f5 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Text; using WMS.Web.Core; +using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Entitys { @@ -28,12 +29,12 @@ namespace WMS.Web.Domain.Entitys /// 单据状态 /// [Column("Status")] - public int Status { get; set; } + public OutStockStatus Status { get; set; } = OutStockStatus.Wait; /// /// 单据类型 /// [Column("Type")] - public int Type { get; set; } + public OutStockType Type { get; set; } = OutStockType.Sal; /// /// 操作人（出库人） /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index 04ad218e..b2a58a2f 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -23,7 +23,7 @@ namespace WMS.Web.Domain.Entitys /// 单据头Id /// [Column("FID")] - public int ProduceFeedID { get; set; } + public int OutStockTaskId { get; set; } /// /// 来源单号 /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStock.cs b/src/WMS.Web.Domain/Entitys/TakeStock.cs new file mode 100644 index 00000000..b06af7ff --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/TakeStock.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms盘点单 + /// + [Serializable] + [Table("t_wms_takestock")] + public class TakeStock : EntityBase + { + public TakeStock() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 单据编号 + /// + [Column("BillNo")] + public string BillNo { get; set; } + /// + /// 盘点日期 + /// + [Column("Date")] + public DateTime Date { get; set; } + /// + /// 盘点人员 + /// + [Column("CreatorId")] + public int CreatorId { get; set; } + /// + /// 公司ID + /// + [Column("CompanyId")] + public int CompanyId { get; set; } + /// + /// 同步成功或者失败 null 就是未同步 + /// + [Column("SuccessSync")] + public bool? SuccessSync { get; set; } + /// + /// 明细 + /// + public List Details = new List(); + } +} diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs new file mode 100644 index 00000000..c8867daf --- /dev/null +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Text; +using WMS.Web.Core; +using WMS.Web.Domain.Values; + +namespace WMS.Web.Domain.Entitys +{ + /// + /// wms盘点单明细 + /// + [Serializable] + [Table("t_wms_takestock_details")] + public class TakeStockDetails : EntityBase + { + public TakeStockDetails() { } + /// + /// 主键 订单编号 + /// + [Column("Id")] + public override int Id { get; set; } + /// + /// 单据头Id + /// + [Column("FID")] + public int TakeStockId { get; set; } + /// + /// 单据头Id + /// + [Column("BoxId")] + public int BoxId { get; set; } + /// + /// 序号 + /// + [Column("Seq")] + public int Seq { get; set; } + /// + /// 物料ID + /// + [Column("MaterialId")] + public int MaterialId { get; set; } + /// + /// 单位ID + /// + [Column("UnitId")] + public int UnitId { get; set; } + /// + /// 仓库ID + /// + [Column("StockId")] + public int StockId { get; set; } + /// + /// 仓位ID + /// + [Column("SubStockId")] + public int SubStockId { get; set; } + /// + /// 盘点前数量（wms系统数量） + /// + [Column("BeforeQty")] + public decimal BeforeQty { get; set; } + /// + /// 盘点实际数量（实际仓库数量） + /// + [Column("AfterQty")] + public decimal AfterQty { get; set; } + /// + /// 盘点后数量 + /// + [Column("FinalQty")] + public decimal FinalQty { get; set; } + /// + /// 盘点结果类型：1为盘盈，2位盘亏 + /// + [Column("ResultType")] + public TakeStockType ResultType { get; set; } = TakeStockType.Profit; + /// + /// 备注 + /// + [Column("Remark")] + public string Remark { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Values/MoveBoxType.cs b/src/WMS.Web.Domain/Values/MoveBoxType.cs new file mode 100644 index 00000000..e99b134f --- /dev/null +++ b/src/WMS.Web.Domain/Values/MoveBoxType.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Values +{ + /// + /// 移箱类型 + /// + public enum MoveBoxType + { + /// + /// 整箱移货上级 + /// + [EnumRemark("整箱移货上级")] + Up = 1, + /// + /// 整箱移货下级 + /// + [EnumRemark("整箱移货下级")] + Down = 2 + } +} diff --git a/src/WMS.Web.Domain/Values/OutStockStatus.cs b/src/WMS.Web.Domain/Values/OutStockStatus.cs new file mode 100644 index 00000000..fe68e46b --- /dev/null +++ b/src/WMS.Web.Domain/Values/OutStockStatus.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Values +{ + /// + /// 出库状态 + /// + public enum OutStockStatus + { + /// + /// 已出库 + /// + [EnumRemark("已出库")] + Already = 1, + /// + /// 待出库 + /// + [EnumRemark("待出库")] + Wait = 2, + /// + /// 部分出库 + /// + [EnumRemark("部分出库")] + Part = 3, + /// + /// 已作废 + /// + [EnumRemark("已作废")] + Repeal = 4 + } +} diff --git a/src/WMS.Web.Domain/Values/OutStockType.cs b/src/WMS.Web.Domain/Values/OutStockType.cs new file mode 100644 index 00000000..da0df388 --- /dev/null +++ b/src/WMS.Web.Domain/Values/OutStockType.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Values +{ + /// + /// 出库类型 + /// + public enum OutStockType + { + /// + /// 销售出库 + /// + [EnumRemark("销售出库")] + Sal = 1, + /// + /// 其他出库 + /// + [EnumRemark("其他出库")] + Miscellaneous = 2, + /// + /// 直接调拨出库 + /// + [EnumRemark("直接调拨出库")] + Stkdirecttransfers = 3, + /// + /// 分步式出库 + /// + [EnumRemark("分步式出库")] + StktransferInst = 4, + /// + /// 组装拆卸出库 + /// + [EnumRemark("组装拆卸出库")] + Assembled = 5, + } +} diff --git a/src/WMS.Web.Domain/Values/TakeStockType.cs b/src/WMS.Web.Domain/Values/TakeStockType.cs new file mode 100644 index 00000000..5d8080ab --- /dev/null +++ b/src/WMS.Web.Domain/Values/TakeStockType.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Text; +using WMS.Web.Core; + +namespace WMS.Web.Domain.Values +{ + /// + /// 盘点单类型 + /// + public enum TakeStockType + { + /// + /// 盘盈 + /// + [EnumRemark("盘盈")] + Profit = 1, + /// + /// 盘亏 + /// + [EnumRemark("盘亏")] + Loss = 2 + } +}