From c083e7791a7146c80567cf33adaf0379f9d9ce31 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 20 八月 2025 16:13:42 +0800
Subject: [PATCH] 销售退货更新
---
MES.Service/Modes/SalesOrder/SalesOrder.cs | 50 ++++++++++++------------
MES.Service/Modes/SalesOrder/SalesOrderDetail.cs | 36 +++++++++---------
MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs | 5 ++
3 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/MES.Service/Modes/SalesOrder/SalesOrder.cs b/MES.Service/Modes/SalesOrder/SalesOrder.cs
index 308257e..77fdf73 100644
--- a/MES.Service/Modes/SalesOrder/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder/SalesOrder.cs
@@ -13,7 +13,7 @@
/// <summary>
///
///</summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER",IsPrimaryKey =true)]
public decimal? Id { get; set; }
/// <summary>
///
@@ -24,17 +24,17 @@
/// 鍗曟嵁缂栧彿
///</summary>
[SugarColumn(ColumnName = "FBILLNO")]
- public string Fbillno { get; set; }
+ public string? Fbillno { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷
///</summary>
[SugarColumn(ColumnName = "FBILLTYPEID")]
- public string Fbilltypeid { get; set; }
+ public string? Fbilltypeid { get; set; }
/// <summary>
/// 鍗曟嵁鐘舵��
///</summary>
[SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
- public string Fdocumentstatus { get; set; }
+ public string? Fdocumentstatus { get; set; }
/// <summary>
/// 鏃ユ湡
///</summary>
@@ -44,17 +44,17 @@
/// 涓氬姟绫诲瀷
///</summary>
[SugarColumn(ColumnName = "FBUSINESSTYPE")]
- public string Fbusinesstype { get; set; }
+ public string? Fbusinesstype { get; set; }
/// <summary>
/// 浜よ揣鏂瑰紡
///</summary>
[SugarColumn(ColumnName = "FHEADDELIVERYWAY")]
- public string Fheaddeliveryway { get; set; }
+ public string? Fheaddeliveryway { get; set; }
/// <summary>
/// 浜よ揣鍦扮偣
///</summary>
[SugarColumn(ColumnName = "FHEADLOCID")]
- public string Fheadlocid { get; set; }
+ public string? Fheadlocid { get; set; }
/// <summary>
/// 閿�鍞粍缁�
///</summary>
@@ -64,62 +64,62 @@
/// 瀹㈡埛
///</summary>
[SugarColumn(ColumnName = "FCUSTID")]
- public string Fcustid { get; set; }
+ public string? Fcustid { get; set; }
/// <summary>
/// 鍏抽棴鐘舵��
///</summary>
[SugarColumn(ColumnName = "FCLOSESTATUS")]
- public string Fclosestatus { get; set; }
+ public string? Fclosestatus { get; set; }
/// <summary>
/// 閿�鍞儴闂�
///</summary>
[SugarColumn(ColumnName = "FSALEDEPTID")]
- public string Fsaledeptid { get; set; }
+ public string? Fsaledeptid { get; set; }
/// <summary>
/// 閿�鍞憳
///</summary>
[SugarColumn(ColumnName = "FSALERID")]
- public string Fsalerid { get; set; }
+ public string? Fsalerid { get; set; }
/// <summary>
/// 鍙樻洿鍘熷洜
///</summary>
[SugarColumn(ColumnName = "FCHANGEREASON")]
- public string Fchangereason { get; set; }
+ public string? Fchangereason { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
[SugarColumn(ColumnName = "FNOTE")]
- public string Fnote { get; set; }
+ public string? Fnote { get; set; }
/// <summary>
/// 缁撶畻鏂�
///</summary>
[SugarColumn(ColumnName = "FSETTLEID")]
- public string Fsettleid { get; set; }
+ public string? Fsettleid { get; set; }
/// <summary>
/// 瀹℃牳浜�
///</summary>
[SugarColumn(ColumnName = "FAPPROVERID")]
- public string Fapproverid { get; set; }
+ public string? Fapproverid { get; set; }
/// <summary>
/// 鏀惰揣浜哄鍚�
///</summary>
[SugarColumn(ColumnName = "FLINKMAN")]
- public string Flinkman { get; set; }
+ public string? Flinkman { get; set; }
/// <summary>
/// 浠樻鏂�
///</summary>
[SugarColumn(ColumnName = "FCHARGEID")]
- public string Fchargeid { get; set; }
+ public string? Fchargeid { get; set; }
/// <summary>
/// 鑱旂郴鐢佃瘽
///</summary>
[SugarColumn(ColumnName = "FLINKPHONE")]
- public string Flinkphone { get; set; }
+ public string? Flinkphone { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
[SugarColumn(ColumnName = "FCREATORID")]
- public string Fcreatorid { get; set; }
+ public string? Fcreatorid { get; set; }
/// <summary>
/// 鍒涘缓鏃ユ湡
///</summary>
@@ -129,7 +129,7 @@
/// 鏈�鍚庝慨鏀逛汉
///</summary>
[SugarColumn(ColumnName = "FMODIFIERID")]
- public string Fmodifierid { get; set; }
+ public string? Fmodifierid { get; set; }
/// <summary>
/// 鏈�鍚庝慨鏀规棩鏈�
///</summary>
@@ -144,7 +144,7 @@
/// 鍏抽棴浜�
///</summary>
[SugarColumn(ColumnName = "FCLOSERID")]
- public string Fcloserid { get; set; }
+ public string? Fcloserid { get; set; }
/// <summary>
/// 鍏抽棴鏃ユ湡
///</summary>
@@ -159,22 +159,22 @@
/// 浣滃簾鐘舵��
///</summary>
[SugarColumn(ColumnName = "FCANCELSTATUS")]
- public string Fcancelstatus { get; set; }
+ public string? Fcancelstatus { get; set; }
/// <summary>
/// 浣滃簾浜�
///</summary>
[SugarColumn(ColumnName = "FCANCELLERID")]
- public string Fcancellerid { get; set; }
+ public string? Fcancellerid { get; set; }
/// <summary>
/// 鐗堟湰鍙�
///</summary>
[SugarColumn(ColumnName = "FVERSIONNO")]
- public string Fversionno { get; set; }
+ public string? Fversionno { get; set; }
/// <summary>
/// 鍙樻洿浜�
///</summary>
[SugarColumn(ColumnName = "FCHANGERID")]
- public string Fchangerid { get; set; }
+ public string? Fchangerid { get; set; }
/// <summary>
/// 鍙戣揣鏃ユ湡
///</summary>
diff --git a/MES.Service/Modes/SalesOrder/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrder/SalesOrderDetail.cs
index d4ad26d..5161ecd 100644
--- a/MES.Service/Modes/SalesOrder/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrder/SalesOrderDetail.cs
@@ -13,7 +13,7 @@
/// <summary>
///
///</summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
@@ -31,12 +31,12 @@
/// 鐗╂枡缂栫爜
///</summary>
[SugarColumn(ColumnName = "FMATERIALID")]
- public string Fmaterialid { get; set; }
+ public string? Fmaterialid { get; set; }
/// <summary>
/// 閿�鍞崟浣�
///</summary>
[SugarColumn(ColumnName = "FUNITID")]
- public string Funitid { get; set; }
+ public string? Funitid { get; set; }
/// <summary>
/// 閿�鍞暟閲�
///</summary>
@@ -46,7 +46,7 @@
/// 璁′环鍗曚綅
///</summary>
[SugarColumn(ColumnName = "FPRICEUNITID")]
- public string Fpriceunitid { get; set; }
+ public string? Fpriceunitid { get; set; }
/// <summary>
/// 璁′环鏁伴噺
///</summary>
@@ -61,7 +61,7 @@
/// 鏄惁璧犲搧
///</summary>
[SugarColumn(ColumnName = "FISFREE")]
- public string Fisfree { get; set; }
+ public string? Fisfree { get; set; }
/// <summary>
/// 缁撶畻缁勭粐
///</summary>
@@ -71,27 +71,27 @@
/// 璐т富绫诲瀷
///</summary>
[SugarColumn(ColumnName = "FOWNERTYPEID")]
- public string Fownertypeid { get; set; }
+ public string? Fownertypeid { get; set; }
/// <summary>
/// 璐т富
///</summary>
[SugarColumn(ColumnName = "FOWNERID")]
- public string Fownerid { get; set; }
+ public string? Fownerid { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
[SugarColumn(ColumnName = "FENTRYNOTE")]
- public string Fentrynote { get; set; }
+ public string? Fentrynote { get; set; }
/// <summary>
/// 璁″垝璺熻釜鍙�
///</summary>
[SugarColumn(ColumnName = "FMTONO")]
- public string Fmtono { get; set; }
+ public string? Fmtono { get; set; }
/// <summary>
/// 鎵瑰彿
///</summary>
[SugarColumn(ColumnName = "FLOT")]
- public string Flot { get; set; }
+ public string? Flot { get; set; }
/// <summary>
/// 鍙戣揣涓婇檺
///</summary>
@@ -106,17 +106,17 @@
/// 瓒呭彂鎺у埗鍗曚綅
///</summary>
[SugarColumn(ColumnName = "FOUTLMTUNITID")]
- public string Foutlmtunitid { get; set; }
+ public string? Foutlmtunitid { get; set; }
/// <summary>
/// 涓氬姟鍏抽棴
///</summary>
[SugarColumn(ColumnName = "FMRPCLOSESTATUS")]
- public string Fmrpclosestatus { get; set; }
+ public string? Fmrpclosestatus { get; set; }
/// <summary>
/// 涓氬姟缁堟
///</summary>
[SugarColumn(ColumnName = "FMRPTERMINATESTATUS")]
- public string Fmrpterminatestatus { get; set; }
+ public string? Fmrpterminatestatus { get; set; }
/// <summary>
/// 缁堟鏃ユ湡
///</summary>
@@ -131,12 +131,12 @@
/// 婧愬崟绫诲瀷
///</summary>
[SugarColumn(ColumnName = "FSRCTYPE")]
- public string Fsrctype { get; set; }
+ public string? Fsrctype { get; set; }
/// <summary>
/// 婧愬崟鍗曞彿
///</summary>
[SugarColumn(ColumnName = "FSRCBILLNO")]
- public string Fsrcbillno { get; set; }
+ public string? Fsrcbillno { get; set; }
/// <summary>
/// 绱鍙戣揣閫氱煡鏁伴噺
///</summary>
@@ -171,16 +171,16 @@
/// 瀹㈡埛鐗╂枡缂栫爜
///</summary>
[SugarColumn(ColumnName = "FMAPID")]
- public string Fmapid { get; set; }
+ public string? Fmapid { get; set; }
/// <summary>
/// 瀹㈡埛鐗╂枡鍚嶇О
///</summary>
[SugarColumn(ColumnName = "FMAPNAME")]
- public string Fmapname { get; set; }
+ public string? Fmapname { get; set; }
/// <summary>
/// 瀹㈡埛瑙勬牸鍨嬪彿
///</summary>
[SugarColumn(ColumnName = "FMAPSPEC")]
- public string Fmapspec { get; set; }
+ public string? Fmapspec { get; set; }
}
}
diff --git a/MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs
index 0d0b040..da6525f 100644
--- a/MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs
+++ b/MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs
@@ -111,5 +111,10 @@
///</summary>
[SugarColumn(ColumnName="FORDERNO" )]
public string Forderno { get; set; }
+ /// <summary>
+ /// 閫�璐ф楠屾爣璇�
+ ///</summary>
+ [SugarColumn(ColumnName = "FRETURNCHECK")]
+ public decimal? FReturnCheck { get; set; }
}
}
--
Gitblit v1.9.3