From 795fa3a0ce15e32463a444c2b3fc1468596afba2 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 18 三月 2025 13:41:48 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~sjz/YC

---
 MES.Service/Modes/SalesReturnNoticeDetail.cs |  148 +++++++++++++++++++++++++-----------------------
 1 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/MES.Service/Modes/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNoticeDetail.cs
index 3d64ef4..8cf18a4 100644
--- a/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -9,143 +9,149 @@
 public class SalesReturnNoticeDetail
 {
     /// <summary>
-    ///     SEQ_sales
+    ///     SEQ_thtz_mx
     /// </summary>
-    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
+    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_THTZ_MX",
         IsPrimaryKey = true)]
     public decimal Id { get; set; }
 
     /// <summary>
-    ///     鍗曟嵁琛屽彿
+    ///     閿�鍞鍗曞彿
     /// </summary>
-    [SugarColumn(ColumnName = "LINE_NUMBER")]
-    public long? LineNumber { get; set; }
+    [SugarColumn(ColumnName = "SALES_ORDER_ID")]
+    public string? SalesOrderId { get; set; }
 
     /// <summary>
-    ///     浜у搧浠ｇ爜
+    ///     鐗╂枡缂栫爜
     /// </summary>
-    [SugarColumn(ColumnName = "PRODUCT_CODE")]
-    public string ProductCode { get; set; }
+    [SugarColumn(ColumnName = "MATERIAL_ID")]
+    public string? MaterialId { get; set; }
 
     /// <summary>
-    ///     浜у搧鍚嶇О
+    ///     鐗╂枡鍚嶇О
     /// </summary>
-    [SugarColumn(ColumnName = "PRODUCT_NAME")]
-    public string ProductName { get; set; }
+    [SugarColumn(ColumnName = "MATERIAL_NAME")]
+    public string? MaterialName { get; set; }
 
     /// <summary>
-    ///     浜у搧瑙勬牸
+    ///     鐗╂枡瑙勬牸
     /// </summary>
-    [SugarColumn(ColumnName = "PRODUCT_SPEC")]
-    public string ProductSpec { get; set; }
+    [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
+    public string? MaterialSpecification { get; set; }
 
     /// <summary>
-    ///     閲戦
+    ///     閿�鍞崟浣�
     /// </summary>
-    [SugarColumn(ColumnName = "AMOUNT")]
-    public decimal? Amount { get; set; }
+    [SugarColumn(ColumnName = "SALES_UNIT_ID")]
+    public string? SalesUnitId { get; set; }
 
     /// <summary>
-    ///     鍗曚环
+    ///     閿�鍞暟閲�
     /// </summary>
-    [SugarColumn(ColumnName = "UNIT_PRICE")]
-    public decimal? UnitPrice { get; set; }
+    [SugarColumn(ColumnName = "SALES_QUANTITY")]
+    public decimal? SalesQuantity { get; set; }
 
     /// <summary>
-    ///     鏁伴噺
+    ///     鏄惁璧犲搧
     /// </summary>
-    [SugarColumn(ColumnName = "QUANTITY")]
-    public decimal? Quantity { get; set; }
+    [SugarColumn(ColumnName = "IS_FREE")]
+    public string? IsFree { get; set; }
 
     /// <summary>
-    ///     鍑哄簱鏁伴噺
+    ///     閫�璐ф棩鏈�
     /// </summary>
-    [SugarColumn(ColumnName = "OUT_QUANTITY")]
-    public decimal? OutQuantity { get; set; }
+    [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 = "BATCH_NUMBER")]
-    public string BatchNumber { get; set; }
-
-    /// <summary>
-    ///     閫�璐ф暟閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "RETURN_QUANTITY")]
-    public decimal? ReturnQuantity { get; set; }
-
-    /// <summary>
-    ///     鍙戣揣鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "DELIVERY_QUANTITY")]
-    public decimal? DeliveryQuantity { get; set; }
+    [SugarColumn(ColumnName = "LOT_NUMBER")]
+    public string? LotNumber { get; set; }
 
     /// <summary>
     ///     澶囨敞
     /// </summary>
