From 8c811e61132cdde49e604f0694113f95f3f147e8 Mon Sep 17 00:00:00 2001
From: "LAPTOP-NLSJV9RB\\91647" <916477576@qq.com>
Date: Mon, 1 Apr 2024 15:35:47 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Domain/Models/WmsBaseLocation.cs |  6 +++---
 src/Khd.Core.Domain/Models/WmsProductStock.cs | 18 +++++++++++++++---
 src/Khd.Core.Domain/Models/WmsRawOutstock.cs  | 16 +++++++++++-----
 src/Khd.Core.Domain/Models/WmsRawStock.cs     | 10 ++++++++--
 4 files changed, 37 insertions(+), 13 deletions(-)

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