From 74ab9465837f8a6f9eae854059e9783eff24e173 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:06:24 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/Modes/SalesReturnNotice.cs | 231 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 199 insertions(+), 32 deletions(-)
diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
index f3c462d..e210ca5 100644
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ b/MES.Service/Modes/SalesReturnNotice.cs
@@ -9,75 +9,242 @@
public class SalesReturnNotice
{
/// <summary>
- /// SEQ_sales
/// </summary>
[SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ 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 = "DOCUMENT_ID")]
- public string DocumentId { get; set; }
+ [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 = "CREATED_OR_APPROVED_DATE")]
- public DateTime? CreatedOrApprovedDate { get; set; }
+ [SugarColumn(ColumnName = "APPROVED_DATE")]
+ public DateTime? ApprovedDate { get; set; }
/// <summary>
- /// 閮ㄩ棬浠ｇ爜
+ /// 浣滃簾鐘舵��
/// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
- public string DepartmentCode { get; set; }
+ [SugarColumn(ColumnName = "CANCEL_STATUS")]
+ public string CancelStatus { get; set; }
/// <summary>
- /// 閮ㄩ棬鍚嶇О
+ /// 浣滃簾浜�
/// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
- public string DepartmentName { get; set; }
+ [SugarColumn(ColumnName = "CANCELLED_BY")]
+ public string CancelledBy { get; set; }
/// <summary>
- /// 璐揣鍗曚綅浠ｇ爜
+ /// 浣滃簾鏃ユ湡
/// </summary>
- [SugarColumn(ColumnName = "PURCHASER_CODE")]
- public string PurchaserCode { get; set; }
+ [SugarColumn(ColumnName = "CANCEL_DATE")]
+ public DateTime? CancelDate { get; set; }
/// <summary>
- /// 璐揣鍗曚綅鍚嶇О
+ /// 鍏抽棴鐘舵��
/// </summary>
- [SugarColumn(ColumnName = "PURCHASER_NAME")]
- public string PurchaserName { get; set; }
+ [SugarColumn(ColumnName = "CLOSE_STATUS")]
+ public string CloseStatus { get; set; }
/// <summary>
- /// 涓氬姟鍛樹唬鐮�
+ /// 鏄惁鎵嬪姩鍏抽棴
/// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_CODE")]
- public string SalespersonCode { get; set; }
+ [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
+ public string ManualCloseFlag { get; set; }
/// <summary>
- /// 涓氬姟鍛樺悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_NAME")]
- public string SalespersonName { get; set; }
-
- /// <summary>
- /// ERPID
+ /// ERP澶碔D
/// </summary>
[SugarColumn(ColumnName = "ERP_ID")]
public string ErpId { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_STATUS")]
+ public string BillStatus { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3