From 94c9e2a81a3808e9e974ad43b7c2798093b632ed Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 29 七月 2025 14:20:09 +0800
Subject: [PATCH] 1、销售模块：预测订单、标准出货、销售退货接口代码提交 2、仓退申请单接口bug修复代码提交
---
StandardPda/MES.Service/Modes/SalesReturnNoticeDetail.cs | 236 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 158 insertions(+), 78 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/SalesReturnNoticeDetail.cs b/StandardPda/MES.Service/Modes/SalesReturnNoticeDetail.cs
index 3d64ef4..e6db49d 100644
--- a/StandardPda/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/StandardPda/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -11,145 +11,225 @@
/// <summary>
/// SEQ_sales
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_RETURN_NOTICE_DETAIL", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 鍗曟嵁琛屽彿
+ /// 鐗╂枡缂栫爜
/// </summary>
- [SugarColumn(ColumnName = "LINE_NUMBER")]
- public long? LineNumber { get; set; }
+ [SugarColumn(ColumnName = "MATERIAL_ID")]
+ public string MaterialId { get; set; }
/// <summary>
- /// 浜у搧浠ｇ爜
+ /// 閿�鍞崟浣�
/// </summary>
- [SugarColumn(ColumnName = "PRODUCT_CODE")]
- public string ProductCode { get; set; }
+ [SugarColumn(ColumnName = "SALES_UNIT_ID")]
+ public string SalesUnitId { get; set; }
/// <summary>
- /// 浜у搧鍚嶇О
+ /// 閿�鍞暟閲�
/// </summary>
- [SugarColumn(ColumnName = "PRODUCT_NAME")]
- public string ProductName { get; set; }
+ [SugarColumn(ColumnName = "SALES_QUANTITY")]
+ public decimal SalesQuantity { get; set; }
/// <summary>
- /// 浜у搧瑙勬牸
+ /// 鏄惁璧犲搧
/// </summary>
- [SugarColumn(ColumnName = "PRODUCT_SPEC")]
- public string ProductSpec { get; set; }
+ [SugarColumn(ColumnName = "IS_FREE")]
+ public string IsFree { get; set; }
/// <summary>
- /// 閲戦
+ /// 閫�璐ф棩鏈�
/// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public decimal? Amount { get; set; }
+ [SugarColumn(ColumnName = "RETURN_DATE")]
+ public DateTime? ReturnDate { get; set; }
/// <summary>
- /// 鍗曚环
+ /// 浠撳簱
/// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public decimal? UnitPrice { get; set; }
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string Warehouse { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 璁″垝璺熻釜鍙�
/// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "OUT_QUANTITY")]
- public decimal? OutQuantity { get; set; }
+ [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 = "INVENTORY_UNIT")]
+ public string InventoryUnit { get; set; }
/// <summary>
- /// 閿�鍞鍗旾D
+ /// 搴撳瓨鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_DETAIL_ID")]
- public string SalesOrderDetailId { get; set; }
+ [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
+ public decimal InventoryQuantity { get; set; }
/// <summary>
- /// 鍩烘湰鍗曚环
+ /// 璐т富绫诲瀷
/// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_PRICE")]
- public decimal? BaseUnitPrice { get; set; }
+ [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
+ public string OwnerTypeId { get; set; }
/// <summary>
- /// 鍩烘湰鍗曚綅鏁伴噺
+ /// 璐т富
/// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_QUANTITY")]
- public decimal? BaseUnitQuantity { get; set; }
+ [SugarColumn(ColumnName = "OWNER_ID")]
+ public string OwnerId { get; set; }
/// <summary>
- /// 浠撳簱浠ｇ爜
+ /// 婧愬崟绫诲瀷
/// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_CODE")]
- public string WarehouseCode { get; set; }
+ [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")]
+ public string SourceBillType { get; set; }
/// <summary>
- /// 浠撳簱鍚嶇О
+ /// 婧愬崟鍗曞彿
/// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_NAME")]
- public string WarehouseName { get; set; }
+ [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
+ public string SourceBillNo { get; set; }
/// <summary>
- /// 鍩烘湰鍗曚綅鍑哄簱鏁伴噺
+ /// 璁㈠崟鍗曞彿
/// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_OUT_QUANTITY")]
- public decimal? BaseUnitOutQuantity { get; set; }
+ [SugarColumn(ColumnName = "ORDER_BILL_NO")]
+ public string OrderBillNo { get; set; }
/// <summary>
- /// 鍗曚綅
+ /// ERP琛孖D
/// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { 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
/// </summary>
[SugarColumn(ColumnName = "ERP_HEAD_ID")]
public string ErpHeadId { get; set; }
+
+ /// <summary>
+ /// 琛屽彿 / Line number
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NUMBER", SqlParameterDbType = System.Data.DbType.Int32)]
+ public int? FLineNumber { get; set; }
+
+ /// <summary>
+ /// 琛岀姸鎬� / Line status (e.g. 'Active','Cancelled')
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_STATUS", Length = 50)]
+ public string FLineStatus { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧鎴风紪鍙� / Refund customer ID
+ /// </summary>
+ [SugarColumn(ColumnName = "REFUND_CUSTOMER", Length = 100)]
+ public string FRefundCustomer { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮� / Supplier code
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLIER", Length = 100)]
+ public string FSupplier { get; set; }
+
+ /// <summary>
+ /// 鍏嶈垂鍝佺被鍨� / Freebie type (Sample/Gift etc.)
+ /// </summary>
+ [SugarColumn(ColumnName = "FREEBIE_TYPE", Length = 50)]
+ public string FFreebieType { get; set; }
+
+ /// <summary>
+ /// 鍏嶈垂鍝佸師鍥� / Freebie reason description
+ /// </summary>
+ [SugarColumn(ColumnName = "FREEBIE_REASON", Length = 200)]
+ public string FFreebieReason { get; set; }
+
+ /// <summary>
+ /// 婧愬ご鍗曟嵁琛屽彿 / Source document line number
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_DOC_LINE_NO", SqlParameterDbType = System.Data.DbType.Int32)]
+ public int? FSourceDocLineNo { get; set; }
+
+ /// <summary>
+ /// 婧愬ご鍗曟嵁瀛愯鍙� / Source document sub-line number
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_DOC_SUB_LINE_NO", SqlParameterDbType = System.Data.DbType.Int32)]
+ public int? FSourceDocSubLineNo { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁绫诲瀷 / Source document type (PO/SO/Invoice etc.)
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_DOC_TYPE", Length = 50)]
+ public string FSourceDocType { get; set; }
+
+ /// <summary>
+ /// 鍘熷鍗曟嵁琛屽彿 / Original document line number
+ /// </summary>
+ [SugarColumn(ColumnName = "ORIGINAL_DOC_LINE_NO", SqlParameterDbType = System.Data.DbType.Int32)]
+ public int? FOriginalDocLineNo { get; set; }
+
+ /// <summary>
+ /// 琛ヨ揣缁勭粐浠ｇ爜 / Replenishment organization code
+ /// </summary>
+ [SugarColumn(ColumnName = "REPLENISH_ORG", Length = 50)]
+ public string FReplenishOrg { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣缁勭粐浠ｇ爜 / Receiving organization code
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVING_ORG", Length = 50)]
+ public string FReceivingOrg { get; set; }
+
+ /// <summary>
+ /// 鍘熶笟鍔″憳ID / Original salesman ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ORIGINAL_SALESMAN", Length = 50)]
+ public string FOriginalSalesman { get; set; }
+
+ /// <summary>
+ /// 鍘熼儴闂ㄤ唬鐮� / Original department code
+ /// </summary>
+ [SugarColumn(ColumnName = "ORIGINAL_DEPT", Length = 50)]
+ public string FOriginalDept { get; set; }
+
+ /// <summary>
+ /// 椤圭洰缂栧彿 / Project number
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT", Length = 100)]
+ public string FProject { get; set; }
+
+ /// <summary>
+ /// 閫�璐у師鍥犲垎绫� / Return reason category
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_REASON", Length = 200)]
+ public string FReturnReason { get; set; }
+
+ /// <summary>
+ /// 閫�璐ц缁嗚鏄� / Detailed return description
+ /// <example>璐х墿鍦ㄨ繍杈撹繃绋嬩腑鍙戠敓鐮存崯</example>
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_DESCRIPTION", Length = 4000)]
+ public string FReturnDescription { get; set; }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3