diff --git a/src/Khd.Core.Domain/Models/WmsBaseLocation.cs b/src/Khd.Core.Domain/Models/WmsBaseLocation.cs index f6d6b21..9505edb 100644 --- a/src/Khd.Core.Domain/Models/WmsBaseLocation.cs +++ b/src/Khd.Core.Domain/Models/WmsBaseLocation.cs @@ -99,11 +99,11 @@ namespace Khd.Core.Domain.Models /// [Column("outstock_flag")] public string outstockFlag { get; set; } - + /// - /// 库位状态(1:正常,2:自动锁定,3:人工锁定,4:移库锁定,5:合库锁定);在正常时,库位可以使用,如果是自动锁定则需要自动解锁变成正常,如果是人工锁定需要人工解锁变成正常 + /// 库位状态(1:正常,2:自动锁定,3:人工锁定,4:移库锁定,5:合库锁定 6出库锁定);在正常时,库位可以使用,如果是自动锁定则需要自动解锁变成正常,如果是人工锁定需要人工解锁变成正常 /// - [Column("location_status")] + [Column("location_status")] public string locationStatus { get; set; } /// diff --git a/src/Khd.Core.Domain/Models/WmsProductStock.cs b/src/Khd.Core.Domain/Models/WmsProductStock.cs index 24daf01..cc3bbf4 100644 --- a/src/Khd.Core.Domain/Models/WmsProductStock.cs +++ b/src/Khd.Core.Domain/Models/WmsProductStock.cs @@ -47,11 +47,17 @@ namespace Khd.Core.Domain.Models public string stockType { get; set; } /// - /// 入库批次号;在打印物料条码时,每个成品是一个条码,一个批次可以有多个条码 + /// 物料条码;在打印物料条码时,每个成品是一个条码 /// [Column("product_batch")] public string productBatch { get; set; } + /// + /// 托盘RFID代码 + /// + [Column("pallet_info_code")] + public string palletInfoCode { get; set; } + /// /// 质检状态(0待质检 1检验中,2质检通过,3质检不通过) /// @@ -76,6 +82,12 @@ namespace Khd.Core.Domain.Models [Column("plan_detail_code")] public string planDetailCode { get; set; } + /// + /// 销售订单ID,关联销售订单主键 + /// + [Column("sale_order_id")] + public long? saleOrderId { get; set; } + /// /// 销售订单编号 /// @@ -92,13 +104,13 @@ namespace Khd.Core.Domain.Models /// 冻结数量 /// [Column("frozen_amount")] - public decimal? frozenAmount { get; set; } + public decimal frozenAmount { get; set; } /// /// 占用数量 /// [Column("occupy_amount")] - public decimal? occupyAmount { get; set; } + public decimal occupyAmount { get; set; } /// /// 创建人 diff --git a/src/Khd.Core.Domain/Models/WmsRawOutstock.cs b/src/Khd.Core.Domain/Models/WmsRawOutstock.cs index cec3193..860e7e7 100644 --- a/src/Khd.Core.Domain/Models/WmsRawOutstock.cs +++ b/src/Khd.Core.Domain/Models/WmsRawOutstock.cs @@ -41,7 +41,7 @@ namespace Khd.Core.Domain.Models public string locationCode { get; set; } /// - /// 工单ID,关联mes_product_order_info的product_order_id + /// 销售订单ID /// [Column("order_id")] public long? orderId { get; set; } @@ -65,7 +65,7 @@ namespace Khd.Core.Domain.Models public int? stationId { get; set; } /// - /// 成品ID,关联物料表物料id + /// 物料ID,关联物料表物料id /// [Column("product_id")] public long? productId { get; set; } @@ -83,16 +83,22 @@ namespace Khd.Core.Domain.Models public string palletInfoCode { get; set; } /// - /// 出库数量 + /// 计划出库数量 /// [Column("outstock_amount")] - public decimal? outstockAmount { get; set; } + public decimal outstockAmount { get; set; } + + /// + /// 已出库数量 + /// + [Column("real_outstock_amount")] + public decimal realOutstockAmount { get; set; } /// /// 出库目的地 /// [Column("end_station_code")] - public long? endStationCode { get; set; } + public string endStationCode { get; set; } /// /// 操作类型(0自动,1人工,2强制,3调度) diff --git a/src/Khd.Core.Domain/Models/WmsRawStock.cs b/src/Khd.Core.Domain/Models/WmsRawStock.cs index 2c400ba..ac4b3a8 100644 --- a/src/Khd.Core.Domain/Models/WmsRawStock.cs +++ b/src/Khd.Core.Domain/Models/WmsRawStock.cs @@ -58,6 +58,12 @@ namespace Khd.Core.Domain.Models [Column("instock_batch")] public string instockBatch { get; set; } + /// + /// 托盘RFID代码 + /// + [Column("pallet_info_code")] + public string palletInfoCode { get; set; } + /// /// 入库时间;此入库时间从批次信息中获取,accepted_date /// @@ -92,13 +98,13 @@ namespace Khd.Core.Domain.Models /// 冻结数量;手动冻结的,暂时可不用 /// [Column("frozen_amount")] - public decimal? frozenAmount { get; set; } + public decimal frozenAmount { get; set; } /// /// 占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新; /// [Column("occupy_amount")] - public decimal? occupyAmount { get; set; } + public decimal occupyAmount { get; set; } /// /// 供应商ID