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/SalesOrder.cs | 306 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 214 insertions(+), 92 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/SalesOrder.cs b/StandardPda/MES.Service/Modes/SalesOrder.cs
index 304b4ec..596d5d8 100644
--- a/StandardPda/MES.Service/Modes/SalesOrder.cs
+++ b/StandardPda/MES.Service/Modes/SalesOrder.cs
@@ -1,113 +1,235 @@
锘縰sing SqlSugar;
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞鍗曡〃
-/// </summary>
-[SugarTable("SALES_ORDER")]
-public class SalesOrder
+namespace MES.Service.Modes
{
/// <summary>
- /// SEQ_sales搴忓垪
+ /// 閿�鍞鍗曡〃
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarTable("SALES_ORDER")]
+ public class SalesOrder
+ {
+ /// <summary>
+ /// SEQ_sales搴忓垪
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SALES_ORDER_ID", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_ID")]
- public string OrderId { get; set; }
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public decimal? ErpID { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曞埆
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_TYPE")]
- public string OrderType { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
- /// <summary>
- /// 鍙楄鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_DATE")]
- public DateTime? OrderDate { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ public string? BillTypeId { get; set; }
- /// <summary>
- /// 鍗曟嵁鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_VERSION")]
- public long? DocumentVersion { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
+ public string? DocumentStatus { get; set; }
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_DATE")]
- public DateTime? DocumentDate { get; set; }
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_DATE")]
+ public DateTime? FDate { get; set; }
- /// <summary>
- /// 宸ュ巶缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_ID")]
- public string FactoryId { get; set; }
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "BUSINESS_TYPE")]
+ public string? BusinessType { get; set; }
- /// <summary>
- /// 宸ュ巶绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_NAME")]
- public string FactoryName { get; set; }
+ /// <summary>
+ /// 浜よ揣鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "HEAD_DELIVERY_WAY")]
+ public string? HeadDeliveryWay { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ID")]
- public string CustomerId { get; set; }
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ /// </summary>
+ [SugarColumn(ColumnName = "HEAD_LOC_ID")]
+ public string? HeadLocId { get; set; }
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NAME")]
- public string CustomerName { get; set; }
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_ID")]
+ public string? CustId { get; set; }
- /// <summary>
- /// 瀹㈡埛鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
- public string CustomerOrderId { get; set; }
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_STATUS")]
+ public string? CloseStatus { get; set; }
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_ID")]
- public string DepartmentId { get; set; }
+ /// <summary>
+ /// 閿�鍞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_DEPT_ID")]
+ public string? SaleDeptId { get; set; }
- /// <summary>
- /// 鎬绘暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_QUANTITY")]
- public decimal? TotalQuantity { get; set; }
+ /// <summary>
+ /// 閿�鍞憳
+ /// </summary>
+ [SugarColumn(ColumnName = "SALER_ID")]
+ public string? SalerId { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
+ /// <summary>
+ /// 鍙樻洿鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "CHANGE_REASON")]
+ public string? ChangeReason { get; set; }
- /// <summary>
- /// erp瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "APPROVAL_DATE")]
- public DateTime? ApprovalDate { get; set; }
+ /// <summary>
+ /// 缁撶畻鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SETTLE_ID")]
+ public string? SettleId { get; set; }
- /// <summary>
- /// erp瀹℃牳鑰�
- /// </summary>
- [SugarColumn(ColumnName = "APPROVER")]
- public string Approver { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVER_ID")]
+ public string? ApproverId { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
+ /// <summary>
+ /// 鏀惰揣浜哄鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINK_MAN")]
+ public string? LinkMan { get; set; }
+
+ /// <summary>
+ /// 浠樻鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHARGE_ID")]
+ public string? ChargeId { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [SugarColumn(ColumnName = "LINK_PHONE")]
+ public string? LinkPhone { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATOR_ID")]
+ public string? CreatorId { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀逛汉
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFIER_ID")]
+ public string? ModifierId { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY_DATE")]
+ public DateTime? ModifyDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVE_DATE")]
+ public DateTime? ApproveDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSER_ID")]
+ public string? CloserId { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_DATE")]
+ public DateTime? CloseDate { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHANGE_DATE")]
+ public DateTime? ChangeDate { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCEL_STATUS")]
+ public string? CancelStatus { get; set; }
+
+ /// <summary>
+ /// 浣滃簾浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCELLER_ID")]
+ public string? CancellerId { get; set; }
+
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "VERSION_NO")]
+ public double? VersionNo { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHANGER_ID")]
+ public string? ChangerId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "ENTRY_NOTE")]
+ public string? EntryNote { get; set; }
+
+ //--------------鏂板瀛楁---------------------------------
+
+ /// <summary>
+ /// 涓氬姟鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSALES_PERSON", IsNullable = true)]
+ public string? FSalesPerson { get; set; }
+
+ /// <summary>
+ /// 椤圭洰
+ /// </summary>
+ [SugarColumn(ColumnName = "FPROJECT", IsNullable = true)]
+ public string? FProject { get; set; }
+
+ /// <summary>
+ /// 闇�姹傚垎绫�
+ /// </summary>
+ [SugarColumn(ColumnName = "FDEMANDCATEGORY", IsNullable = true)]
+ public string? FDemandCategory { get; set; }
+
+ /// <summary>
+ /// 璧峰鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTART_DATE", IsNullable = true)]
+ public string? FStartDate { get; set; }
+
+ /// <summary>
+ /// 鎴鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "FEND_DATE", IsNullable = true)]
+ public string? FEndDate { get; set; }
+ }
+}
--
Gitblit v1.9.3