1

src/Khd.Core.Domain/Models/BaseEquip.cs

@@ -0,0 +1,128 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("base_equip")]
+    public class BaseEquip
+    {
+       
+        [Key]
+		[Column("objid")]
+	    public Guid objid { get; set; }
+    
+        /// <summary>
+        /// 所属库区
+        /// </summary>
+       [Column("warehouse_area_id")]
+        public Guid warehouseAreaId { get; set; }
+    
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+       [Column("equip_no")]
+        public string equipNo { get; set; }
+    
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+       [Column("equip_name")]
+        public string equipName { get; set; }
+    
+        /// <summary>
+        /// 设备类型 1AGV 2积放链 3提升机
+        /// </summary>
+       [Column("equip_type")]
+        public int? equipType { get; set; }
+    
+        /// <summary>
+        /// IP地址
+        /// </summary>
+       [Column("server_ip")]
+        public string serverIp { get; set; }
+    
+        /// <summary>
+        /// 端口
+        /// </summary>
+       [Column("server_port")]
+        public int? serverPort { get; set; }
+    
+        /// <summary>
+        /// 设备状态,字典表
+        /// </summary>
+       [Column("equip_status")]
+        public int? equipStatus { get; set; }
+    
+        /// <summary>
+        /// 所属楼层
+        /// </summary>
+       [Column("floor_no")]
+        public int? floorNo { get; set; }
+    
+        /// <summary>
+        /// 是否可用  0:不可用  1:可用
+        /// </summary>
+       [Column("use_flag")]
+        public int? useFlag { get; set; }
+    
+        /// <summary>
+        /// 创建者
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_time")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 更新者
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+       [Column("update_time")]
+        public DateTime? updateTime { get; set; }
+    
+        /// <summary>
+        /// 备用字段1
+        /// </summary>
+       [Column("ud1")]
+        public string ud1 { get; set; }
+    
+        /// <summary>
+        /// 备用字段2
+        /// </summary>
+       [Column("ud2")]
+        public string ud2 { get; set; }
+    
+        /// <summary>
+        /// 备用字段3
+        /// </summary>
+       [Column("ud3")]
+        public string ud3 { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+       [Column("remark")]
+        public string remark { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/BasePlcpoint.cs

@@ -72,8 +72,14 @@ namespace  Khd.Core.Domain.Models
         /// </summary>
        [Column("sitenode_id")]
         public Guid? sitenodeId { get; set; }
-    
+
-       [Column("is_delete")]
+        /// <summary>
+        /// 楼层
+        /// </summary>
+        [Column("floor_no")]
+        public int? floorNo { get; set; }
+
+        [Column("is_delete")]
         public int? isDelete { get; set; }
     
        [Column("create_time")]

src/Khd.Core.Domain/Models/MesBasePalletInfo.cs

@@ -0,0 +1,92 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("mes_base_pallet_info")]
+    public class MesBasePalletInfo
+    {
+       
+        [Key]
+		[Column("pallet_info_id")]
+	    public int palletInfoId { get; set; }
+    
+        /// <summary>
+        /// 托盘信息RFID编码，不能修改
+        /// </summary>
+       [Column("pallet_info_code")]
+        public string palletInfoCode { get; set; }
+    
+        /// <summary>
+        /// 物料ID，关联物料信息主键
+        /// </summary>
+       [Column("material_id")]
+        public long? materialId { get; set; }
+    
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+       [Column("material_code")]
+        public string materialCode { get; set; }
+    
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+       [Column("material_name")]
+        public string materialName { get; set; }
+    
+        /// <summary>
+        /// 物料条码
+        /// </summary>
+       [Column("material_barcode")]
+        public string materialBarcode { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+       [Column("remark")]
+        public string remark { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_time")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+       [Column("update_time")]
+        public DateTime? updateTime { get; set; }
+    
+        /// <summary>
+        /// 绑定数量
+        /// </summary>
+       [Column("bind_amount")]
+        public decimal? bindAmount { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WcsWarehouseOrderModel.cs

@@ -0,0 +1,113 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Khd.Core.Domain.Models
+{
+ 
+	[Table("wcs_warehouse_order")]
+    public class WcsWarehouseOrderModel
+    {
+		[Column("OBJID")]
+        public Guid objid { get; set; }
+    
+        /// <summary>
+        /// wms申请单id
+        /// </summary>
+       [Column("WMS_ORDER_ID")]
+        public string wmsOrderId { get; set; }
+    
+        /// <summary>
+        /// 单据类型(1 入库 2 出库 3 移库)
+        /// </summary>
+       [Column("ORDER_TYPE")]
+        public int? orderType { get; set; }
+    
+        /// <summary>
+        /// 所属楼层
+        /// </summary>
+       [Column("FLOOR_NUM")]
+        public int? floorNum { get; set; }
+    
+        /// <summary>
+        /// 数量
+        /// </summary>
+       [Column("QTY")]
+        public int? qty { get; set; }
+    
+        /// <summary>
+        /// 单据状态(0 创建订单 1 订单执行中 2 订单完成)
+        /// </summary>
+       [Column("ORDER_STATUS")]
+        public int? orderStatus { get; set; }
+    
+        /// <summary>
+        /// 起始点编号
+        /// </summary>
+       [Column("ORDER_TIME")]
+        public string orderTime { get; set; }
+    
+        /// <summary>
+        /// 是否可用  0:不可用  1:可用
+        /// </summary>
+       [Column("USE_FLAG")]
+        public int? useFlag { get; set; }
+    
+        /// <summary>
+        /// 创建者
+        /// </summary>
+       [Column("CREATE_BY")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("CREATE_TIME")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 更新者
+        /// </summary>
+       [Column("UPDATE_BY")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+       [Column("UPDATE_TIME")]
+        public DateTime? updateTime { get; set; }
+    
+        /// <summary>
+        /// 备用字段1
+        /// </summary>
+       [Column("UD1")]
+        public string ud1 { get; set; }
+    
+        /// <summary>
+        /// 备用字段2
+        /// </summary>
+       [Column("UD2")]
+        public string ud2 { get; set; }
+    
+        /// <summary>
+        /// 备用字段3
+        /// </summary>
+       [Column("UD3")]
+        public string ud3 { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+       [Column("REMARK")]
+        public string remark { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductInstock.cs

@@ -0,0 +1,146 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_instock")]
+    public class WmsProductInstock
+    {
+       
+        [Key]
+		[Column("product_instock_id")]
+	    public long productInstockId { get; set; }
+    
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+       [Column("task_code")]
+        public string taskCode { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 成品类型（2半成品,3成品）
+        /// </summary>
+       [Column("product_type")]
+        public string productType { get; set; }
+    
+        /// <summary>
+        /// 操作类型(0自动,1人工,2强制,3调度);调度，适合双排库自动移库时
+        /// </summary>
+       [Column("operation_type")]
+        public string operationType { get; set; }
+    
+        /// <summary>
+        /// 计划编号,关联pd_base_plan_info的plan_code
+        /// </summary>
+       [Column("plan_code")]
+        public string planCode { get; set; }
+    
+        /// <summary>
+        /// 计划明细编号,关联pd_base_plan_detail的plan_detail_code
+        /// </summary>
+       [Column("plan_detail_code")]
+        public string planDetailCode { get; set; }
+    
+        /// <summary>
+        /// 入库类型(1生产入库,2出半成品库,9其他入库)
+        /// </summary>
+       [Column("instock_type")]
+        public string instockType { get; set; }
+    
+        /// <summary>
+        /// 申请原因
+        /// </summary>
+       [Column("apply_reason")]
+        public string applyReason { get; set; }
+    
+        /// <summary>
+        /// 审核原因
+        /// </summary>
+       [Column("audit_reason")]
+        public string auditReason { get; set; }
+    
+        /// <summary>
+        /// 审核状态(0待审核,1审核通过,2审核未通过)
+        /// </summary>
+       [Column("audit_status")]
+        public string auditStatus { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 申请人
+        /// </summary>
+       [Column("apply_by")]
+        public string applyBy { get; set; }
+    
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+       [Column("apply_date")]
+        public DateTime? applyDate { get; set; }
+    
+        /// <summary>
+        /// 审核人
+        /// </summary>
+       [Column("audit_by")]
+        public string auditBy { get; set; }
+    
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+       [Column("audit_date")]
+        public DateTime? auditDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 开始时间;AGV处理开始时间
+        /// </summary>
+       [Column("begin_time")]
+        public DateTime? beginTime { get; set; }
+    
+        /// <summary>
+        /// 结束时间;agv处理结束时间
+        /// </summary>
+       [Column("end_time")]
+        public DateTime? endTime { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductInstockDetail.cs

@@ -0,0 +1,116 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_instock_detail")]
+    public class WmsProductInstockDetail
+    {
+       
+        [Key]
+		[Column("product_instock_detail_id")]
+	    public long productInstockDetailId { get; set; }
+    
+        /// <summary>
+        /// 成品入库记录ID
+        /// </summary>
+       [Column("product_instock_id")]
+        public long productInstockId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 成品ID
+        /// </summary>
+       [Column("product_id")]
+        public long productId { get; set; }
+    
+        /// <summary>
+        /// 成品条码
+        /// </summary>
+       [Column("product_barcode")]
+        public string productBarcode { get; set; }
+    
+        /// <summary>
+        /// 成品批次
+        /// </summary>
+       [Column("product_batch")]
+        public string productBatch { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 同步ERP状态(0:失败,1成功)
+        /// </summary>
+       [Column("erp_status")]
+        public string erpStatus { get; set; }
+    
+        /// <summary>
+        /// 同步给ERP的数量
+        /// </summary>
+       [Column("erp_amount")]
+        public decimal? erpAmount { get; set; }
+    
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+       [Column("plan_amount")]
+        public decimal planAmount { get; set; }
+    
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+       [Column("instock_amount")]
+        public decimal? instockAmount { get; set; }
+    
+        /// <summary>
+        /// 入库人
+        /// </summary>
+       [Column("instock_by")]
+        public string instockBy { get; set; }
+    
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+       [Column("instock_date")]
+        public DateTime? instockDate { get; set; }
+    
+        /// <summary>
+        /// 入库方式（1：人工入库 2：AGV入库 ）
+        /// </summary>
+       [Column("instock_way")]
+        public string instockWay { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductOutstock.cs

@@ -0,0 +1,176 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_outstock")]
+    public class WmsProductOutstock
+    {
+       
+        [Key]
+		[Column("product_outstock_id")]
+	    public long productOutstockId { get; set; }
+    
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+       [Column("task_code")]
+        public string taskCode { get; set; }
+    
+        /// <summary>
+        /// 仓库ID;领料时需要保存
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 成品类型（2半成品,3成品）
+        /// </summary>
+       [Column("product_type")]
+        public string productType { get; set; }
+    
+        /// <summary>
+        /// 操作类型(0自动,1人工,2强制,3调度)
+        /// </summary>
+       [Column("operation_type")]
+        public string operationType { get; set; }
+    
+        /// <summary>
+        /// 出库类型(1销售出库 9其他出库)
+        /// </summary>
+       [Column("outstock_type")]
+        public string outstockType { get; set; }
+    
+        /// <summary>
+        /// 计划编号,关联pd_base_plan_info的plan_code
+        /// </summary>
+       [Column("plan_code")]
+        public string planCode { get; set; }
+    
+        /// <summary>
+        /// 计划明细编号,关联pd_base_plan_detail的plan_detail_code
+        /// </summary>
+       [Column("plan_detail_code")]
+        public string planDetailCode { get; set; }
+    
+        /// <summary>
+        /// 销售订单编号
+        /// </summary>
+       [Column("saleorder_code")]
+        public string saleorderCode { get; set; }
+    
+        /// <summary>
+        /// 项目号
+        /// </summary>
+       [Column("project_no")]
+        public string projectNo { get; set; }
+    
+        /// <summary>
+        /// 成品ID，关联物料信息主键
+        /// </summary>
+       [Column("product_id")]
+        public long? productId { get; set; }
+    
+        /// <summary>
+        /// 申请数量
+        /// </summary>
+       [Column("apply_qty")]
+        public decimal? applyQty { get; set; }
+    
+        /// <summary>
+        /// 已出数量
+        /// </summary>
+       [Column("outstock_qty")]
+        public decimal? outstockQty { get; set; }
+    
+        /// <summary>
+        /// 申请原因
+        /// </summary>
+       [Column("apply_reason")]
+        public string applyReason { get; set; }
+    
+        /// <summary>
+        /// 审核原因
+        /// </summary>
+       [Column("audit_reason")]
+        public string auditReason { get; set; }
+    
+        /// <summary>
+        /// 审核状态(0待审核,1审核通过,2审核未通过)
+        /// </summary>
+       [Column("audit_status")]
+        public string auditStatus { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 申请人
+        /// </summary>
+       [Column("apply_by")]
+        public string applyBy { get; set; }
+    
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+       [Column("apply_date")]
+        public DateTime? applyDate { get; set; }
+    
+        /// <summary>
+        /// 审核人
+        /// </summary>
+       [Column("audit_by")]
+        public string auditBy { get; set; }
+    
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+       [Column("audit_date")]
+        public DateTime? auditDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 执行开始时间
+        /// </summary>
+       [Column("begin_time")]
+        public DateTime? beginTime { get; set; }
+    
+        /// <summary>
+        /// 执行结束时间
+        /// </summary>
+       [Column("end_time")]
+        public DateTime? endTime { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductOutstockDetail.cs

@@ -0,0 +1,122 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_outstock_detail")]
+    public class WmsProductOutstockDetail
+    {
+       
+        [Key]
+		[Column("product_outstock_detail_id")]
+	    public long productOutstockDetailId { get; set; }
+    
+        /// <summary>
+        /// 成品出库记录ID
+        /// </summary>
+       [Column("product_outstock_id")]
+        public long productOutstockId { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 成品条码
+        /// </summary>
+       [Column("product_barcode")]
+        public string productBarcode { get; set; }
+    
+        /// <summary>
+        /// 成品批次
+        /// </summary>
+       [Column("product_batch")]
+        public string productBatch { get; set; }
+    
+        /// <summary>
+        /// 成品ID
+        /// </summary>
+       [Column("product_id")]
+        public long? productId { get; set; }
+    
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+       [Column("plan_amount")]
+        public decimal? planAmount { get; set; }
+    
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+       [Column("outstock_amount")]
+        public decimal? outstockAmount { get; set; }
+    
+        /// <summary>
+        /// 确认数量
+        /// </summary>
+       [Column("confirm_amount")]
+        public decimal? confirmAmount { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 同步ERP状态(0:失败,1成功)
+        /// </summary>
+       [Column("erp_status")]
+        public string erpStatus { get; set; }
+    
+        /// <summary>
+        /// 同步给ERP的数量
+        /// </summary>
+       [Column("erp_amount")]
+        public decimal? erpAmount { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 执行开始时间
+        /// </summary>
+       [Column("begin_time")]
+        public DateTime? beginTime { get; set; }
+    
+        /// <summary>
+        /// 执行结束时间
+        /// </summary>
+       [Column("end_time")]
+        public DateTime? endTime { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductStock.cs

@@ -0,0 +1,140 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_stock")]
+    public class WmsProductStock
+    {
+       
+        [Key]
+		[Column("product_stock_id")]
+	    public long productStockId { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 仓库楼层
+        /// </summary>
+       [Column("warehouse_floor")]
+        public int warehouseFloor { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 库存类型(2半成品，3成品)
+        /// </summary>
+       [Column("stock_type")]
+        public string stockType { get; set; }
+    
+        /// <summary>
+        /// 入库批次号;在打印物料条码时，每个成品是一个条码，一个批次可以有多个条码
+        /// </summary>
+       [Column("product_batch")]
+        public string productBatch { get; set; }
+    
+        /// <summary>
+        /// 质检状态(0待质检 1检验中,2质检通过,3质检不通过)
+        /// </summary>
+       [Column("quality_status")]
+        public string qualityStatus { get; set; }
+    
+        /// <summary>
+        /// 产品ID，关联物料信息的物料ID
+        /// </summary>
+       [Column("product_id")]
+        public long productId { get; set; }
+    
+        /// <summary>
+        /// 计划编号,关联pd_base_plan_info的plan_code
+        /// </summary>
+       [Column("plan_code")]
+        public string planCode { get; set; }
+    
+        /// <summary>
+        /// 计划明细编号,关联pd_base_plan_detail的plan_detail_code
+        /// </summary>
+       [Column("plan_detail_code")]
+        public string planDetailCode { get; set; }
+    
+        /// <summary>
+        /// 销售订单编号
+        /// </summary>
+       [Column("saleorder_code")]
+        public string saleorderCode { get; set; }
+    
+        /// <summary>
+        /// 总数量
+        /// </summary>
+       [Column("total_amount")]
+        public decimal totalAmount { get; set; }
+    
+        /// <summary>
+        /// 冻结数量
+        /// </summary>
+       [Column("frozen_amount")]
+        public decimal? frozenAmount { get; set; }
+    
+        /// <summary>
+        /// 占用数量
+        /// </summary>
+       [Column("occupy_amount")]
+        public decimal? occupyAmount { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_date")]
+        public DateTime? createDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 有效标记
+        /// </summary>
+       [Column("active_flag")]
+        public string activeFlag { get; set; }
+    
+        /// <summary>
+        /// 入库时间（预留）
+        /// </summary>
+       [Column("instock_date")]
+        public DateTime? instockDate { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsProductStockSaleorder.cs

@@ -0,0 +1,128 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_product_stock_saleorder")]
+    public class WmsProductStockSaleorder
+    {
+       
+        [Key]
+		[Column("product_stock_saleorder_id")]
+	    public long productStockSaleorderId { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 仓库楼层
+        /// </summary>
+       [Column("warehouse_floor")]
+        public int warehouseFloor { get; set; }
+    
+        /// <summary>
+        /// 库存类型(2半成品，3成品)
+        /// </summary>
+       [Column("stock_type")]
+        public string stockType { get; set; }
+    
+        /// <summary>
+        /// 产品ID，关联物料信息的物料ID
+        /// </summary>
+       [Column("product_id")]
+        public long productId { get; set; }
+    
+        /// <summary>
+        /// 销售订单ID，关联销售订单主键
+        /// </summary>
+       [Column("sale_order_id")]
+        public long? saleOrderId { get; set; }
+    
+        /// <summary>
+        /// 销售订单编号
+        /// </summary>
+       [Column("saleorder_code")]
+        public string saleorderCode { get; set; }
+    
+        /// <summary>
+        /// 总数量;此数量记录此订单生产的总数量，只能加，不能减
+        /// </summary>
+       [Column("total_amount")]
+        public decimal totalAmount { get; set; }
+    
+        /// <summary>
+        /// 占用数量
+        /// </summary>
+       [Column("occupy_amount")]
+        public decimal? occupyAmount { get; set; }
+    
+        /// <summary>
+        /// 冻结数量
+        /// </summary>
+       [Column("frozen_amount")]
+        public decimal? frozenAmount { get; set; }
+    
+        /// <summary>
+        /// 已申请数量
+        /// </summary>
+       [Column("apply_amount")]
+        public decimal? applyAmount { get; set; }
+    
+        /// <summary>
+        /// 已出库数量（库管或agv出库的数量）
+        /// </summary>
+       [Column("outstock_amount")]
+        public decimal? outstockAmount { get; set; }
+    
+        /// <summary>
+        /// 确认数量（在一楼最终扫码确认出库的数量）
+        /// </summary>
+       [Column("confirm_amount")]
+        public decimal? confirmAmount { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_date")]
+        public DateTime? createDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 有效标记
+        /// </summary>
+       [Column("active_flag")]
+        public string activeFlag { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsRawInstockDetail.cs

@@ -0,0 +1,176 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_raw_instock_detail")]
+    public class WmsRawInstockDetail
+    {
+       
+        [Key]
+		[Column("raw_instock_detail_id")]
+	    public long rawInstockDetailId { get; set; }
+    
+        /// <summary>
+        /// 原材料入库ID
+        /// </summary>
+       [Column("raw_instock_id")]
+        public long rawInstockId { get; set; }
+    
+        /// <summary>
+        /// 原材料入库任务编号，同原材料入库记录
+        /// </summary>
+       [Column("task_code")]
+        public string taskCode { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 存放物料条码,入库扫描条码时，从打印条码记录表中获取，关联条码信息的barcode_info
+        /// </summary>
+       [Column("material_barcode")]
+        public string materialBarcode { get; set; }
+    
+        /// <summary>
+        /// 批次;入库扫描条码时，从打印条码记录表中获取,关联条码信息的batch_code
+        /// </summary>
+       [Column("instock_batch")]
+        public string instockBatch { get; set; }
+    
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+       [Column("material_id")]
+        public long materialId { get; set; }
+    
+        /// <summary>
+        /// 采购订单号，入库扫描条码时获取唯一条码
+        /// </summary>
+       [Column("po_no")]
+        public string poNo { get; set; }
+    
+        /// <summary>
+        /// 生产日期;入库扫描条码时，从打印条码记录表中获取
+        /// </summary>
+       [Column("material_production_date")]
+        public DateTime? materialProductionDate { get; set; }
+    
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+       [Column("plan_amount")]
+        public decimal planAmount { get; set; }
+    
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+       [Column("instock_amount")]
+        public decimal? instockAmount { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 同步ERP状态(0:失败,1成功)
+        /// </summary>
+       [Column("erp_status")]
+        public string erpStatus { get; set; }
+    
+        /// <summary>
+        /// 同步给ERP的数量
+        /// </summary>
+       [Column("erp_amount")]
+        public decimal? erpAmount { get; set; }
+    
+        /// <summary>
+        /// 入库人
+        /// </summary>
+       [Column("instock_person")]
+        public string instockPerson { get; set; }
+    
+        /// <summary>
+        /// 入库时间
+        /// </summary>
+       [Column("instock_time")]
+        public DateTime? instockTime { get; set; }
+    
+        /// <summary>
+        /// 入库方式（1：人工入库 2：AGV入库 ）
+        /// </summary>
+       [Column("instock_way")]
+        public string instockWay { get; set; }
+    
+        /// <summary>
+        /// 使用机台名称;入库扫描条码时，从打印条码记录表中获取
+        /// </summary>
+       [Column("machine_name")]
+        public string machineName { get; set; }
+    
+        /// <summary>
+        /// 质检状态(0:待质检,1:合格,2:NG)
+        /// </summary>
+       [Column("quality_status")]
+        public string qualityStatus { get; set; }
+    
+        /// <summary>
+        /// 每托数量
+        /// </summary>
+       [Column("stack_amount")]
+        public decimal? stackAmount { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_date")]
+        public DateTime? createDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 有效标记
+        /// </summary>
+       [Column("active_flag")]
+        public string activeFlag { get; set; }
+    
+        /// <summary>
+        /// 采购订单行项目
+        /// </summary>
+       [Column("po_line")]
+        public string poLine { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsRawOutstock.cs

@@ -0,0 +1,158 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_raw_outstock")]
+    public class WmsRawOutstock
+    {
+       
+        [Key]
+		[Column("raw_outstock_id")]
+	    public long rawOutstockId { get; set; }
+    
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+       [Column("task_code")]
+        public string taskCode { get; set; }
+    
+        /// <summary>
+        /// 仓库ID;领料时需要保存
+        /// </summary>
+       [Column("warehouse_id")]
+        public long? warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 工单ID,关联pd_base_order_info的order_id
+        /// </summary>
+       [Column("order_id")]
+        public long? orderId { get; set; }
+    
+        /// <summary>
+        /// 计划编号,关联pd_base_plan_info的plan_code
+        /// </summary>
+       [Column("plan_code")]
+        public string planCode { get; set; }
+    
+        /// <summary>
+        /// 计划明细编号,关联pd_base_plan_detail的plan_detail_code
+        /// </summary>
+       [Column("plan_detail_code")]
+        public string planDetailCode { get; set; }
+    
+        /// <summary>
+        /// 所属工位，关联pd_base_station_info的station_id
+        /// </summary>
+       [Column("station_id")]
+        public int? stationId { get; set; }
+    
+        /// <summary>
+        /// 成品ID,关联物料表物料id
+        /// </summary>
+       [Column("product_id")]
+        public long? productId { get; set; }
+    
+        /// <summary>
+        /// 操作类型(0自动,1人工,2强制,3调度)
+        /// </summary>
+       [Column("operation_type")]
+        public string operationType { get; set; }
+    
+        /// <summary>
+        /// 任务类型(1生产领料,2拆分出库,3组装出库,9其他)
+        /// </summary>
+       [Column("task_type")]
+        public string taskType { get; set; }
+    
+        /// <summary>
+        /// 申请原因
+        /// </summary>
+       [Column("apply_reason")]
+        public string applyReason { get; set; }
+    
+        /// <summary>
+        /// 审核原因
+        /// </summary>
+       [Column("audit_reason")]
+        public string auditReason { get; set; }
+    
+        /// <summary>
+        /// 审核状态(0待审核,1审核通过,2审核未通过)
+        /// </summary>
+       [Column("audit_status")]
+        public string auditStatus { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 申请人
+        /// </summary>
+       [Column("apply_by")]
+        public string applyBy { get; set; }
+    
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+       [Column("apply_date")]
+        public DateTime? applyDate { get; set; }
+    
+        /// <summary>
+        /// 审核人
+        /// </summary>
+       [Column("audit_by")]
+        public string auditBy { get; set; }
+    
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+       [Column("audit_date")]
+        public DateTime? auditDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 执行开始时间
+        /// </summary>
+       [Column("begin_time")]
+        public DateTime? beginTime { get; set; }
+    
+        /// <summary>
+        /// 执行结束时间
+        /// </summary>
+       [Column("end_time")]
+        public DateTime? endTime { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsRawOutstockDetail.cs

@@ -0,0 +1,164 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_raw_outstock_detail")]
+    public class WmsRawOutstockDetail
+    {
+       
+        [Key]
+		[Column("raw_outstock_detail_id")]
+	    public long rawOutstockDetailId { get; set; }
+    
+        /// <summary>
+        /// 原材料出库ID
+        /// </summary>
+       [Column("raw_outstock_id")]
+        public long rawOutstockId { get; set; }
+    
+        /// <summary>
+        /// 原材料出库任务编号
+        /// </summary>
+       [Column("task_code")]
+        public string taskCode { get; set; }
+    
+        /// <summary>
+        /// 仓库ID，关联仓库主键
+        /// </summary>
+       [Column("warehouse_id")]
+        public long? warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 物料条码;最终出库时保存
+        /// </summary>
+       [Column("material_barcode")]
+        public string materialBarcode { get; set; }
+    
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+       [Column("material_id")]
+        public long materialId { get; set; }
+    
+        /// <summary>
+        /// 批次;扫描条码时，从打印条码记录表中获取
+        /// </summary>
+       [Column("instock_batch")]
+        public string instockBatch { get; set; }
+    
+        /// <summary>
+        /// 生产日期;扫描条码时，从打印条码记录表中获取
+        /// </summary>
+       [Column("material_production_date")]
+        public DateTime? materialProductionDate { get; set; }
+    
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+       [Column("plan_amount")]
+        public decimal planAmount { get; set; }
+    
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+       [Column("outstock_amount")]
+        public decimal? outstockAmount { get; set; }
+    
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+       [Column("execute_status")]
+        public string executeStatus { get; set; }
+    
+        /// <summary>
+        /// 同步ERP状态(0:失败,1成功)
+        /// </summary>
+       [Column("erp_status")]
+        public string erpStatus { get; set; }
+    
+        /// <summary>
+        /// 同步给ERP的数量
+        /// </summary>
+       [Column("erp_amount")]
+        public decimal? erpAmount { get; set; }
+    
+        /// <summary>
+        /// 出库人
+        /// </summary>
+       [Column("outstock_person")]
+        public string outstockPerson { get; set; }
+    
+        /// <summary>
+        /// 出库时间
+        /// </summary>
+       [Column("outstock_time")]
+        public DateTime? outstockTime { get; set; }
+    
+        /// <summary>
+        /// 出库方式（1:人工出库 2:AGV出库 ）
+        /// </summary>
+       [Column("outstock_way")]
+        public string outstockWay { get; set; }
+    
+        /// <summary>
+        /// 使用机台名称;出库扫描条码时，从打印条码记录表中获取
+        /// </summary>
+       [Column("machine_name")]
+        public string machineName { get; set; }
+    
+        /// <summary>
+        /// 质检状态(0:待质检,1:合格,2:NG)
+        /// </summary>
+       [Column("quality_status")]
+        public string qualityStatus { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_date")]
+        public DateTime? createDate { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_date")]
+        public DateTime? updateDate { get; set; }
+    
+        /// <summary>
+        /// 每托数量
+        /// </summary>
+       [Column("stack_amount")]
+        public decimal? stackAmount { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsRawStockOccupy.cs

@@ -0,0 +1,93 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_raw_stock_occupy")]
+    public class WmsRawStockOccupy
+    {
+       
+        [Key]
+		[Column("raw_stock_occupy_id")]
+	    public long rawStockOccupyId { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 库存类型：1原材料  2半成品
+        /// </summary>
+       [Column("stock_type")]
+        public string stockType { get; set; }
+    
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+       [Column("material_id")]
+        public long materialId { get; set; }
+    
+        /// <summary>
+        /// 占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;
+或者在柜体拆分后返库后占用的数量，在组装时需要匹配出库
+        /// </summary>
+       [Column("occupy_amount")]
+        public decimal? occupyAmount { get; set; }
+    
+        /// <summary>
+        /// 占用类型(1生产工单,2申请领料)
+        /// </summary>
+       [Column("occupy_type")]
+        public string occupyType { get; set; }
+    
+        /// <summary>
+        /// 根据占用类型关联占用的主键ID
+        /// </summary>
+       [Column("occupy_id")]
+        public long? occupyId { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_time")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+       [Column("update_by")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+       [Column("update_time")]
+        public DateTime? updateTime { get; set; }
+    }
+}
+

src/Khd.Core.Domain/Models/WmsWarehouseMaterial.cs

@@ -0,0 +1,62 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("wms_warehouse_material")]
+    public class WmsWarehouseMaterial
+    {
+       
+        [Key]
+		[Column("warehouse_material_id")]
+	    public long warehouseMaterialId { get; set; }
+    
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+       [Column("warehouse_id")]
+        public long warehouseId { get; set; }
+    
+        /// <summary>
+        /// 库位编码;单独需要针对库位设置的，后续扩展使用
+        /// </summary>
+       [Column("location_code")]
+        public string locationCode { get; set; }
+    
+        /// <summary>
+        /// 存储类型(1、物料，2、物料类型);先支持物料
+        /// </summary>
+       [Column("storage_type")]
+        public string storageType { get; set; }
+    
+        /// <summary>
+        /// 根据存储类型对应各自表的主键
+        /// </summary>
+       [Column("storage_id")]
+        public long storageId { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("create_time")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 创建人
+        /// </summary>
+       [Column("create_by")]
+        public string createBy { get; set; }
+    }
+}
+

src/Khd.Core.EntityFramework/DefaultDbContext.cs

@@ -8,220 +8,224 @@ namespace Khd.Core.EntityFramework
         public DefaultDbContext(DbContextOptions<DefaultDbContext> options) : base(options)
         {
         }
-        public DbSet<BaseAlertinfo> BaseAlertinfo { get; set; }
+        //public DbSet<BaseAlertinfo> BaseAlertinfo { get; set; }
 
 
-        public DbSet<BaseAmima> BaseAmima { get; set; }
+        //public DbSet<BaseAmima> BaseAmima { get; set; }
 
 
-        public DbSet<BaseArea> BaseArea { get; set; }
+        //public DbSet<BaseArea> BaseArea { get; set; }
 
 
-        public DbSet<BaseAsaveerro> BaseAsaveerro { get; set; }
+        //public DbSet<BaseAsaveerro> BaseAsaveerro { get; set; }
 
 
-        public DbSet<BaseAsaveerroBak> BaseAsaveerroBak { get; set; }
+        //public DbSet<BaseAsaveerroBak> BaseAsaveerroBak { get; set; }
 
 
-        public DbSet<BaseAsaveplcnumber> BaseAsaveplcnumber { get; set; }
+        //public DbSet<BaseAsaveplcnumber> BaseAsaveplcnumber { get; set; }
 
 
-        public DbSet<BaseAsaveplcnumberBak> BaseAsaveplcnumberBak { get; set; }
+        //public DbSet<BaseAsaveplcnumberBak> BaseAsaveplcnumberBak { get; set; }
 
 
-        public DbSet<BaseBomcomponent> BaseBomcomponent { get; set; }
+        //public DbSet<BaseBomcomponent> BaseBomcomponent { get; set; }
 
 
-        public DbSet<BaseCar> BaseCar { get; set; }
+        //public DbSet<BaseCar> BaseCar { get; set; }
 
 
-        public DbSet<BaseCararea> BaseCararea { get; set; }
+        //public DbSet<BaseCararea> BaseCararea { get; set; }
 
 
-        public DbSet<BaseCarareaRejects> BaseCarareaRejects { get; set; }
+        //public DbSet<BaseCarareaRejects> BaseCarareaRejects { get; set; }
 
 
-        public DbSet<BaseCarareaoverdue> BaseCarareaoverdue { get; set; }
+        //public DbSet<BaseCarareaoverdue> BaseCarareaoverdue { get; set; }
 
 
-        public DbSet<BaseCargocage> BaseCargocage { get; set; }
+        //public DbSet<BaseCargocage> BaseCargocage { get; set; }
 
 
-        public DbSet<BaseCarmateriel> BaseCarmateriel { get; set; }
+        //public DbSet<BaseCarmateriel> BaseCarmateriel { get; set; }
 
 
-        public DbSet<BaseCarmateriellog> BaseCarmateriellog { get; set; }
+        //public DbSet<BaseCarmateriellog> BaseCarmateriellog { get; set; }
 
 
-        public DbSet<BaseCarmaterielup> BaseCarmaterielup { get; set; }
+        //public DbSet<BaseCarmaterielup> BaseCarmaterielup { get; set; }
 
 
-        public DbSet<BaseCarmaterielupdown> BaseCarmaterielupdown { get; set; }
+        //public DbSet<BaseCarmaterielupdown> BaseCarmaterielupdown { get; set; }
 
 
-        public DbSet<BaseCarorder> BaseCarorder { get; set; }
+        //public DbSet<BaseCarorder> BaseCarorder { get; set; }
 
 
-        public DbSet<BaseCarorderlist> BaseCarorderlist { get; set; }
+        //public DbSet<BaseCarorderlist> BaseCarorderlist { get; set; }
 
 
-        public DbSet<BaseCarordernum> BaseCarordernum { get; set; }
+        //public DbSet<BaseCarordernum> BaseCarordernum { get; set; }
 
 
-        public DbSet<BaseCarordernumnew> BaseCarordernumnew { get; set; }
+        //public DbSet<BaseCarordernumnew> BaseCarordernumnew { get; set; }
 
 
-        public DbSet<BaseCarpreline> BaseCarpreline { get; set; }
+        //public DbSet<BaseCarpreline> BaseCarpreline { get; set; }
 
 
-        public DbSet<BaseCarproduct> BaseCarproduct { get; set; }
+        //public DbSet<BaseCarproduct> BaseCarproduct { get; set; }
 
 
-        public DbSet<BaseCarrier> BaseCarrier { get; set; }
+        //public DbSet<BaseCarrier> BaseCarrier { get; set; }
 
 
-        public DbSet<BaseCarthrough> BaseCarthrough { get; set; }
+        //public DbSet<BaseCarthrough> BaseCarthrough { get; set; }
 
 
-        public DbSet<BaseDowncarorderback> BaseDowncarorderback { get; set; }
+        //public DbSet<BaseDowncarorderback> BaseDowncarorderback { get; set; }
 
 
-        public DbSet<BaseDownline> BaseDownline { get; set; }
+        //public DbSet<BaseDownline> BaseDownline { get; set; }
 
 
-        public DbSet<BaseEquipment> BaseEquipment { get; set; }
+        //public DbSet<BaseEquipment> BaseEquipment { get; set; }
 
 
-        public DbSet<BaseFactory> BaseFactory { get; set; }
+        //public DbSet<BaseFactory> BaseFactory { get; set; }
 
 
-        public DbSet<BaseFaultlog> BaseFaultlog { get; set; }
+        //public DbSet<BaseFaultlog> BaseFaultlog { get; set; }
 
 
-        public DbSet<BaseFaulttime> BaseFaulttime { get; set; }
+        //public DbSet<BaseFaulttime> BaseFaulttime { get; set; }
 
 
-        public DbSet<BaseFlag> BaseFlag { get; set; }
+        //public DbSet<BaseFlag> BaseFlag { get; set; }
 
 
-        public DbSet<BaseLinearea> BaseLinearea { get; set; }
+        //public DbSet<BaseLinearea> BaseLinearea { get; set; }
 
 
-        public DbSet<BaseLineinfo> BaseLineinfo { get; set; }
+        //public DbSet<BaseLineinfo> BaseLineinfo { get; set; }
 
 
-        public DbSet<BaseLoginlog> BaseLoginlog { get; set; }
+        //public DbSet<BaseLoginlog> BaseLoginlog { get; set; }
 
 
-        public DbSet<BaseMaterialinfo> BaseMaterialinfo { get; set; }
+        //public DbSet<BaseMaterialinfo> BaseMaterialinfo { get; set; }
 
 
-        public DbSet<BaseMaterialinfobom> BaseMaterialinfobom { get; set; }
+        //public DbSet<BaseMaterialinfobom> BaseMaterialinfobom { get; set; }
 
 
-        public DbSet<BaseOrderinfo> BaseOrderinfo { get; set; }
+        //public DbSet<BaseOrderinfo> BaseOrderinfo { get; set; }
 
 
-        public DbSet<BaseOrderlog> BaseOrderlog { get; set; }
+        //public DbSet<BaseOrderlog> BaseOrderlog { get; set; }
 
 
-        public DbSet<BasePlcpoint> BasePlcpoint { get; set; }
+        //public DbSet<BasePlcpoint> BasePlcpoint { get; set; }
 
 
-        public DbSet<BasePlcpointsite> BasePlcpointsite { get; set; }
+        //public DbSet<BasePlcpointsite> BasePlcpointsite { get; set; }
 
 
-        public DbSet<BasePlctype> BasePlctype { get; set; }
+        //public DbSet<BasePlctype> BasePlctype { get; set; }
 
 
-        public DbSet<BasePrelinedetail> BasePrelinedetail { get; set; }
+        //public DbSet<BasePrelinedetail> BasePrelinedetail { get; set; }
 
 
-        public DbSet<BasePrelineinfo> BasePrelineinfo { get; set; }
+        //public DbSet<BasePrelineinfo> BasePrelineinfo { get; set; }
 
 
-        public DbSet<BaseProductionOrderSplit> BaseProductionOrderSplit { get; set; }
+        //public DbSet<BaseProductionOrderSplit> BaseProductionOrderSplit { get; set; }
-        public DbSet<BaseProductionOrderSplitBak> BaseProductionOrderSplitBak { get; set; }
+        //public DbSet<BaseProductionOrderSplitBak> BaseProductionOrderSplitBak { get; set; }
         
-        public DbSet<BaseProductionOrderSplitTextinsert> BaseProductionOrderSplitTextinsert { get; set; }
+        //public DbSet<BaseProductionOrderSplitTextinsert> BaseProductionOrderSplitTextinsert { get; set; }
 
 
-        public DbSet<BaseProductionOrderSplitLine> BaseProductionOrderSplitLine { get; set; }
+        //public DbSet<BaseProductionOrderSplitLine> BaseProductionOrderSplitLine { get; set; }
 
 
-        public DbSet<BaseProductionOrderSplitReduct> BaseProductionOrderSplitReduct { get; set; }
+        //public DbSet<BaseProductionOrderSplitReduct> BaseProductionOrderSplitReduct { get; set; }
 
 
-        public DbSet<BaseRejects> BaseRejects { get; set; }
+        //public DbSet<BaseRejects> BaseRejects { get; set; }
 
 
-        public DbSet<BaseSitearea> BaseSitearea { get; set; }
+        //public DbSet<BaseSitearea> BaseSitearea { get; set; }
 
 
-        public DbSet<BaseSitenode> BaseSitenode { get; set; }
+        //public DbSet<BaseSitenode> BaseSitenode { get; set; }
 
 
-        public DbSet<BaseSitenum> BaseSitenum { get; set; }
+        //public DbSet<BaseSitenum> BaseSitenum { get; set; }
 
 
-        public DbSet<BaseStandbytime> BaseStandbytime { get; set; }
+        //public DbSet<BaseStandbytime> BaseStandbytime { get; set; }
 
 
-        public DbSet<BaseStorage> BaseStorage { get; set; }
+        //public DbSet<BaseStorage> BaseStorage { get; set; }
 
 
-        public DbSet<BaseSystemconfig> BaseSystemconfig { get; set; }
+        //public DbSet<BaseSystemconfig> BaseSystemconfig { get; set; }
 
 
-        public DbSet<BaseTasktstatus> BaseTasktstatus { get; set; }
+        //public DbSet<BaseTasktstatus> BaseTasktstatus { get; set; }
 
 
-        public DbSet<BaseTasktype> BaseTasktype { get; set; }
+        //public DbSet<BaseTasktype> BaseTasktype { get; set; }
 
 
-        public DbSet<BaseUpdownnum> BaseUpdownnum { get; set; }
+        //public DbSet<BaseUpdownnum> BaseUpdownnum { get; set; }
 
 
-        public DbSet<BaseUpdownnumnew> BaseUpdownnumnew { get; set; }
+        //public DbSet<BaseUpdownnumnew> BaseUpdownnumnew { get; set; }
 
 
-        public DbSet<BaseWaitdownline> BaseWaitdownline { get; set; }
+        //public DbSet<BaseWaitdownline> BaseWaitdownline { get; set; }
 
 
-        public DbSet<BasedataPowerclasslog> BasedataPowerclasslog { get; set; }
+        //public DbSet<BasedataPowerclasslog> BasedataPowerclasslog { get; set; }
 
 
-        public DbSet<BasedataUplinescancarlist> BasedataUplinescancarlist { get; set; }
+        //public DbSet<BasedataUplinescancarlist> BasedataUplinescancarlist { get; set; }
 
 
-        public DbSet<BusinessCarrierCargocage> BusinessCarrierCargocage { get; set; }
+        //public DbSet<BusinessCarrierCargocage> BusinessCarrierCargocage { get; set; }
 
 
-        public DbSet<BusinessCommand> BusinessCommand { get; set; }
+        //public DbSet<BusinessCommand> BusinessCommand { get; set; }
 
 
-        public DbSet<BusinessOperationlog> BusinessOperationlog { get; set; }
+        //public DbSet<BusinessOperationlog> BusinessOperationlog { get; set; }
 
 
-        public DbSet<BusinessSitehistory> BusinessSitehistory { get; set; }
+        //public DbSet<BusinessSitehistory> BusinessSitehistory { get; set; }
 
 
-        public DbSet<BusinessTask> BusinessTask { get; set; }
+        //public DbSet<BusinessTask> BusinessTask { get; set; }
 
 
-        public DbSet<DataCargocageMaterialdetail> DataCargocageMaterialdetail { get; set; }
+        //public DbSet<DataCargocageMaterialdetail> DataCargocageMaterialdetail { get; set; }
 
 
-        public DbSet<DataCargocageProduct> DataCargocageProduct { get; set; }
+        //public DbSet<DataCargocageProduct> DataCargocageProduct { get; set; }
 
 
-        public DbSet<Discretealarms> Discretealarms { get; set; }
+        //public DbSet<Discretealarms> Discretealarms { get; set; }
 
 
-        public DbSet<NewMaterial> NewMaterial { get; set; }
+        //public DbSet<NewMaterial> NewMaterial { get; set; }
 
-        public DbSet<BaseFollowmessage> BaseFollowmessage { get; set; }
+        //public DbSet<BaseFollowmessage> BaseFollowmessage { get; set; }
 
-        public DbSet<MesProdPlan> MesProdPlan { get; set; }
+        //public DbSet<MesProdPlan> MesProdPlan { get; set; }
+        public DbSet<WmsRawInstock> WmsRawInstock { get; set; }
+        public DbSet<BasePlcpoint> BasePlcpoint { get; set;}
+        public DbSet<WcsTask> WcsTask { get; set; }
+        
     }
 }

src/Khd.Core.Wcs/Global/StaticData.cs

@@ -1,4 +1,5 @@
-using Khd.Core.Domain.Dto.wcs;
+using CMS.Model;
+using Khd.Core.Domain.Dto.wcs;
 using Khd.Core.Domain.Models;
 using System;
 using System.Collections.Generic;
@@ -29,7 +30,17 @@ namespace Khd.Core.Wcs.Global
         /// <summary>
         /// 点位信息
         /// </summary>
-        public static List<NodeSetting> NodeSettingList = new List<NodeSetting>();
+        //public static List<NodeSetting> NodeSettingList = new List<NodeSetting>();
-     
+        /// <summary>
+        /// 点位信息
+        /// </summary>
+        public static List<BasePlcpoint> BasePlcpointList = new List<BasePlcpoint>();
+        public static List<WcsTask> WcsTask = new List<WcsTask>();
+        public static List<WmsBaseWarehouse> WmsBaseWarehouse = new List<WmsBaseWarehouse>();
+        public static List<WmsWarehouseMaterial> WmsWarehouseMaterial = new List<WmsWarehouseMaterial>();
+        public static List<MesBasePalletInfo> MesBasePalletInfo = new List<MesBasePalletInfo>();
+        public static List<BaseDictionary> BaseDictionary = new List<BaseDictionary>();
+        public static List<BaseEquip> BaseEquip = new List<BaseEquip>();
+
     }
 }

src/Khd.Core.Wcs/MainCentralControl.cs

@@ -44,15 +44,16 @@ namespace Khd.Core.Wcs
                         //设置默认去向=>1为 Int16位
                         WcsMoRenQuXiang = getValue("2", "1");
                         //加载物料信息
-                        StaticData.MateriaList = dbContext.BaseMaterialinfo.Where(t => t.isDelete == 0).OrderBy(t => t.materialNo).ToList();
+                        //StaticData.MateriaList = dbContext.BaseMaterialinfo.Where(t => t.isDelete == 0).OrderBy(t => t.materialNo).ToList();
-                        //加载库区信息
+                        ////加载库区信息
-                        StaticData.BaseAreaList = dbContext.BaseArea.Where(t => t.isDelete == 0).OrderBy(t => t.areaOrder).ToList();
+                        //StaticData.BaseAreaList = dbContext.BaseArea.Where(t => t.isDelete == 0).OrderBy(t => t.areaOrder).ToList();
-                        //加载站台
+                        ////加载站台
-                        StaticData.SiteNodeList = dbContext.BaseSitenode.Where(t => t.isDelete == 0).OrderBy(t => t.siteNo).ToList();
+                        //StaticData.SiteNodeList = dbContext.BaseSitenode.Where(t => t.isDelete == 0).OrderBy(t => t.siteNo).ToList();
-                        //加载小车
+                        ////加载小车
-                        StaticData.CarList = dbContext.BaseCar.Where(t => t.isDelete == 0).OrderBy(t => t.carNo).ToList();
+                        //StaticData.CarList = dbContext.BaseCar.Where(t => t.isDelete == 0).OrderBy(t => t.carNo).ToList();
                         //加载点位
-                        StaticData.NodeSettingList = GetNodeSettingList(dbContext);
+                        //StaticData.NodeSettingList = GetNodeSettingList(dbContext);
+                        StaticData.BasePlcpointList = dbContext.BasePlcpoint.Where(t => t.isDelete == 0).ToList();
                         //加载配置项
 
                         //连接PLC判断

src/Khd.Core.Wcs/Wcs/BaseDictionary.cs

@@ -0,0 +1,116 @@
+
+//-----------------------------------------------------------------------
+//<copyright>
+// * Copyright (C) 2021 KEHAIDASOFT All Rights Reserved
+// * version : 4.0.30319.42000
+// * author  : khd by t4-2
+// </copyright>
+//-----------------------------------------------------------------------
+
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace  Khd.Core.Domain.Models
+{
+ 
+	[Table("base_dictionary")]
+    public class BaseDictionary
+    {
+       
+        [Key]
+		[Column("OBJID")]
+	    public Guid objid { get; set; }
+    
+        /// <summary>
+        /// 字典名
+        /// </summary>
+       [Column("DIC_NAME")]
+        public string dicName { get; set; }
+    
+        /// <summary>
+        /// 字段名
+        /// </summary>
+       [Column("DIC_FIELD")]
+        public string dicField { get; set; }
+    
+        /// <summary>
+        /// 对应名
+        /// </summary>
+       [Column("DIC_KEY")]
+        public string dicKey { get; set; }
+    
+        /// <summary>
+        /// 对应值
+        /// </summary>
+       [Column("DIC_VALUE")]
+        public string dicValue { get; set; }
+    
+        /// <summary>
+        /// 排序
+        /// </summary>
+       [Column("DIC_SORT")]
+        public string dicSort { get; set; }
+    
+        /// <summary>
+        /// 是否允许编辑  1允许 0不允许
+        /// </summary>
+       [Column("IS_EDIT")]
+        public int? isEdit { get; set; }
+    
+        /// <summary>
+        /// 是否可用  0:不可用  1:可用
+        /// </summary>
+       [Column("USE_FLAG")]
+        public int? useFlag { get; set; }
+    
+        /// <summary>
+        /// 创建者
+        /// </summary>
+       [Column("CREATE_BY")]
+        public string createBy { get; set; }
+    
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+       [Column("CREATE_TIME")]
+        public DateTime? createTime { get; set; }
+    
+        /// <summary>
+        /// 更新者
+        /// </summary>
+       [Column("UPDATE_BY")]
+        public string updateBy { get; set; }
+    
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+       [Column("UPDATE_TIME")]
+        public DateTime? updateTime { get; set; }
+    
+        /// <summary>
+        /// 备用字段1
+        /// </summary>
+       [Column("UD1")]
+        public string ud1 { get; set; }
+    
+        /// <summary>
+        /// 备用字段2
+        /// </summary>
+       [Column("UD2")]
+        public string ud2 { get; set; }
+    
+        /// <summary>
+        /// 备用字段3
+        /// </summary>
+       [Column("UD3")]
+        public string ud3 { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+       [Column("REMARK")]
+        public string remark { get; set; }
+    }
+}
+