From 8f25fecab6e6a79096b9940ab3432401b9045b39 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期四, 10 七月 2025 18:00:14 +0800 Subject: [PATCH] 首检\巡检\入库检适配 --- MES.Service/Modes/SalesOrder.cs | 191 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 144 insertions(+), 47 deletions(-) diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs index 304b4ec..84de021 100644 --- a/MES.Service/Modes/SalesOrder.cs +++ b/MES.Service/Modes/SalesOrder.cs @@ -11,103 +11,200 @@ /// <summary> /// SEQ_sales搴忓垪 /// </summary> - [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", + [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> - /// 璁㈠崟鍗曞彿 + /// ERP澶碔D /// </summary> - [SugarColumn(ColumnName = "ORDER_ID")] - public string OrderId { get; set; } + [SugarColumn(ColumnName = "ERP_ID")] + public decimal? ErpId { get; set; } /// <summary> - /// 璁㈠崟鍗曞埆 + /// 鍗曟嵁缂栧彿 /// </summary> - [SugarColumn(ColumnName = "ORDER_TYPE")] - public string OrderType { get; set; } + [SugarColumn(ColumnName = "BILL_NO")] + public string? BillNo { get; set; } /// <summary> - /// 鍙楄鏃ユ湡 + /// 鍗曟嵁绫诲瀷 /// </summary> - [SugarColumn(ColumnName = "ORDER_DATE")] - public DateTime? OrderDate { get; set; } + [SugarColumn(ColumnName = "BILL_TYPE_ID")] + public string? BillTypeId { get; set; } /// <summary> - /// 鍗曟嵁鐗堟湰 + /// 鍗曟嵁鐘舵�� /// </summary> - [SugarColumn(ColumnName = "DOCUMENT_VERSION")] - public long? DocumentVersion { get; set; } + [SugarColumn(ColumnName = "DOCUMENT_STATUS")] + public string? DocumentStatus { get; set; } /// <summary> - /// 鍗曟嵁鏃ユ湡 + /// 鏃ユ湡 /// </summary> - [SugarColumn(ColumnName = "DOCUMENT_DATE")] - public DateTime? DocumentDate { get; set; } + [SugarColumn(ColumnName = "F_DATE")] + public DateTime? FDate { get; set; } /// <summary> - /// 宸ュ巶缂栧彿 + /// 涓氬姟绫诲瀷 /// </summary> - [SugarColumn(ColumnName = "FACTORY_ID")] - public string FactoryId { get; set; } + [SugarColumn(ColumnName = "BUSINESS_TYPE")] + public string? BusinessType { get; set; } /// <summary> - /// 宸ュ巶绠�绉� + /// 浜よ揣鏂瑰紡 /// </summary> - [SugarColumn(ColumnName = "FACTORY_NAME")] - public string FactoryName { get; set; } + [SugarColumn(ColumnName = "HEAD_DELIVERY_WAY")] + public string? HeadDeliveryWay { get; set; } /// <summary> - /// 瀹㈡埛缂栧彿 + /// 浜よ揣鍦扮偣 /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_ID")] - public string CustomerId { get; set; } + [SugarColumn(ColumnName = "HEAD_LOC_ID")] + public string? HeadLocId { get; set; } /// <summary> - /// 瀹㈡埛绠�绉� + /// 瀹㈡埛 /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_NAME")] - public string CustomerName { get; set; } + [SugarColumn(ColumnName = "CUST_ID")] + public string? CustId { get; set; } /// <summary> - /// 瀹㈡埛鍗曞彿 + /// 鍏抽棴鐘舵�� /// </summary> - [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")] - public string CustomerOrderId { get; set; } + [SugarColumn(ColumnName = "CLOSE_STATUS")] + public string? CloseStatus { get; set; } /// <summary> - /// 閮ㄩ棬缂栧彿 + /// 閿�鍞儴闂� /// </summary> - [SugarColumn(ColumnName = "DEPARTMENT_ID")] - public string DepartmentId { get; set; } + [SugarColumn(ColumnName = "SALE_DEPT_ID")] + public string? SaleDeptId { get; set; } /// <summary> - /// 鎬绘暟閲� + /// 閿�鍞憳 /// </summary> - [SugarColumn(ColumnName = "TOTAL_QUANTITY")] - public decimal? TotalQuantity { get; set; } + [SugarColumn(ColumnName = "SALER_ID")] + public string? SalerId { get; set; } + + /// <summary> + /// 鍙樻洿鍘熷洜 + /// </summary> + [SugarColumn(ColumnName = "CHANGE_REASON")] + public string? ChangeReason { get; set; } /// <summary> /// 澶囨敞 /// </summary> - [SugarColumn(ColumnName = "REMARKS")] - public string Remarks { get; set; } + [SugarColumn(ColumnName = "NOTE")] + public string? Note { get; set; } + + /// <summary> + /// 缁撶畻鏂� + /// </summary> + [SugarColumn(ColumnName = "SETTLE_ID")] + public string? SettleId { get; set; } + + /// <summary> + /// erp瀹℃牳浜� + /// </summary> + [SugarColumn(ColumnName = "APPROVER_ID")] + public string? ApproverId { get; set; } + + /// <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> /// erp瀹℃牳鏃ユ湡 /// </summary> - [SugarColumn(ColumnName = "APPROVAL_DATE")] - public DateTime? ApprovalDate { get; set; } + [SugarColumn(ColumnName = "APPROVE_DATE")] + public DateTime? ApproveDate { get; set; } /// <summary> - /// erp瀹℃牳鑰� + /// 鍏抽棴浜� /// </summary> - [SugarColumn(ColumnName = "APPROVER")] - public string Approver { get; set; } + [SugarColumn(ColumnName = "CLOSER_ID")] + public string? CloserId { get; set; } /// <summary> - /// ERPID + /// 鍏抽棴鏃ユ湡 /// </summary> - [SugarColumn(ColumnName = "ERP_ID")] - public string ErpId { get; set; } + [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 decimal? 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; } + } \ No newline at end of file -- Gitblit v1.9.3