-    [SugarColumn(ColumnName = "REMARKS")]
-    public string Remarks { get; set; }
+    [SugarColumn(ColumnName = "NOTE")]
+    public string? Note { get; set; }
 
     /// <summary>
-    ///     閿�鍞鍗曞崟鍙�
+    ///     閫�璐х被鍨�
     /// </summary>
-    [SugarColumn(ColumnName = "SALES_ORDER_ID")]
-    public string SalesOrderId { get; set; }
+    [SugarColumn(ColumnName = "RETURN_TYPE")]
+    public string? ReturnType { get; set; }
 
     /// <summary>
-    ///     閿�鍞鍗曞垎褰�
+    ///     璺熷崟鍛�
     /// </summary>
-    [SugarColumn(ColumnName = "SALES_ORDER_ENTRY")]
-    public string SalesOrderEntry { get; set; }
+    [SugarColumn(ColumnName = "SALES_CLERK")]
+    public string? SalesClerk { get; set; }
 
     /// <summary>
-    ///     閿�鍞鍗旾D
+    ///     搴撳瓨鍗曚綅
     /// </summary>
-    [SugarColumn(ColumnName = "SALES_ORDER_DETAIL_ID")]
-    public string SalesOrderDetailId { get; set; }
+    [SugarColumn(ColumnName = "INVENTORY_UNIT")]
+    public string? InventoryUnit { get; set; }
 
     /// <summary>
-    ///     鍩烘湰鍗曚环
+    ///     搴撳瓨鏁伴噺
     /// </summary>
-    [SugarColumn(ColumnName = "BASE_UNIT_PRICE")]
-    public decimal? BaseUnitPrice { get; set; }
+    [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
+    public decimal? InventoryQuantity { get; set; }
 
     /// <summary>
-    ///     鍩烘湰鍗曚綅鏁伴噺
+    ///     鐗╂枡绫诲埆
     /// </summary>
-    [SugarColumn(ColumnName = "BASE_UNIT_QUANTITY")]
-    public decimal? BaseUnitQuantity { get; set; }
+    [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
+    public string? MaterialCategory { get; set; }
 
     /// <summary>
-    ///     浠撳簱浠ｇ爜
+    ///     璐т富绫诲瀷
     /// </summary>
-    [SugarColumn(ColumnName = "WAREHOUSE_CODE")]
-    public string WarehouseCode { get; set; }
+    [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
+    public string? OwnerTypeId { get; set; }
 
     /// <summary>
-    ///     浠撳簱鍚嶇О
+    ///     璐т富
     /// </summary>
-    [SugarColumn(ColumnName = "WAREHOUSE_NAME")]
-    public string WarehouseName { get; set; }
+    [SugarColumn(ColumnName = "OWNER_ID")]
+    public string? OwnerId { get; set; }
 
     /// <summary>
-    ///     鍩烘湰鍗曚綅鍑哄簱鏁伴噺
+    ///     婧愬崟绫诲瀷
     /// </summary>
-    [SugarColumn(ColumnName = "BASE_UNIT_OUT_QUANTITY")]
-    public decimal? BaseUnitOutQuantity { get; set; }
+    [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")]
+    public string? SourceBillType { get; set; }
 
     /// <summary>
-    ///     鍗曚綅
+    ///     婧愬崟鍗曞彿
     /// </summary>
-    [SugarColumn(ColumnName = "UNIT")]
-    public string Unit { get; set; }
+    [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
+    public string? SourceBillNo { get; set; }
+
+    /// <summary>
+    ///     璁㈠崟鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "ORDER_BILL_NO")]
+    public string? OrderBillNo { get; set; }
 
     /// <summary>
     ///     ERPID
     /// </summary>
-    [SugarColumn(ColumnName = "ERP_ID")]
-    public string ErpId { get; set; }
+    [SugarColumn(ColumnName = "ERP_LINE_ID")]
+    public string ErpLineId { get; set; }
 
     /// <summary>
     ///     ERP澶碔D

--
Gitblit v1.9.3