diff --git a/src/Khd.Core.Domain/Models/WcsOutstockLock.cs b/src/Khd.Core.Domain/Models/WcsOutstockLock.cs
index db98344..4adcc0d 100644
--- a/src/Khd.Core.Domain/Models/WcsOutstockLock.cs
+++ b/src/Khd.Core.Domain/Models/WcsOutstockLock.cs
@@ -34,6 +34,12 @@ namespace Khd.Core.Domain.Models
[Column("wms_order_detail_id")]
public long? wmsOrderDetailId { get; set; }
+ ///
+ /// 任务id
+ ///
+ [Column("task_id")]
+ public long? taskId { get; set; }
+
///
/// 单据类型(1 入库 2 出库 3 移库)
///
@@ -45,17 +51,29 @@ namespace Khd.Core.Domain.Models
///
[Column("material_id")]
public long? materialId { get; set; }
-
+
///
/// 仓库id
///
- [Column("warehouse_id")]
+ [Column("warehouse_id")]
public long? warehouseId { get; set; }
-
+
+ ///
+ /// 料箱编号
+ ///
+ [Column("box_no")]
+ public string boxNo { get; set; }
+
+ ///
+ /// 料箱状态
+ ///
+ [Column("box_status")]
+ public int? boxStatus { get; set; }
+
///
/// 所属楼层
///
- [Column("floor_num")]
+ [Column("floor_num")]
public int? floorNum { get; set; }
///
diff --git a/src/Khd.Core.Domain/Models/WmsBaseLocation.cs b/src/Khd.Core.Domain/Models/WmsBaseLocation.cs
index f30c543..f6d6b21 100644
--- a/src/Khd.Core.Domain/Models/WmsBaseLocation.cs
+++ b/src/Khd.Core.Domain/Models/WmsBaseLocation.cs
@@ -27,16 +27,17 @@ namespace Khd.Core.Domain.Models
///
[Column("warehouse_id")]
public long warehouseId { get; set; }
-
+
///
/// agv的点位编码
///
- [Column("agv_position_code")]
+ [Column("agv_position_code")]
public string agvPositionCode { get; set; }
+
///
/// 库位编码
///
- [Column("location_code")]
+ [Column("location_code")]
public string locationCode { get; set; }
///
@@ -75,6 +76,12 @@ namespace Khd.Core.Domain.Models
[Column("manual_flag")]
public string manualFlag { get; set; }
+ ///
+ /// 返库标识(1是0否);用来标识是否是拆分后返库的库位
+ ///
+ [Column("return_flag")]
+ public string returnFlag { get; set; }
+
///
/// 数量限制
///
@@ -177,30 +184,6 @@ namespace Khd.Core.Domain.Models
[Column("location_scrap_type")]
public string locationScrapType { get; set; }
- ///
- /// 库位属性
- ///
- [Column("location_attr")]
- public string locationAttr { get; set; }
-
- ///
- /// 周转需求
- ///
- [Column("turn_demand")]
- public string turnDemand { get; set; }
-
- ///
- /// 校验码
- ///
- [Column("check_code")]
- public string checkCode { get; set; }
-
- ///
- /// 工作区
- ///
- [Column("work_area")]
- public string workArea { get; set; }
-
///
/// 体积限制
///
@@ -213,18 +196,6 @@ namespace Khd.Core.Domain.Models
[Column("weight_limit")]
public decimal? weightLimit { get; set; }
- ///
- /// 箱数限制
- ///
- [Column("box_limit")]
- public int? boxLimit { get; set; }
-
- ///
- /// 托盘限制
- ///
- [Column("pallet_limit")]
- public int? palletLimit { get; set; }
-
///
/// 长度
///