From fdb948154f070ce648ed4ee0b7e15d556a8b5886 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 06 十二月 2024 16:05:17 +0800
Subject: [PATCH] 销售退货通知单完善、销售收货通知单增加

---
 MES.Service/Modes/SalesReturnNotice.cs |  367 +++++++++++++++++++++++++++++----------------------
 1 files changed, 207 insertions(+), 160 deletions(-)

diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
index dd21ad4..b2a8115 100644
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ b/MES.Service/Modes/SalesReturnNotice.cs
@@ -1,162 +1,209 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-///     閿�鍞��璐ч�氱煡鍗曡〃
-/// </summary>
-[SugarTable("SALES_RETURN_NOTICE")]
-public class SalesReturn
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
 {
     /// <summary>
-    ///     SEQ_sales
-    /// </summary>
-    [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; }
-
-    /// <summary>
-    ///     鐗╂枡缂栫爜
-    /// </summary>
-    [SugarColumn(ColumnName = "MATERIAL_ID")]
-    public string MaterialId { get; set; }
-
-    /// <summary>
-    ///     鐗╂枡鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "MATERIAL_NAME")]
-    public string MaterialName { get; set; }
-
-    /// <summary>
-    ///     鐗╂枡瑙勬牸
-    /// </summary>
-    [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
-    public string MaterialSpecification { get; set; }
-
-    /// <summary>
-    ///     閿�鍞崟浣�
-    /// </summary>
-    [SugarColumn(ColumnName = "SALES_UNIT_ID")]
-    public string SalesUnitId { get; set; }
-
-    /// <summary>
-    ///     閿�鍞暟閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "SALES_QUANTITY")]
-    public decimal SalesQuantity { get; set; }
-
-    /// <summary>
-    ///     鏄惁璧犲搧
-    /// </summary>
-    [SugarColumn(ColumnName = "IS_FREE")]
-    public bool IsFree { get; set; }
-
-    /// <summary>
-    ///     閫�璐ф棩鏈�
-    /// </summary>
-    [SugarColumn(ColumnName = "RETURN_DATE")]
-    public DateTime? ReturnDate { get; set; }
-
-    /// <summary>
-    ///     浠撳簱
-    /// </summary>
-    [SugarColumn(ColumnName = "WAREHOUSE")]
-    public string Warehouse { get; set; }
-
-    /// <summary>
-    ///     璁″垝璺熻釜鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
-    public string PlanTrackingNumber { get; set; }
-
-    /// <summary>
-    ///     鎵瑰彿
-    /// </summary>
-    [SugarColumn(ColumnName = "LOT_NUMBER")]
-    public string LotNumber { get; set; }
-
-    /// <summary>
-    ///     澶囨敞
-    /// </summary>
-    [SugarColumn(ColumnName = "NOTE")]
-    public string Note { get; set; }
-
-    /// <summary>
-    ///     閫�璐х被鍨�
-    /// </summary>
-    [SugarColumn(ColumnName = "RETURN_TYPE")]
-    public string ReturnType { get; set; }
-
-    /// <summary>
-    ///     璺熷崟鍛�
-    /// </summary>
-    [SugarColumn(ColumnName = "SALES_CLERK")]
-    public string SalesClerk { get; set; }
-
-    /// <summary>
-    ///     搴撳瓨鍗曚綅
-    /// </summary>
-    [SugarColumn(ColumnName = "INVENTORY_UNIT")]
-    public string InventoryUnit { get; set; }
-
-    /// <summary>
-    ///     搴撳瓨鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
-    public decimal InventoryQuantity { get; set; }
-
-    /// <summary>
-    ///     鐗╂枡绫诲埆
-    /// </summary>
-    [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
-    public string MaterialCategory { get; set; }
-
-    /// <summary>
-    ///     璐т富绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
-    public string OwnerTypeId { get; set; }
-
-    /// <summary>
-    ///     璐т富
-    /// </summary>
-    [SugarColumn(ColumnName = "OWNER_ID")]
-    public string OwnerId { get; set; }
-
-    /// <summary>
-    ///     婧愬崟绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")]
-    public string SourceBillType { get; set; }
-
-    /// <summary>
-    ///     婧愬崟鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
-    public string SourceBillNo { get; set; }
-
-    /// <summary>
-    ///     璁㈠崟鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "ORDER_BILL_NO")]
-    public string OrderBillNo { get; set; }
-
-    /// <summary>
-    ///     ERP琛孖D
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_LINE_ID")]
-    public string ErpLineId { get; set; }
-
-    /// <summary>
-    ///     ERP澶碔D
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_HEAD_ID")]
-    public string ErpHeadId { get; set; }
-
-}
\ No newline at end of file
+    /// 閿�鍞��璐ч�氱煡鍗曡〃
+    ///</summary>
+    [SugarTable("SALES_RETURN_NOTICE")]
+    public class SalesReturnNotice
+    {
+        /// <summary>
+        ///  
+        ///</summary>
+        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+        public decimal? Id { get; set; }
+        /// <summary>
+        /// 鍗曟嵁绫诲瀷 
+        ///</summary>
+        [SugarColumn(ColumnName = "BILL_TYPE")]
+        public string BillType { get; set; }
+        /// <summary>
+        /// 鍗曟嵁缂栧彿 
+        ///</summary>
+        [SugarColumn(ColumnName = "BILL_NO")]
+        public string BillNo { get; set; }
+        /// <summary>
+        /// 鏃ユ湡 
+        ///</summary>
+        [SugarColumn(ColumnName = "F_DATE")]
+        public DateTime? FDate { get; set; }
+        /// <summary>
+        /// 缁撶畻甯佸埆 
+        ///</summary>
+        [SugarColumn(ColumnName = "CURRENCY")]
+        public string Currency { get; set; }
+        /// <summary>
+        /// 閿�鍞粍缁� 
+        ///</summary>
+        [SugarColumn(ColumnName = "SALES_ORG")]
+        public string SalesOrg { get; set; }
+        /// <summary>
+        /// 閿�鍞儴闂� 
+        ///</summary>
+        [SugarColumn(ColumnName = "SALES_DEPT")]
+        public string SalesDept { get; set; }
+        /// <summary>
+        /// 瀹㈡埛璁㈠崟 
+        ///</summary>
+        [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
+        public string CustomerOrderNo { get; set; }
+        /// <summary>
+        /// 閫�璐у鎴� 
+        ///</summary>
+        [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
+        public string ReturnCustomer { get; set; }
+        /// <summary>
+        /// 娣樺疂瀹㈡埛澶囨敞 
+        ///</summary>
+        [SugarColumn(ColumnName = "TAOBAO_REMARK")]
+        public string TaobaoRemark { get; set; }
+        /// <summary>
+        /// 閫�璐у師鍥� 
+        ///</summary>
+        [SugarColumn(ColumnName = "RETURN_REASON")]
+        public string ReturnReason { get; set; }
+        /// <summary>
+        /// 浜よ揣鍦扮偣 
+        ///</summary>
+        [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
+        public string DeliveryLocation { get; set; }
+        /// <summary>
+        /// 搴撳瓨缁勭粐 
+        ///</summary>
+        [SugarColumn(ColumnName = "INVENTORY_ORG")]
+        public string InventoryOrg { get; set; }
+        /// <summary>
+        /// 搴撳瓨閮ㄩ棬 
+        ///</summary>
+        [SugarColumn(ColumnName = "INVENTORY_DEPT")]
+        public string InventoryDept { get; set; }
+        /// <summary>
+        /// 搴撳瓨缁� 
+        ///</summary>
+        [SugarColumn(ColumnName = "INVENTORY_GROUP")]
+        public string InventoryGroup { get; set; }
+        /// <summary>
+        /// 浠撶鍛� 
+        ///</summary>
+        [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
+        public string WarehouseManager { get; set; }
+        /// <summary>
+        /// 閿�鍞粍 
+        ///</summary>
+        [SugarColumn(ColumnName = "SALES_GROUP")]
+        public string SalesGroup { get; set; }
+        /// <summary>
+        /// 閿�鍞憳 
+        ///</summary>
+        [SugarColumn(ColumnName = "SALES_PERSON")]
+        public string SalesPerson { get; set; }
+        /// <summary>
+        /// 蹇�掑崟鍙� 
+        ///</summary>
+        [SugarColumn(ColumnName = "EXPRESS_NO")]
+        public string ExpressNo { get; set; }
+        /// <summary>
+        /// 鏀惰揣鏂� 
+        ///</summary>
+        [SugarColumn(ColumnName = "RECEIVER")]
+        public string Receiver { get; set; }
+        /// <summary>
+        /// 鏀惰揣鏂硅仈绯讳汉 
+        ///</summary>
+        [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
+        public string ReceiverContact { get; set; }
+        /// <summary>
+        /// 鏀惰揣鏂瑰湴鍧� 
+        ///</summary>
+        [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
+        public string ReceiverAddress { get; set; }
+        /// <summary>
+        /// 鏀惰揣鏂瑰鍚� 
+        ///</summary>
+        [SugarColumn(ColumnName = "RECEIVER_NAME")]
+        public string ReceiverName { get; set; }
+        /// <summary>
+        /// 缁撶畻鏂� 
+        ///</summary>
+        [SugarColumn(ColumnName = "SETTLE_PARTY")]
+        public string SettleParty { get; set; }
+        /// <summary>
+        /// 鍒涘缓浜� 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_BY")]
+        public string CreatedBy { get; set; }
+        /// <summary>
+        /// 鍒涘缓鏃堕棿 
+        ///</summary>
+        [SugarColumn(ColumnName = "CREATED_DATE")]
+        public DateTime? CreatedDate { get; set; }
+        /// <summary>
+        /// 淇敼浜� 
+        ///</summary>
+        [SugarColumn(ColumnName = "MODIFIED_BY")]
+        public string ModifiedBy { get; set; }
+        /// <summary>
+        /// 淇敼鏃堕棿 
+        ///</summary>
+        [SugarColumn(ColumnName = "MODIFIED_DATE")]
+        public DateTime? ModifiedDate { get; set; }
+        /// <summary>
+        /// 鍏抽棴浜� 
+        ///</summary>
+        [SugarColumn(ColumnName = "CLOSED_BY")]
+        public string ClosedBy { get; set; }
+        /// <summary>
+        /// 鍏抽棴鍘熷洜 
+        ///</summary>
+        [SugarColumn(ColumnName = "CLOSE_REASON")]
+        public string CloseReason { get; set; }
+        /// <summary>
+        /// 鍏抽棴鏃ユ湡 
+        ///</summary>
+        [SugarColumn(ColumnName = "CLOSE_DATE")]
+        public DateTime? CloseDate { get; set; }
+        /// <summary>
+        /// 瀹℃牳浜� 
+        ///</summary>
+        [SugarColumn(ColumnName = "APPROVED_BY")]
+        public string ApprovedBy { get; set; }
+        /// <summary>
+        /// 瀹℃牳鏃ユ湡 
+        ///</summary>
+        [SugarColumn(ColumnName = "APPROVED_DATE")]
+        public DateTime? ApprovedDate { get; set; }
+        /// <summary>
+        /// 浣滃簾鐘舵�� 
+        ///</summary>
+        [SugarColumn(ColumnName = "CANCEL_STATUS")]
+        public string CancelStatus { get; set; }
+        /// <summary>
+        /// 浣滃簾浜� 
+        ///</summary>
+        [SugarColumn(ColumnName = "CANCELLED_BY")]
+        public string CancelledBy { get; set; }
+        /// <summary>
+        /// 浣滃簾鏃ユ湡 
+        ///</summary>
+        [SugarColumn(ColumnName = "CANCEL_DATE")]
+        public DateTime? CancelDate { get; set; }
+        /// <summary>
+        /// 鍏抽棴鐘舵�� 
+        ///</summary>
+        [SugarColumn(ColumnName = "CLOSE_STATUS")]
+        public string CloseStatus { get; set; }
+        /// <summary>
+        /// 鏄惁鎵嬪姩鍏抽棴 
+        ///</summary>
+        [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
+        public string ManualCloseFlag { get; set; }
+        /// <summary>
+        /// ERP澶碔D 
+        ///</summary>
+        [SugarColumn(ColumnName = "ERP_ID")]
+        public string ErpId { get; set; }
+    }
+}

--
Gitblit v1.9.3