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/Dto/webApi/ErpSalesOrderDto.cs | 49 ++
MES.Service/Modes/SalesOrderDetail.cs | 312 +++++++++++++-----
MES.Service/Dto/webApi/ErpSalesOrder.cs | 8
MESApplication/Controllers/BasicData/SalesOrderController.cs | 102 ++++++
MES.Service/Modes/SalesOrder.cs | 218 +++++++-----
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs | 48 ++
MES.Service/service/BasicData/SalesOrderManager.cs | 240 ++++++++++++++
7 files changed, 793 insertions(+), 184 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
new file mode 100644
index 0000000..10822a7
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -0,0 +1,48 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpSalesOrderDetailDto
+{
+ public string? Type { get; set; }
+ public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
+ public string? FMapId { get; set; } // 瀹㈡埛鐗╂枡缂栫爜
+ public string? FMapName { get; set; } // 瀹㈡埛鐗╂枡鍚嶇О
+ public string? FMapSpec { get; set; } // 瀹㈡埛鐗╂枡瑙勬牸
+ public string? Seq { get; set; } // 搴忓彿
+ public string? FUnitID { get; set; } // 閿�鍞崟浣�
+ public string? FQty { get; set; } // 閿�鍞暟閲�
+ public string? FPriceUnitId { get; set; } // 璁′环鍗曚綅
+ public string? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
+ public string? FDeliveryDate { get; set; } // 瑕佽揣鏃ユ湡
+ public string? FIsFree { get; set; } // 鏄惁璧犲搧
+ public string? FSupplyOrgId { get; set; } // 渚涘簲缁勭粐
+ public string? FStockOrgId { get; set; } // 搴撳瓨缁勭粐
+ public string? FSettleOrgIds { get; set; } // 缁撶畻缁勭粐
+ public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷
+ public string? FOwnerId { get; set; } // 璐т富
+ public string? FEntryNote { get; set; } // 澶囨敞
+ public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FDeliveryMaxQty { get; set; } // 鍙戣揣涓婇檺
+ public string? FDeliveryMinQty { get; set; } // 鍙戣揣涓嬮檺
+ public string? FOutLmtUnitID { get; set; } // 瓒呭彂鎺у埗鍗曚綅
+ public string? FMrpCloseStatus { get; set; } // 涓氬姟鍏抽棴
+ public string? FMrpTerminateStatus { get; set; } // 涓氬姟缁堟
+ public string? FTerminateDate { get; set; } // 缁堟鏃ユ湡
+ public string? FTerminatorId { get; set; } // 缁堟浜�
+ public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } // 婧愬崟鍗曞彿
+ public string? FDeliQty { get; set; } // 绱鍙戣揣閫氱煡鏁伴噺
+ public string? FStockOutQty { get; set; } // 绱鍑哄簱鏁伴噺
+ public string? FBaseRetNoticeQty { get; set; } // 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ public string? FBaseReturnQty { get; set; } // 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
+ public string? FBaseRemainOutQty { get; set; } // 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
+ public string? FBASEARQTY { get; set; } // 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
+ public string? ErpID { get; set; } // ERPID
+ public string? EHID { get; set; } // ERP澶碔D
+
+
+
+ //public string? F_UNW_Text_xsddh { get; set; } // 閿�鍞鍗曞彿
+ //public string? F_UNW_Base_GDY { get; set; } // 璺熷崟鍛�
+
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrder.cs b/MES.Service/Dto/webApi/ErpSalesOrder.cs
new file mode 100644
index 0000000..c9849e6
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpSalesOrder.cs
@@ -0,0 +1,8 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpSalesOrder
+{
+ public ErpSalesOrderDto OrderDto { get; set; }
+
+ public List<ErpSalesOrderDetailDto> Items { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrderDto.cs b/MES.Service/Dto/webApi/ErpSalesOrderDto.cs
new file mode 100644
index 0000000..a85c723
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpSalesOrderDto.cs
@@ -0,0 +1,49 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpSalesOrderDto
+{
+ public string? Type { get; set; }
+ public string? ErpID { get; set; } // ERPID
+ public string? FBillNo { get; set; } // 鍗曟嵁缂栧彿
+ public string? FBillTypeID { get; set; } // 鍗曟嵁绫诲瀷
+ public string? FDocumentStatus { get; set; } // 鍗曟嵁鐘舵��
+ public string? FDate { get; set; } // 鍗曟嵁鏃ユ湡
+ public string? FBusinessType { get; set; } // 涓氬姟绫诲瀷
+ public string? FHeadDeliveryWay { get; set; } // 浜よ揣鏂瑰紡
+ public string? FHEADLOCID { get; set; } // 浜よ揣鍦扮偣
+ public string? FSaleOrgId { get; set; } // 閿�鍞粍缁�
+ public string? FCustId { get; set; } // 瀹㈡埛
+ public string? FCloseStatus { get; set; } // 鍏抽棴鐘舵��
+ public string? FSaleDeptId { get; set; } // 閿�鍞儴闂�
+ public string? FSalerId { get; set; } // 閿�鍞憳
+ //public string? FChangeReason { get; set; } // 鍙樻洿鍘熷洜
+ public string? FNote { get; set; } // 澶囨敞
+ //public string? FReceiveId { get; set; } // 鏀惰揣鏂�
+ //public string? FReceiveContact { get; set; } // 鏀惰揣鏂硅仈绯讳汉
+ //public string? FSettleId { get; set; } // 缁撶畻鏂�
+ public string? FApproverId { get; set; } // 瀹℃牳浜�
+ //public string? FLinkMan { get; set; } // 鏀惰揣浜哄鍚�
+ //public string? FChargeId { get; set; } // 浠樻鏂�
+ //public string? FLinkPhone { get; set; } // 鑱旂郴鐢佃瘽
+ public string? FCreatorId { get; set; } // 鍒涘缓浜�
+ public string? FCreateDate { get; set; } // 鍒涘缓鏃ユ湡
+ public string? FModifierId { get; set; } // 鏈�鍚庝慨鏀逛汉
+ public string? FModifyDate { get; set; } // 鏈�鍚庝慨鏀规棩鏈�
+ public string? FApproveDate { get; set; } // 瀹℃牳鏃ユ湡
+ public string? FCloserId { get; set; } // 鍏抽棴浜�
+ public string? FCloseDate { get; set; } // 鍏抽棴鏃ユ湡
+ public string? FChangeDate { get; set; } // 鍙樻洿鏃ユ湡
+ public string? FCancelStatus { get; set; } // 浣滃簾鐘舵��
+ public string? FCancellerId { get; set; } // 浣滃簾浜�
+ public string? FVersionNo { get; set; } // 鐗堟湰鍙�
+ public string? FChangeReason { get; set; } // 鍙樻洿鍘熷洜
+ public string? FChangerId { get; set; } // 鍙樻洿浜�
+ //public string? FEntryNote { get; set; } // 澶囨敞
+
+ //public string? F_UNW_Remarks_KHJHDD { get; set; } // 瀹㈡埛浜よ揣鍦扮偣
+ //public string? F_UNW_Text_KHDD { get; set; } // 瀹㈡埛璁㈠崟
+ //public string? F_UNW_Date_KHXQ { get; set; } // 瀹㈡埛闇�姹備氦鏈�
+ //public string? F_UNW_BaseProperty_KHDJ { get; set; } // 瀹㈡埛绛夌骇
+
+ //public string? F_UNW_LargeText_TBKHBZ { get; set; } // 娣樺疂瀹㈡埛澶囨敞
+}
\ No newline at end of file
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
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 0dd800e..0cce5a2 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -11,103 +11,241 @@
/// <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>
- /// 璁㈠崟鍗曞彿
+ /// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ORDER_ID")]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NUMBER")]
- public long? LineNumber { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_CODE")]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_NAME")]
- public string ProductName { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_SPEC")]
- public string ProductSpec { get; set; }
-
- /// <summary>
- /// 棰勪氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "SCHEDULED_DELIVERY_DATE")]
- public DateTime? ScheduledDeliveryDate { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_QUANTITY")]
- public decimal? OrderQuantity { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 閲戦
- /// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public decimal? Amount { get; set; }
-
- /// <summary>
- /// 瀹㈡埛浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_CODE")]
- public string CustomerProductCode { get; set; }
-
- /// <summary>
- /// 宸蹭氦璐ф暟
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERED_QUANTITY")]
- public decimal? DeliveredQuantity { get; set; }
-
- /// <summary>
- /// 缁撴潫
- /// </summary>
- [SugarColumn(ColumnName = "IS_CLOSED")]
- public string IsClosed { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
+ [SugarColumn(ColumnName = "pid")]
+ public Guid? Pid { get; set; }
/// <summary>
/// ERPID
/// </summary>
[SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
+ public decimal? ErpID { get; set; }
/// <summary>
/// ERP澶碔D
/// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
+ [SugarColumn(ColumnName = "E_HID")]
+ public decimal? EHID { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_ID")]
+ public string? MaterialId { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MAP_ID")]
+ public string? MapId { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "MAP_NAME")]
+ public string? MapName { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "MAP_SPEC")]
+ public string? MapSpec { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Seq")]
+ public int? Seq { get; set; }
+
+ /// <summary>
+ /// 閿�鍞崟浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT_ID")]
+ public string? UnitId { get; set; }
+
+ /// <summary>
+ /// 閿�鍞暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "QTY")]
+ public decimal? Qty { get; set; }
+
+ /// <summary>
+ /// 璁′环鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICE_UNIT_ID")]
+ public string? PriceUnitId { get; set; }
+
+ /// <summary>
+ /// 璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICE_UNIT_QTY")]
+ public decimal? PriceUnitQty { get; set; }
+
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ public DateTime? DeliveryDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁璧犲搧
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FREE")]
+ public string? IsFree { get; set; }
+
+ ///// <summary>
+ ///// 閿�鍞鍗曞彿
+ ///// </summary>
+ //[SugarColumn(ColumnName = "UNW_TEXT_XSDDH")]
+ //public string? SalesOrderNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLY_ORG_ID")]
+ public string? SupplyOrgId { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_ORG_ID")]
+ public string? StockOrgId { get; set; }
+
+ /// <summary>
+ /// 缁撶畻缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SETTLE_ORG_IDS")]
+ public string? SettleOrgIds { get; set; }
+
+
+ ///// <summary>
+ ///// 璺熷崟鍛�
+ ///// </summary>
+ //[SugarColumn(ColumnName = "UNW_BASE_GDY")]
+ //public string? SalesFollowUp { get; set; }
+
+ /// <summary>
+ /// 璐т富绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_TYPE_ID")]
+ public string? OwnerTypeId { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_ID")]
+ public string? OwnerId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "ENTRY_NOTE")]
+ public string? EntryNote { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "MTO_NO")]
+ public string? MtoNo { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT")]
+ public string? Lot { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_MAX_QTY")]
+ public decimal? DeliveryMaxQty { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_MIN_QTY")]
+ public decimal? DeliveryMinQty { get; set; }
+
+ /// <summary>
+ /// 瓒呭彂鎺у埗鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_LMT_UNIT_ID")]
+ public string? OutLmtUnitId { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鍏抽棴
+ /// </summary>
+ [SugarColumn(ColumnName = "MRP_CLOSE_STATUS")]
+ public string? MrpCloseStatus { get; set; }
+
+ /// <summary>
+ /// 涓氬姟缁堟
+ /// </summary>
+ [SugarColumn(ColumnName = "MRP_TERMINATE_STATUS")]
+ public string? MrpTerminateStatus { get; set; }
+
+ /// <summary>
+ /// 缁堟鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATE_DATE")]
+ public DateTime? TerminateDate { get; set; }
+
+ /// <summary>
+ /// 缁堟浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATER_ID")]
+ public string? TerminaterId { get; set; }
+
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_TYPE")]
+ public string? SrcType { get; set; }
+
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_NO")]
+ public string? SrcBillNo { get; set; }
+
+ /// <summary>
+ /// 绱鍙戣揣閫氱煡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DELI_QTY")]
+ public decimal? DeliQty { get; set; }
+
+ /// <summary>
+ /// 绱鍑哄簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_OUT_QTY")]
+ public decimal? StockOutQty { get; set; }
+
+ /// <summary>
+ /// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ [SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
+ public decimal? BaseRetNoticeQty { get; set; } /// </summary>
+
+ /// <summary>
+ /// 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
+ /// </summary>
+ [SugarColumn(ColumnName = "BASE_RETURN_QTY")]
+ public decimal? BaseReturnQty { get; set; }
+
+ /// <summary>
+ /// 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
+ /// </summary>
+ [SugarColumn(ColumnName = "BASE_REMAIN_OUT_QTY")]
+ public decimal? BaseRemainOutQty { get; set; }
+
+ /// <summary>
+ /// 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
+ /// </summary>
+ [SugarColumn(ColumnName = "BASEARQTY")]
+ public decimal? BASEARQTY { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index b466f00..77c4ddc 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,6 +1,9 @@
锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System.Globalization;
+using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
@@ -9,8 +12,245 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderManager.cs
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+ private readonly SalesOrderDetailManager _SalesOrderDetailManager =
+ new();
+
+ //private Guid Tid = Guid.Empty;
+
+ //ErpSalesOrder
+ public bool Save(ErpSalesOrder SalesOrder)
+ {
+ var erpSalesOrderDto = SalesOrder.OrderDto;
+ var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
+ var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(mesSalesOrder,SalesOrder.Items);
+
+ return UseTransaction(db =>
+ {
+ switch (erpSalesOrderDto.Type)
+ {
+ // case "2":
+ // return InsertData(db, mesSalesOrder, mesSalesOrderDatas,
+ // rohInErpRohIn.FBILLTYPE)
+ // ? 1
+ // : 0;
+ case "3":
+ return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool UpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas)
+ {
+ int update = 0;
+ int insertOrUpdate = 0;
+
+ if (mesSalesOrder.ErpID != null)
+ {
+ update = db.Deleteable<SalesOrder>()
+ .Where(s => s.ErpID == mesSalesOrder.ErpID)
+ .ExecuteCommand();
+ }
+
+ if (mesSalesOrderDatas.Count > 0 && mesSalesOrder.ErpID != null)
+ {
+ insertOrUpdate = db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID)
+ .ExecuteCommand();
+ }
+
+ // 淇閫昏緫鍒ゆ柇锛屽皢 int 绫诲瀷涓� bool 绫诲瀷姣旇緝鏀逛负瀹為檯鍊煎垽鏂�
+ if (update > 0 && insertOrUpdate > 0)
+ {
+ return true;
+ }
+
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas, string type)
+ {
+ //if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
+
+ if (mesSalesOrder.ErpID != null)
+ db.Deleteable<SalesOrder>()
+ .Where(s => s.ErpID == mesSalesOrder.ErpID).ExecuteCommand();
+
+ if (mesSalesOrderDatas.Count > 0)
+ db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+
+ //var orUpdate = base.Insert(mesSalesOrder);
+ //var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
+
+
+ var orUpdate = db.Insertable(mesSalesOrder)
+ .IgnoreColumns(true).ExecuteCommand() > 0;
+
+
+ var baOrUpdate = db.Insertable(mesSalesOrderDatas).PageSize(1)
+ .IgnoreColumnsNull()
+ .ExecuteCommand() > 0;
+ if (orUpdate && baOrUpdate) return true;
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpSalesOrder> salesOrder)
+ {
+ var result = salesOrder.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private SalesOrder ConvertErpToSalesOrder(
+ ErpSalesOrderDto erpDto)
+ {
+ DateTime parsedDate;
+
+ // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
+ DateTime? ParseDateTime(string dateStr)
+ {
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture,
+ DateTimeStyles.None,
+ out parsedDate))
+ return parsedDate;
+
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
+ }
+
+ var salesOrder = new SalesOrder
+ {
+ Id = Guid.NewGuid(),
+ BillNo = erpDto.FBillNo,
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ FDate = ParseDateTime(erpDto.FDate) ?? null,
+ BillTypeId = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
+ DocumentStatus = erpDto.FDocumentStatus, // 鍗曟嵁鐘舵��
+ BusinessType = erpDto.FBusinessType, // 涓氬姟绫诲瀷
+ HeadDeliveryWay = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
+ HeadLocId = erpDto.FHEADLOCID, // 浜よ揣鍦扮偣
+ SaleOrgId = erpDto.FSaleOrgId,
+ //UnWTextKhdd = erpDto.F_UNW_Text_KHDD, // 瀹㈡埛璁㈠崟
+ //UnWDateKhxq = ParseDateTime(erpDto.F_UNW_Date_KHXQ) ?? null, // 瀹㈡埛闇�姹備氦鏈�
+ //UnWBasePropertyKhdj = erpDto.F_UNW_BaseProperty_KHDJ, // 瀹㈡埛绛夌骇
+ CustId = erpDto.FCustId, // 瀹㈡埛
+ //UnWLargetextTbkhbz = erpDto.F_UNW_LargeText_TBKHBZ, // 娣樺疂瀹㈡埛澶囨敞
+ CloseStatus = erpDto.FCloseStatus, // 鍏抽棴鐘舵��
+ SaleDeptId = erpDto.FSaleDeptId, // 閿�鍞儴闂�
+ SalerId = erpDto.FSalerId, // 閿�鍞憳
+ ChangeReason = erpDto.FChangeReason, // 鍙樻洿鍘熷洜
+ Note = erpDto.FNote, // 澶囨敞
+ //UnWRemarksKhjHdd = erpDto.F_UNW_Remarks_KHJHDD, // 瀹㈡埛浜よ揣鍦扮偣
+ ///ReceiveId = erpDto.FReceiveId,//鏀惰揣鏂�
+ ///ReceiveContact = erpDto.FReceiveContact,//鏀惰揣鏂硅仈绯讳汉
+ ///SettleId = erpDto.FSettleId, // 缁撶畻鏂�
+ ApproverId = erpDto.FApproverId, // 瀹℃牳浜�
+ ///LinkMan = erpDto.FLinkMan, // 鏀惰揣浜哄鍚�
+ ///ChargeId = erpDto.FChargeId, // 浠樻鏂�
+ ///LinkPhone = erpDto.FLinkPhone, // 鑱旂郴鐢佃瘽
+ CreatorId = erpDto.FCreatorId, // 鍒涘缓浜�
+ CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ ModifierId = erpDto.FModifierId, // 鏈�鍚庝慨鏀逛汉
+ ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 鏈�鍚庝慨鏀规棩鏈�
+ ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
+ CloserId = erpDto.FCloserId, // 鍏抽棴浜�
+ CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
+ ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
+ CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
+ VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
+ ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
+ //EntryNote = erpDto.FEntryNote // 澶囨敞
+ //ParseDateTime() ?? null
+ //long.Parse()
+ //Convert.ToDecimal()
+ //Convert.ToDouble()
+ };
+
+ var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null) salesOrder.Id = single.Id;
+
+ return salesOrder;
+ }
+
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
+ SalesOrder salesOrder,
+ List<ErpSalesOrderDetailDto> erpDtoList)
+ {
+ var salesOrderSubList =
+ new List<SalesOrderDetail>();
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var salesOrderSub = new SalesOrderDetail
+ {
+ Pid = salesOrder.Id,
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ EHID = Convert.ToDecimal(erpDto.EHID),
+ MaterialId = erpDto.FMaterialId,
+ MapId = erpDto.FMapId,
+ MapName = erpDto.FMapName,
+ MapSpec = erpDto.FMapSpec,
+ Seq = Convert.ToInt32(erpDto.Seq),
+ UnitId = erpDto.FUnitID,
+ Qty = Convert.ToDecimal(erpDto.FQty),
+ PriceUnitId = erpDto.FPriceUnitId,
+ PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
+ DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
+ IsFree = erpDto.FIsFree,
+ SupplyOrgId = erpDto.FSupplyOrgId,
+ StockOrgId = erpDto.FStockOrgId,
+ SettleOrgIds = erpDto.FSettleOrgIds,
+ //SalesOrderNo = erpDto.F_UNW_Text_xsddh,
+ //SalesFollowUp = erpDto.F_UNW_Base_GDY,
+ OwnerTypeId = erpDto.FOwnerTypeId,
+ OwnerId = erpDto.FOwnerId,
+ EntryNote = erpDto.FEntryNote,
+ MtoNo = erpDto.FMtoNo,
+ Lot = erpDto.FLot,
+ DeliveryMaxQty = Convert.ToDecimal(erpDto.FDeliveryMaxQty),
+ DeliveryMinQty = Convert.ToDecimal(erpDto.FDeliveryMinQty),
+ OutLmtUnitId = erpDto.FOutLmtUnitID,
+ MrpCloseStatus = erpDto.FMrpCloseStatus,
+ MrpTerminateStatus = erpDto.FMrpTerminateStatus,
+ TerminateDate = Convert.ToDateTime(erpDto.FTerminateDate),
+ TerminaterId = erpDto.FTerminatorId,
+ SrcType = erpDto.FSrcType,
+ SrcBillNo = erpDto.FSrcBillNo,
+ DeliQty = Convert.ToDecimal(erpDto.FDeliQty),
+ StockOutQty = Convert.ToDecimal(erpDto.FStockOutQty),
+ BaseRetNoticeQty = Convert.ToDecimal(erpDto.FBaseRetNoticeQty),
+ BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
+ BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
+ BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
+
+ };
+
+ var single = _SalesOrderDetailManager.GetSingle(it =>
+ it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null) salesOrderSub.Id = single.Id;
+
+ salesOrderSubList.Add(salesOrderSub);
+ }
+
+ return salesOrderSubList;
+ }
+
#region 鏁欏鏂规硶
/// <summary>
diff --git a/MESApplication/Controllers/BasicData/SalesOrderController.cs b/MESApplication/Controllers/BasicData/SalesOrderController.cs
index 74cc41f..f9b6af7 100644
--- a/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ b/MESApplication/Controllers/BasicData/SalesOrderController.cs
@@ -1,8 +1,11 @@
锘縰sing System.Dynamic;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
+using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
@@ -10,8 +13,107 @@
[Route("api/[controller]")]
public class SalesOrderController : ControllerBase
{
+ //private readonly SalesOrderManager m = new();
+
+ private readonly MessageCenterManager _manager = new();
+
private readonly SalesOrderManager m = new();
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "SALES_ORDER";
+
+ private readonly string URL =
+ "http://localhost:10054/api/SalesOrder/";
+
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpSalesOrder salesOrder)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(salesOrder);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(salesOrder);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpSalesOrder> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
--
Gitblit v1.9.3