From fbb0bc175c8788f2f6ce4202d2630b01506bff80 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期五, 13 六月 2025 11:40:36 +0800
Subject: [PATCH] 发货通知单新增客户编码和客户名称。生产订单添加含税单价

---
 MES.Service/Modes/SalesDeliveryNoticeDetail.cs |   54 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 39b93c0..fb36222 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -13,33 +13,33 @@
         /// <summary>
         ///  
         ///</summary>
-         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+         [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)]
          public decimal? Id { get; set; }
         /// <summary>
         /// 閿�鍞鍗曞彿 
         ///</summary>
          [SugarColumn(ColumnName="SALES_ORDER_ID")]
-         public string SalesOrderId { get; set; }
+         public string? SalesOrderId { get; set; }
         /// <summary>
         /// 鐗╂枡缂栫爜 
         ///</summary>
          [SugarColumn(ColumnName="MATERIAL_ID")]
-         public string MaterialId { get; set; }
+         public string? MaterialId { get; set; }
         /// <summary>
         /// 鐗╂枡鍚嶇О 
         ///</summary>
          [SugarColumn(ColumnName="MATERIAL_NAME")]
-         public string MaterialName { get; set; }
+         public string? MaterialName { get; set; }
         /// <summary>
         /// 鐗╂枡瑙勬牸 
         ///</summary>
          [SugarColumn(ColumnName="MATERIAL_SPECIFICATION")]
-         public string MaterialSpecification { get; set; }
+         public string? MaterialSpecification { get; set; }
         /// <summary>
         /// 閿�鍞崟浣� 
         ///</summary>
          [SugarColumn(ColumnName="SALES_UNIT_ID")]
-         public string SalesUnitId { get; set; }
+         public string? SalesUnitId { get; set; }
         /// <summary>
         /// 閿�鍞暟閲� 
         ///</summary>
@@ -59,22 +59,22 @@
         /// 鍑鸿揣浠撳簱 
         ///</summary>
          [SugarColumn(ColumnName="WAREHOUSE")]
-         public string Warehouse { get; set; }
+         public string? Warehouse { get; set; }
         /// <summary>
         /// 璁″垝璺熻釜鍙� 
         ///</summary>
          [SugarColumn(ColumnName="PLAN_TRACKING_NUMBER")]
-         public string PlanTrackingNumber { get; set; }
+         public string? PlanTrackingNumber { get; set; }
         /// <summary>
         /// 鎵瑰彿 
         ///</summary>
          [SugarColumn(ColumnName="LOT_NUMBER")]
-         public string LotNumber { get; set; }
+         public string? LotNumber { get; set; }
         /// <summary>
         /// 婧愬崟缂栧彿 
         ///</summary>
          [SugarColumn(ColumnName="SRC_BILL_NO")]
-         public string SrcBillNo { get; set; }
+         public string? SrcBillNo { get; set; }
         /// <summary>
         /// 璁′环鏁伴噺 
         ///</summary>
@@ -84,12 +84,12 @@
         /// 璐т富 
         ///</summary>
          [SugarColumn(ColumnName="OWNER_ID")]
-         public string OwnerId { get; set; }
+         public string? OwnerId { get; set; }
         /// <summary>
         /// 搴撳瓨鍗曚綅 
         ///</summary>
          [SugarColumn(ColumnName="INVENTORY_UNIT")]
-         public string InventoryUnit { get; set; }
+         public string? InventoryUnit { get; set; }
         /// <summary>
         /// 搴撳瓨鏁伴噺 
         ///</summary>
@@ -99,7 +99,7 @@
         /// 鐗╂枡绫诲埆 
         ///</summary>
          [SugarColumn(ColumnName="MATERIAL_CATEGORY")]
-         public string MaterialCategory { get; set; }
+         public string? MaterialCategory { get; set; }
         /// <summary>
         /// 璁″垝鍙戣揣鏃ユ湡 
         ///</summary>
@@ -109,7 +109,7 @@
         /// 瓒呭彂鎺у埗鍗曚綅 
         ///</summary>
          [SugarColumn(ColumnName="OUT_LMT_UNIT")]
-         public string OutLmtUnit { get; set; }
+         public string? OutLmtUnit { get; set; }
         /// <summary>
         /// 鍑哄簱涓婇檺 
         ///</summary>
@@ -124,27 +124,27 @@
         /// 浜よ揣鍦扮偣 
         ///</summary>
          [SugarColumn(ColumnName="DELIVERY_LOC")]
-         public string DeliveryLoc { get; set; }
+         public string? DeliveryLoc { get; set; }
         /// <summary>
         /// 浜よ揣鍦板潃 
         ///</summary>
          [SugarColumn(ColumnName="DELIVERYL_ADDRESS")]
-         public string DeliverylAddress { get; set; }
+         public string? DeliverylAddress { get; set; }
         /// <summary>
         /// 婧愬崟鍗曞彿 
         ///</summary>
          [SugarColumn(ColumnName="SOURCE_BILL_NO")]
-         public string SourceBillNo { get; set; }
+         public string? SourceBillNo { get; set; }
         /// <summary>
         /// 璁㈠崟鍗曞彿 
         ///</summary>
          [SugarColumn(ColumnName="ORDER_BILL_NO")]
-         public string OrderBillNo { get; set; }
+         public string? OrderBillNo { get; set; }
         /// <summary>
         /// 缁堟鐘舵�� 
         ///</summary>
          [SugarColumn(ColumnName="TERMINATION_STATUS")]
-         public string TerminationStatus { get; set; }
+         public string? TerminationStatus { get; set; }
         /// <summary>
         /// 缁堟鏃ユ湡 
         ///</summary>
@@ -164,12 +164,12 @@
         /// ERP琛孖D 
         ///</summary>
          [SugarColumn(ColumnName="ERP_LINE_ID")]
-         public string ErpLineId { get; set; }
+         public string? ErpLineId { get; set; }
         /// <summary>
         /// ERP澶碔D 
         ///</summary>
          [SugarColumn(ColumnName="ERP_HEAD_ID")]
-         public string ErpHeadId { get; set; }
+         public string? ErpHeadId { get; set; }
         /// <summary>
         ///     閿�鍞鍗曞彿
         /// </summary>
@@ -187,6 +187,18 @@
         /// </summary>
         [SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
         public string? SalesContractNo { get; set; }
+
+        /// <summary>
+        ///    瀹㈡埛鐗╂枡鍚嶇О
+        /// </summary>
+        [SugarColumn(ColumnName = "F_KHWLMC")]
+        public string? F_KHWLMC { get; set; }
+
+        /// <summary>
+        ///    瀹㈡埛鐗╂枡缂栫爜
+        /// </summary>
+        [SugarColumn(ColumnName = "F_KHWLBM")]
+        public string? F_KHWLBM { get; set; }
     }
 
 }

--
Gitblit v1.9.3