diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 8188c58a..b19fddc3 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -69,6 +69,56 @@
序列号集
+
+
+ 箱库存表头
+
+
+
+
+ ID
+
+
+
+
+ 箱子ID
+
+
+
+
+ 仓库ID
+
+
+
+
+ 仓库ID
+
+
+
+
+ 箱库存明细表
+
+
+
+
+ ID
+
+
+
+
+ 物料ID
+
+
+
+
+ 序列号集
+
+
+
+
+ 物料库存数量
+
+
wms改箱记录
@@ -216,7 +266,7 @@
- 入库类型：单据类型
+ 入库类型
@@ -369,6 +419,31 @@
单据类型
+
+
+ 单据编号
+
+
+
+
+ 数量
+
+
+
+
+ 结存
+
+
+
+
+ 操作人
+
+
+
+
+ 操作时间
+
+
wms移箱记录
@@ -1435,6 +1510,36 @@
已作废
+
+
+ 入库类型
+
+
+
+
+ 采购入库
+
+
+
+
+ 其他入库
+
+
+
+
+ 直接调拨入库
+
+
+
+
+ 分步式入库
+
+
+
+
+ 组装拆卸入库
+
+
物料收发明细类型
@@ -1470,31 +1575,56 @@
单据类型
-
+
采购入库
-
+
其他入库
-
+
直接调拨入库
-
+
分步式入库
-
+
组装拆卸入库
+
+
+ 销售出库
+
+
+
+
+ 其他出库
+
+
+
+
+ 直接调拨出库
+
+
+
+
+ 分步式出库
+
+
+
+
+ 组装拆卸出库
+
+
出库状态
diff --git a/src/WMS.Web.Domain/Entitys/BoxInventory.cs b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
new file mode 100644
index 00000000..7e4a0b66
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// 箱库存表头
+ ///
+ [Serializable]
+ [Table("t_wms_box_inventory")]
+ public class BoxInventory
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 箱子ID
+ ///
+ public int BoxId { get; set; }
+ ///
+ /// 仓库ID
+ ///
+ public int StockId { get; set; }
+ ///
+ /// 仓库ID
+ ///
+ public int SubStockId { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/BoxInventoryDetails.cs b/src/WMS.Web.Domain/Entitys/BoxInventoryDetails.cs
new file mode 100644
index 00000000..b3a09cca
--- /dev/null
+++ b/src/WMS.Web.Domain/Entitys/BoxInventoryDetails.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace WMS.Web.Domain.Entitys
+{
+ ///
+ /// 箱库存明细表
+ ///
+ [Serializable]
+ [Table("t_wms_box_inventory_details")]
+ public class BoxInventoryDetails
+ {
+ ///
+ /// ID
+ ///
+ public int Id { get; set; }
+ ///
+ /// 物料ID
+ ///
+ public int MaterialId { get; set; }
+ ///
+ /// 序列号集
+ ///
+ public string SerialNumbers { get; set; }
+ ///
+ /// 物料库存数量
+ ///
+ public decimal Qty { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Entitys/InstockOrder.cs b/src/WMS.Web.Domain/Entitys/InstockOrder.cs
index b754aaaa..d1b4b604 100644
--- a/src/WMS.Web.Domain/Entitys/InstockOrder.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockOrder.cs
@@ -24,7 +24,7 @@ namespace WMS.Web.Domain.Entitys
///
/// 入库类型
///
- public OrderType Type { get; set; }
+ public InstockType Type { get; set; }
///
/// 创建人
///
diff --git a/src/WMS.Web.Domain/Entitys/InstockTask.cs b/src/WMS.Web.Domain/Entitys/InstockTask.cs
index a9551dc3..183bd771 100644
--- a/src/WMS.Web.Domain/Entitys/InstockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/InstockTask.cs
@@ -26,9 +26,9 @@ namespace WMS.Web.Domain.Entitys
///
public InstockStatus Status { get; set; }
///
- /// 入库类型：单据类型
+ /// 入库类型
///
- public OrderType Type { get; set; }
+ public InstockType Type { get; set; }
///
/// 收货人
///
diff --git a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
index 12ccdb23..cef1e5df 100644
--- a/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
+++ b/src/WMS.Web.Domain/Entitys/InventoryInOutDetails.cs
@@ -35,5 +35,25 @@ namespace WMS.Web.Domain.Entitys
/// 单据类型
///
public OrderType OrderType { get; set; }
+ ///
+ /// 单据编号
+ ///
+ public string OrderBillNo { get; set; }
+ ///
+ /// 数量
+ ///
+ public decimal Qty { get; set; }
+ ///
+ /// 结存
+ ///
+ public decimal SurplusQty { get; set; }
+ ///
+ /// 操作人
+ ///
+ public int CreatorId { get; set; }
+ ///
+ /// 操作时间
+ ///
+ public DateTime CreateTime { get; set; }
}
}
diff --git a/src/WMS.Web.Domain/Entitys/OutStock.cs b/src/WMS.Web.Domain/Entitys/OutStock.cs
index f8fc409a..45a4f0a7 100644
--- a/src/WMS.Web.Domain/Entitys/OutStock.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStock.cs
@@ -29,7 +29,7 @@ namespace WMS.Web.Domain.Entitys
/// 单据类型
///
[Column("Type")]
- public OrderType Type { get; set; } = OrderType.Sal;
+ public OrderType Type { get; set; } = OrderType.Sal_Out;
///
/// 创建人
diff --git a/src/WMS.Web.Domain/Entitys/OutStockTask.cs b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
index 08bc3081..00a82828 100644
--- a/src/WMS.Web.Domain/Entitys/OutStockTask.cs
+++ b/src/WMS.Web.Domain/Entitys/OutStockTask.cs
@@ -34,7 +34,7 @@ namespace WMS.Web.Domain.Entitys
/// 单据类型
///
[Column("Type")]
- public OrderType Type { get; set; } = OrderType.Sal;
+ public OrderType Type { get; set; } = OrderType.Sal_Out;
///
/// 操作人（出库人）
///
diff --git a/src/WMS.Web.Domain/Values/InstockType.cs b/src/WMS.Web.Domain/Values/InstockType.cs
new file mode 100644
index 00000000..6f205f46
--- /dev/null
+++ b/src/WMS.Web.Domain/Values/InstockType.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 InstockType
+ {
+ ///
+ /// 采购入库
+ ///
+ [EnumRemark("采购入库")]
+ Purchase = 1,
+ ///
+ /// 其他入库
+ ///
+ [EnumRemark("其他入库")]
+ Miscellaneous = 2,
+ ///
+ /// 直接调拨入库
+ ///
+ [EnumRemark("直接调拨入库")]
+ Stkdirecttransfers = 3,
+ ///
+ /// 分步式入库
+ ///
+ [EnumRemark("分步式入库")]
+ StktransferInst = 4,
+ ///
+ /// 组装拆卸入库
+ ///
+ [EnumRemark("组装拆卸入库")]
+ Assembled = 5,
+ }
+}