From 10cced0eeb7d17aab1d1a58c9be163ba0aeb2640 Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期一, 24 二月 2025 11:17:15 +0800 Subject: [PATCH] 1.销售订单(ERP->MES)已完成 --- MES.Service/Modes/SalesOrder.cs | 218 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 121 insertions(+), 97 deletions(-) diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs index 304b4ec..2ce2dd9 100644 --- a/MES.Service/Modes/SalesOrder.cs +++ b/MES.Service/Modes/SalesOrder.cs @@ -11,103 +11,127 @@ /// <summary> /// SEQ_sales搴忓垪 /// </summary> - [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", - IsPrimaryKey = true)] - public decimal Id { get; set; } + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + public Guid? Id { get; set; } - /// <summary> - /// 璁㈠崟鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "ORDER_ID")] - public string OrderId { get; set; } - - /// <summary> - /// 璁㈠崟鍗曞埆 - /// </summary> - [SugarColumn(ColumnName = "ORDER_TYPE")] - public string OrderType { get; set; } - - /// <summary> - /// 鍙楄鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "ORDER_DATE")] - public DateTime? OrderDate { get; set; } - - /// <summary> - /// 鍗曟嵁鐗堟湰 - /// </summary> - [SugarColumn(ColumnName = "DOCUMENT_VERSION")] - public long? DocumentVersion { get; set; } - - /// <summary> - /// 鍗曟嵁鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "DOCUMENT_DATE")] - public DateTime? DocumentDate { get; set; } - - /// <summary> - /// 宸ュ巶缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "FACTORY_ID")] - public string FactoryId { get; set; } - - /// <summary> - /// 宸ュ巶绠�绉� - /// </summary> - [SugarColumn(ColumnName = "FACTORY_NAME")] - public string FactoryName { get; set; } - - /// <summary> - /// 瀹㈡埛缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_ID")] - public string CustomerId { get; set; } - - /// <summary> - /// 瀹㈡埛绠�绉� - /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_NAME")] - public string CustomerName { get; set; } - - /// <summary> - /// 瀹㈡埛鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")] - public string CustomerOrderId { get; set; } - - /// <summary> - /// 閮ㄩ棬缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "DEPARTMENT_ID")] - public string DepartmentId { get; set; } - - /// <summary> - /// 鎬绘暟閲� - /// </summary> - [SugarColumn(ColumnName = "TOTAL_QUANTITY")] - public decimal? TotalQuantity { get; set; } - - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "REMARKS")] - public string Remarks { get; set; } - - /// <summary> - /// erp瀹℃牳鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "APPROVAL_DATE")] - public DateTime? ApprovalDate { get; set; } - - /// <summary> - /// erp瀹℃牳鑰� - /// </summary> - [SugarColumn(ColumnName = "APPROVER")] - public string Approver { get; set; } - - /// <summary> - /// ERPID - /// </summary> [SugarColumn(ColumnName = "ERP_ID")] - public string ErpId { get; set; } + public decimal? ErpID { get; set; } // ERPID + + [SugarColumn(ColumnName = "BILL_NO")] + public string? BillNo { get; set; } // 鍗曟嵁缂栧彿 + + [SugarColumn(ColumnName = "BILL_TYPE_ID")] + public string? BillTypeId { get; set; } // 鍗曟嵁绫诲瀷 + + [SugarColumn(ColumnName = "DOCUMENT_STATUS")] + public string? DocumentStatus { get; set; } // 鍗曟嵁鐘舵�� + + [SugarColumn(ColumnName = "F_DATE")] + public DateTime? FDate { get; set; } // 鏃ユ湡 + + [SugarColumn(ColumnName = "BUSINESS_TYPE")] + public string? BusinessType { get; set; } // 涓氬姟绫诲瀷 + + [SugarColumn(ColumnName = "HEAD_DELIVERY_WAY")] + public string? HeadDeliveryWay { get; set; } // 浜よ揣鏂瑰紡 + + [SugarColumn(ColumnName = "HEAD_LOC_ID")] + public string? HeadLocId { get; set; } // 浜よ揣鍦扮偣 + + [SugarColumn(ColumnName = "SALE_ORG_ID")] + public string? SaleOrgId { get; set; } // 閿�鍞粍缁� + + //[SugarColumn(ColumnName = "UNW_TEXT_KHDD")] + //public string? UnWTextKhdd { get; set; } // 瀹㈡埛璁㈠崟 + + //[SugarColumn(ColumnName = "UNW_DATE_KHXQ")] + //public DateTime? UnWDateKhxq { get; set; } // 瀹㈡埛闇�姹備氦鏈� + + //[SugarColumn(ColumnName = "UNW_BASE_PROPERTY_KHDJ")] + //public string? UnWBasePropertyKhdj { get; set; } // 瀹㈡埛绛夌骇 + + [SugarColumn(ColumnName = "CUST_ID")] + public string? CustId { get; set; } // 瀹㈡埛 + + //[SugarColumn(ColumnName = "UNW_LARGE_TEXT_TBKHBZ")] + //public string? UnWLargetextTbkhbz { get; set; } // 娣樺疂瀹㈡埛澶囨敞 + + [SugarColumn(ColumnName = "CLOSE_STATUS")] + public string? CloseStatus { get; set; } // 鍏抽棴鐘舵�� + + [SugarColumn(ColumnName = "SALE_DEPT_ID")] + public string? SaleDeptId { get; set; } // 閿�鍞儴闂� + + [SugarColumn(ColumnName = "SALER_ID")] + public string? SalerId { get; set; } // 閿�鍞憳 + + [SugarColumn(ColumnName = "NOTE")] + public string? Note { get; set; } // 澶囨敞 + + //[SugarColumn(ColumnName = "UNW_REMARKS_KHJHDD")] + //public string? UnWRemarksKhjHdd { get; set; } // 瀹㈡埛浜よ揣鍦扮偣 + [SugarColumn(ColumnName = "RECEIVE_ID")] + public string? ReceiveId { get; set; } // 鏀惰揣鏂� + + [SugarColumn(ColumnName = "RECEIVE_CONTACT")] + public string? ReceiveContact { get; set; } // 鏀惰揣鏂硅仈绯讳汉 + + [SugarColumn(ColumnName = "SETTLE_ID")] + public string? SettleId { get; set; } // 缁撶畻鏂� + + [SugarColumn(ColumnName = "APPROVER_ID")] + public string? ApproverId { get; set; } // 瀹℃牳浜� + + [SugarColumn(ColumnName = "LINK_MAN")] + public string? LinkMan { get; set; } // 鏀惰揣浜哄鍚� + + [SugarColumn(ColumnName = "CHARGE_ID")] + public string? ChargeId { get; set; } // 浠樻鏂� + + [SugarColumn(ColumnName = "LINK_PHONE")] + public string? LinkPhone { get; set; } // 鑱旂郴鐢佃瘽 + + [SugarColumn(ColumnName = "CREATOR_ID")] + public string? CreatorId { get; set; } // 鍒涘缓浜� + + [SugarColumn(ColumnName = "CREATE_DATE")] + public DateTime? CreateDate { get; set; } // 鍒涘缓鏃ユ湡 + + [SugarColumn(ColumnName = "MODIFIER_ID")] + public string? ModifierId { get; set; } // 鏈�鍚庝慨鏀逛汉 + + [SugarColumn(ColumnName = "MODIFY_DATE")] + public DateTime? ModifyDate { get; set; } // 鏈�鍚庝慨鏀规棩鏈� + + [SugarColumn(ColumnName = "APPROVE_DATE")] + public DateTime? ApproveDate { get; set; } // 瀹℃牳鏃ユ湡 + + [SugarColumn(ColumnName = "CLOSER_ID")] + public string? CloserId { get; set; } // 鍏抽棴浜� + + [SugarColumn(ColumnName = "CLOSE_DATE")] + public DateTime? CloseDate { get; set; } // 鍏抽棴鏃ユ湡 + + [SugarColumn(ColumnName = "CHANGE_DATE")] + public DateTime? ChangeDate { get; set; } // 鍙樻洿鏃ユ湡 + + [SugarColumn(ColumnName = "CANCEL_STATUS")] + public string? CancelStatus { get; set; } // 浣滃簾鐘舵�� + + [SugarColumn(ColumnName = "CANCELLER_ID")] + public string? CancellerId { get; set; } // 浣滃簾浜� + + [SugarColumn(ColumnName = "VERSION_NO")] + public double? VersionNo { get; set; } // 鐗堟湰鍙� + + [SugarColumn(ColumnName = "CHANGE_REASON")] + public string? ChangeReason { get; set; } // 鍙樻洿鍘熷洜 + + [SugarColumn(ColumnName = "CHANGER_ID")] + public string? ChangerId { get; set; } // 鍙樻洿浜� + + [SugarColumn(ColumnName = "ENTRY_NOTE")] + public string? EntryNote { get; set; } // 澶囨敞 + + } \ No newline at end of file -- Gitblit v1.9.3