From e7b5a8d494db0efc07a30c98b02ecfb512a9b88c Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 26 Oct 2023 14:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 325 ++++++++++++++++++
src/WMS.Web.Domain/Entitys/InstockTask.cs | 49 +++
.../Entitys/InstockTaskDetails.cs | 68 ++++
.../Entitys/InventoryDetails.cs | 36 ++
.../Entitys/InventoryInOutDetails.cs | 39 +++
.../Values/InventoryInOutType.cs | 24 ++
src/WMS.Web.Domain/Values/OrderType.cs | 39 +++
7 files changed, 580 insertions(+)
create mode 100644 src/WMS.Web.Domain/Entitys/InstockTask.cs
create mode 100644 src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
create mode 100644 src/WMS.Web.Domain/Entitys/InventoryDetails.cs
create mode 100644 src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
create mode 100644 src/WMS.Web.Domain/Values/InventoryInOutType.cs
create mode 100644 src/WMS.Web.Domain/Values/OrderType.cs
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index f1db442a..7b058e8b 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -149,6 +149,286 @@
数量
+
+
+ erp入库任务表
+
+
+
+
+ ID
+
+
+
+
+ 单据编号
+
+
+
+
+ 入库状态
+
+
+
+
+ 入库类型
+
+
+
+
+ 收货人
+
+
+
+
+ 收货时间
+
+
+
+
+ 操作人（上架人）
+
+
+
+
+ 操作时间（入库时间）
+
+
+
+
+ erp入库任务明细表
+
+
+
+
+ ID
+
+
+
+
+ 单据头ID
+
+
+
+
+ 来源单号
+
+
+
+
+ 供应商Id
+
+
+
+
+ 组织ID
+
+
+
+
+ 物料ID
+
+
+
+
+ 收货仓库
+
+
+
+
+ 出厂价
+
+
+
+
+ 应入数量
+
+
+
+
+ 收货数量
+
+
+
+
+ 实际入库数量
+
+
+
+
+ 明细备注
+
+
+
+
+ 创建时间（erp那边的创建时间）
+
+
+
+
+ wms即时库存明细表
+
+
+
+
+ ID
+
+
+
+
+ 物料ID
+
+
+
+
+ 仓库ID
+
+
+
+
+ 仓位ID
+
+
+
+
+ 库存量
+
+
+
+
+ wms物料收发明细表
+
+
+
+
+ ID
+
+
+
+
+ 物料ID
+
+
+
+
+ 类型：1为入库，2为出库
+
+
+
+
+ 仓库ID
+
+
+
+
+ 单据类型
+
+
+
+
+ erp出库任务单
+
+
+
+
+ 主键 订单编号
+
+
+
+
+ 单据编号
+
+
+
+
+ 单据状态
+
+
+
+
+ 单据类型
+
+
+
+
+ 操作人（出库人）
+
+
+
+
+ 操作时间（出库时间）
+
+
+
+
+ 明细
+
+
+
+
+ erp出库任务单明细
+
+
+
+
+ 主键 订单编号
+
+
+
+
+ 单据头Id
+
+
+
+
+ 来源单号
+
+
+
+
+ 销售订单号
+
+
+
+
+ 发货组织
+
+
+
+
+ 收货客户
+
+
+
+
+ 物料Id
+
+
+
+
+ 仓库ID
+
+
+
+
+ 应出库数量
+
+
+
+
+ 已出库数量
+
+
+
+
+ 订单明细备注
+
+
+
+
+ 创建时间（erp那边的创建时间）
+
+
wms入库单-仓储接口
@@ -900,6 +1180,51 @@
组装拆卸入库
+
+
+ 物料收发明细类型
+
+
+
+
+ 入库
+
+
+
+
+ 出库
+
+
+
+
+ 单据类型
+
+
+
+
+ 采购入库
+
+
+
+
+ 其他入库
+
+
+
+
+ 直接调拨入库
+
+
+
+
+ 分步式入库
+
+
+
+
+ 组装拆卸入库
+
+
错误提示信息
diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs
new file mode 100644
index 00000000..183bd771
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using WMS.Web.Domain.Values;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// erp入库任务表
+ ///
+ [Serializable]
+ [Table("t_erp_instock_task")]
+ public class InstockTask
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 单据编号
+ ///
+ public string BillNo { get; set; }
+ ///
+ /// 入库状态
+ ///
+ public InstockStatus Status { get; set; }
+ ///
+ /// 入库类型
+ ///
+ public InstockType Type { get; set; }
+ ///
+ /// 收货人
+ ///
+ public int ReceiverId { get; set; }
+ ///
+ /// 收货时间
+ ///
+ public DateTime ReceiveTime { get; set; }
+ ///
+ /// 操作人（上架人）
+ ///
+ public int OperatorId { get; set; }
+ ///
+ /// 操作时间（入库时间）
+ ///
+ public DateTime OperateTime { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
new file mode 100644
index 00000000..13ab7c08
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// erp入库任务明细表
+ ///
+ [Serializable]
+ [Table("t_erp_outstock_task_details")]
+ public class InstockTaskDetails
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 单据头ID
+ ///
+ public int Fid { get; set; }
+ ///
+ /// 来源单号
+ ///
+ public string SourceBillNo { get; set; }
+ ///
+ /// 供应商Id
+ ///
+ public int SupplierId { get; set; }
+ ///
+ /// 组织ID
+ ///
+ public int OrgId { get; set; }
+ ///
+ /// 物料ID
+ ///
+ public int MaterialId { get; set; }
+ ///
+ /// 收货仓库
+ ///
+ public int StockId { get; set; }
+ ///
+ /// 出厂价
+ ///
+ public decimal FactoryPrice { get; set; }
+ ///
+ /// 应入数量
+ ///
+ public decimal AccruedQty { get; set; }
+ ///
+ /// 收货数量
+ ///
+ public decimal ReceiveQty { get; set; }
+ ///
+ /// 实际入库数量
+ ///
+ public decimal RealityQty { get; set; }
+ ///
+ /// 明细备注
+ ///
+ public string Remark { get; set; }
+ ///
+ /// 创建时间（erp那边的创建时间）
+ ///
+ public DateTime CreateTime { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/InventoryDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs
new file mode 100644
index 00000000..f99ec145
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/InventoryDetails.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// wms即时库存明细表
+ ///
+ [Serializable]
+ [Table("t_wms_inventory_details")]
+ public class InventoryDetails
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 物料ID
+ ///
+ public int MaterialId { get; set; }
+ ///
+ /// 仓库ID
+ ///
+ public int StockId { get; set; }
+ ///
+ /// 仓位ID
+ ///
+ public int SubStockId { get; set; }
+ ///
+ /// 库存量
+ ///
+ public decimal Qty { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
new file mode 100644
index 00000000..52e765d0
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using WMS.Web.Domain.Values;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// wms物料收发明细表
+ ///
+ [Serializable]
+ [Table("t_wms_inventory_inout_details")]
+ public class InventoryInOutDetails
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 物料ID
+ ///
+ public int MaterialId { get; set; }
+ ///
+ /// 类型：1为入库，2为出库
+ ///
+ public InventoryInOutType Type { get; set; }
+
+ ///
+ /// 仓库ID
+ ///
+ public int StockId { get; set; }
+
+ ///
+ /// 单据类型
+ ///
+ public int OrderType { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Values/InventoryInOutType.cs b/src/WMS.Web.Domain/Values/InventoryInOutType.cs
new file mode 100644
index 00000000..0e11dcf0
--- /dev/null
+++ b/src/WMS.Web.Domain/Values/InventoryInOutType.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 InventoryInOutType
+ {
+ ///
+ /// 入库
+ ///
+ [EnumRemark("入库")]
+ In =1,
+ ///
+ /// 出库
+ ///
+ [EnumRemark("出库")]
+ Out =2
+ }
+}
diff --git a/src/WMS.Web.Domain/Values/OrderType.cs b/src/WMS.Web.Domain/Values/OrderType.cs
new file mode 100644
index 00000000..94047020
--- /dev/null
+++ b/src/WMS.Web.Domain/Values/OrderType.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 OrderType
+ {
+ ///
+ /// 采购入库
+ ///
+ [EnumRemark("采购入库")]
+ Purchase = 1,
+ ///
+ /// 其他入库
+ ///
+ [EnumRemark("其他入库")]
+ Miscellaneous = 2,
+ ///
+ /// 直接调拨入库
+ ///
+ [EnumRemark("直接调拨入库")]
+ Stkdirecttransfers = 3,
+ ///
+ /// 分步式入库
+ ///
+ [EnumRemark("分步式入库")]
+ StktransferInst = 4,
+ ///
+ /// 组装拆卸入库
+ ///
+ [EnumRemark("组装拆卸入库")]
+ Assembled = 5,
+ }
+}