From 575b5421f861e2ea113341b7c7c53e5e518538c8 Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期二, 24 六月 2025 13:24:57 +0800
Subject: [PATCH] 销售
---
StandardInterface/MES.Service/Modes/SalesOrderDetail.cs | 312 ++++++++---
StandardInterface/MES.Service/Modes/SalesOrder.cs | 192 +++---
StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs | 242 ++++++--
StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs | 5
StandardInterface/MES.Service/Modes/SalesReturnNotice.cs | 263 ++++++---
StandardInterface/MESApplication/Controllers/BasicData/SalesOrderController.cs | 102 +++
StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs | 132 ++--
StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs | 253 +++++++--
StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs | 106 +++
StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeDetailManager.cs | 4
10 files changed, 1,133 insertions(+), 478 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/SalesOrder.cs b/StandardInterface/MES.Service/Modes/SalesOrder.cs
index 304b4ec..31360a7 100644
--- a/StandardInterface/MES.Service/Modes/SalesOrder.cs
+++ b/StandardInterface/MES.Service/Modes/SalesOrder.cs
@@ -11,103 +11,101 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD", IsPrimaryKey = true)]
+ public decimal? 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 = "CUST_ID")]
+ public string? CustId { 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 = "CHANGE_REASON")]
+ public string? ChangeReason { 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 = "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/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs b/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
index 0dd800e..f119d7b 100644
--- a/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
+++ b/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
@@ -11,103 +11,237 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD_MX", IsPrimaryKey = true)]
public decimal Id { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍗曞彿
- /// </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; }
/// <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 = "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 decimal? IsFree { 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>
+ /// 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ /// </summary>
+ [SugarColumn(ColumnName = "BASE_RET_NOTICE_QTY")]
+ public decimal? BaseRetNoticeQty { get; set; }
+
+ /// <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; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER")]
+ public string? SalesOrder { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_ORDER")]
+ public string? CustOrder { get; set; }
+
+ /// <summary>
+ /// 閿�鍞悎鍚岀紪鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
+ public string? SalesContractNo { get; set; }
+
+ /// <summary>
+ /// 鎴愬搧鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鎴愬搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NAME")]
+ public string? ItemName { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_ID")]
+ public string? CustId { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍒拌揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "ARRIVAL_DATE")]
+
+ public DateTime? ArrivalDate { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡瑙勬牸鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_MODEL")]
+ public string? ItemModel { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鏉ユ簮
+ /// </summary>
+ [SugarColumn(ColumnName = "DDLY")]
+ public string? Ddly { get; set; }
+
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs b/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
index f3c462d..480458a 100644
--- a/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
+++ b/StandardInterface/MES.Service/Modes/SalesReturnNotice.cs
@@ -1,83 +1,184 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞��璐ч�氱煡鍗曡〃
-/// </summary>
-[SugarTable("SALES_RETURN_NOTICE")]
-public class SalesReturnNotice
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
{
/// <summary>
- /// SEQ_sales
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒跺崟浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATED_BY")]
- public string CreatedBy { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_ID")]
- public string DocumentId { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜哄悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "APPROVED_BY")]
- public string ApprovedBy { get; set; }
-
- /// <summary>
- /// 鍒跺崟/瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATED_OR_APPROVED_DATE")]
- public DateTime? CreatedOrApprovedDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
- public string DepartmentCode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
- public string DepartmentName { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASER_CODE")]
- public string PurchaserCode { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASER_NAME")]
- public string PurchaserName { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樹唬鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_CODE")]
- public string SalespersonCode { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樺悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_NAME")]
- public string SalespersonName { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
+ /// 閿�鍞��璐ч�氱煡鍗曡〃
+ ///</summary>
+ [SugarTable("SALES_RETURN_NOTICE")]
+ public class SalesReturnNotice
+ {
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_TYPE")]
+ public string BillType { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string BillNo { get; set; }
+ /// <summary>
+ /// 鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "F_DATE")]
+ public DateTime? FDate { get; set; }
+ /// <summary>
+ /// 缁撶畻甯佸埆
+ ///</summary>
+ [SugarColumn(ColumnName = "CURRENCY")]
+ public string Currency { get; set; }
+ /// <summary>
+ /// 閿�鍞儴闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "SALES_DEPT")]
+ public string SalesDept { get; set; }
+ /// <summary>
+ /// 閫�璐у鎴�
+ ///</summary>
+ [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
+ public string ReturnCustomer { get; set; }
+ /// <summary>
+ /// 閫�璐у師鍥�
+ ///</summary>
+ [SugarColumn(ColumnName = "RETURN_REASON")]
+ public string ReturnReason { get; set; }
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ ///</summary>
+ [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
+ public string DeliveryLocation { get; set; }
+ /// <summary>
+ /// 搴撳瓨閮ㄩ棬
+ ///</summary>
+ [SugarColumn(ColumnName = "INVENTORY_DEPT")]
+ public string InventoryDept { get; set; }
+ /// <summary>
+ /// 搴撳瓨缁�
+ ///</summary>
+ [SugarColumn(ColumnName = "INVENTORY_GROUP")]
+ public string InventoryGroup { get; set; }
+ /// <summary>
+ /// 浠撶鍛�
+ ///</summary>
+ [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
+ public string WarehouseManager { get; set; }
+ /// <summary>
+ /// 閿�鍞粍
+ ///</summary>
+ [SugarColumn(ColumnName = "SALES_GROUP")]
+ public string SalesGroup { get; set; }
+ /// <summary>
+ /// 閿�鍞憳
+ ///</summary>
+ [SugarColumn(ColumnName = "SALES_PERSON")]
+ public string SalesPerson { get; set; }
+ /// <summary>
+ /// 鏀惰揣鏂�
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVER")]
+ public string Receiver { get; set; }
+ /// <summary>
+ /// 鏀惰揣鏂硅仈绯讳汉
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
+ public string ReceiverContact { get; set; }
+ /// <summary>
+ /// 鏀惰揣鏂瑰湴鍧�
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
+ public string ReceiverAddress { get; set; }
+ /// <summary>
+ /// 鏀惰揣鏂瑰鍚�
+ ///</summary>
+ [SugarColumn(ColumnName = "RECEIVER_NAME")]
+ public string ReceiverName { get; set; }
+ /// <summary>
+ /// 缁撶畻鏂�
+ ///</summary>
+ [SugarColumn(ColumnName = "SETTLE_PARTY")]
+ public string SettleParty { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATED_BY")]
+ public string CreatedBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATED_DATE")]
+ public DateTime? CreatedDate { get; set; }
+ /// <summary>
+ /// 淇敼浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "MODIFIED_BY")]
+ public string ModifiedBy { get; set; }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "MODIFIED_DATE")]
+ public DateTime? ModifiedDate { get; set; }
+ /// <summary>
+ /// 鍏抽棴浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CLOSED_BY")]
+ public string ClosedBy { get; set; }
+ /// <summary>
+ /// 鍏抽棴鍘熷洜
+ ///</summary>
+ [SugarColumn(ColumnName = "CLOSE_REASON")]
+ public string CloseReason { get; set; }
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "CLOSE_DATE")]
+ public DateTime? CloseDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "APPROVED_BY")]
+ public string ApprovedBy { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "APPROVED_DATE")]
+ public DateTime? ApprovedDate { get; set; }
+ /// <summary>
+ /// 浣滃簾鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "CANCEL_STATUS")]
+ public string CancelStatus { get; set; }
+ /// <summary>
+ /// 浣滃簾浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CANCELLED_BY")]
+ public string CancelledBy { get; set; }
+ /// <summary>
+ /// 浣滃簾鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "CANCEL_DATE")]
+ public DateTime? CancelDate { get; set; }
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "CLOSE_STATUS")]
+ public string CloseStatus { get; set; }
+ /// <summary>
+ /// ERP澶碔D
+ ///</summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string ErpId { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_STATUS")]
+ public string BillStatus { get; set; }
+ }
+}
diff --git a/StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs b/StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs
index 3d64ef4..6c92886 100644
--- a/StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/StandardInterface/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -11,145 +11,121 @@
/// <summary>
/// SEQ_sales
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", 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; }
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
index 8ba4596..42e41b0 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
@@ -1,78 +1,194 @@
锘縰sing MES.Service.DB;
+using System.Data;
+using System.Globalization;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using MES.Service.service.BasicData.Sales;
-namespace MES.Service.service.BasicData.Sales;
+namespace MES.Service.service.BasicData;
public class SalesOrderManager : Repository<SalesOrder>
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
+ private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
+ //ErpSalesOrder
+ public bool Save(ErpSalesOrder SalesOrder)
{
- /*********鏌ヨ*********/
+ var erpSalesOrderDto = SalesOrder.OrderDto;
+ var mesSalesOrder = ConvertErpToSalesOrder(SalesOrder.OrderDto);
+ var mesSalesOrderDatas = ConvertErpToSalesOrderDetail(SalesOrder.Items);
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
+ return UseTransaction(db =>
{
- FieldName = typeof(SalesOrder).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesOrder(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ switch (erpSalesOrderDto.Type)
+ {
+ case "3":
+ return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ case "5":
+ return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type) ? 1 : 0;
+ default:
+ throw new NotImplementedException($"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
}
- #endregion
+ private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder, List<SalesOrderDetail> mesSalesOrderDatas)
+ {
+ var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
+ var update = base.DeleteById(mesSalesOrder.Id);
+ var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+
+ if (update && insertOrUpdate)
+ {
+ 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 (mesSalesOrderDatas.Count > 0)
+ {
+ db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
+ }
+
+ var orUpdate = base.Insert(mesSalesOrder);
+ var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
+ 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
+ {
+ 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, // 浜よ揣鍦扮偣
+ CustId = erpDto.FCustId, // 瀹㈡埛
+ CloseStatus = erpDto.FCloseStatus, // 鍏抽棴鐘舵��
+ SaleDeptId = erpDto.FSaleDeptId, // 閿�鍞儴闂�
+ SalerId = erpDto.FSalerId, // 閿�鍞憳
+ ChangeReason = erpDto.FChangeReason, // 鍙樻洿鍘熷洜
+ 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 // 澶囨敞
+ };
+
+ var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null)
+ {
+ salesOrder.Id = single.Id;
+ }
+
+ return salesOrder;
+ }
+
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
+ {
+ var salesOrderSubList = new List<SalesOrderDetail>();
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var salesOrderSub = new SalesOrderDetail
+ {
+ ErpID = Convert.ToDecimal(erpDto.ErpID),
+ EHID = Convert.ToDecimal(erpDto.EHID),
+ MaterialId = erpDto.FMaterialId,
+ UnitId = erpDto.FUnitID,
+ Qty = Convert.ToDecimal(erpDto.FQty),
+ PriceUnitId = erpDto.FPriceUnitId,
+ PriceUnitQty = Convert.ToDecimal(erpDto.FPriceUnitQty),
+ DeliveryDate = Convert.ToDateTime(erpDto.FDeliveryDate),
+ IsFree = Convert.ToDecimal(erpDto.FIsFree),
+ 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),
+ ItemNo = erpDto.FMapId,
+ ItemName = erpDto.FMapName,
+ ItemModel = erpDto.FMapSpec,
+
+ };
+
+ var single = _SalesOrderDetailManager.GetSingle(it => it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null)
+ {
+ salesOrderSub.Id = single.Id;
+ }
+
+ salesOrderSubList.Add(salesOrderSub);
+ }
+
+ return salesOrderSubList;
+ }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeDetailManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeDetailManager.cs
index 2fb35eb..961ede4 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeDetailManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeDetailManager.cs
@@ -2,10 +2,10 @@
using MES.Service.Modes;
using SqlSugar;
-namespace MES.Service.service.BasicData.Sales;
+namespace MES.Service.service.BasicData;
public class
- SalesReturnNoticeDetailManager : Repository<SalesReturnNoticeDetail>
+ SalesReturnDetailManager : Repository<SalesReturnNoticeDetail>
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
index a1da912..9175278 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs
@@ -1,78 +1,205 @@
锘縰sing MES.Service.DB;
+using System.Data;
+using System.Globalization;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using DbType = System.Data.DbType;
-namespace MES.Service.service.BasicData.Sales;
+namespace MES.Service.service.BasicData;
public class SalesReturnNoticeManager : Repository<SalesReturnNotice>
{
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesReturnNoticeManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
+ private readonly SalesReturnDetailManager _SalesReturnDetailManager =
+ new();
+ //ErpSalesRerurn
+ public bool Save(ErpSalesRerurn SalesReturn)
{
- /*********鏌ヨ*********/
+ var erpSalesReturnDto = SalesReturn.OrderDto;
+ var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
+ var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
+ return UseTransaction(db =>
{
- FieldName = typeof(SalesReturnNotice).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesReturnNotice() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ switch (erpSalesReturnDto.Type)
+ {
+ // case "2":
+ // return InsertData(db, mesSalesReturn, mesSalesReturnDatas,
+ // rohInErpRohIn.FBILLTYPE)
+ // ? 1
+ // : 0;
+ case "3":
+ return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
}
- #endregion
+ private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
+ List<SalesReturnNoticeDetail> mesSalesReturnDatas)
+ {
+ var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
+ var update = base.DeleteById(mesSalesReturn.Id);
+ var insertOrUpdate = db
+ .Deleteable<SalesReturnNoticeDetail>().In(decimals)
+ .ExecuteCommand() > 0;
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
+ List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
+ {
+ if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
+
+ if (mesSalesReturnDatas.Count > 0)
+ db.Deleteable<SalesReturnNoticeDetail>()
+ .Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
+
+ var orUpdate = base.Insert(mesSalesReturn);
+ var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
+ if (orUpdate && baOrUpdate) return true;
+
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpSalesRerurn> salesOrder)
+ {
+ var result = salesOrder.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private SalesReturnNotice ConvertErpToSalesReturn(
+ ErpSalesReturnDto 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 SalesReturnNotice
+ {
+ BillNo = erpDto.FBillNo,
+ ErpId = erpDto.ErpID,
+ FDate = ParseDateTime(erpDto.FDate) ?? null,
+ BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
+ Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
+ SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
+ ReturnCustomer = erpDto.FRetcustId, // 閫�璐у鎴�
+ ReturnReason = erpDto.FRetcustReason, // 閫�璐у師鍥�
+ DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
+ InventoryDept = erpDto.FRetDeptId, // 搴撳瓨閮ㄩ棬
+ InventoryGroup = erpDto.FStockerGroupId, // 搴撳瓨缁�
+ WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
+ SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
+ SalesPerson = erpDto.FSalesManId,//閿�鍞憳
+ Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
+ ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
+ ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
+ ReceiverName = erpDto.FLinkMan, // 鏀惰揣鏂瑰鍚�
+ SettleParty = erpDto.FSettleCusId, // 缁撶畻鏂�
+ CreatedBy = erpDto.FCreatorId, // 鍒涘缓浜�
+ CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃堕棿
+ ModifiedBy = erpDto.FModifierId, // 淇敼浜�
+ ModifiedDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 淇敼鏃堕棿
+ ClosedBy = erpDto.FCloserId, // 鍏抽棴浜�
+ CloseReason = erpDto.FCloseReason, // 鍏抽棴鍘熷洜
+ CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
+ ApprovedBy = erpDto.FApproverId, // 瀹℃牳浜�
+ ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
+ CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
+ CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
+ CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
+ CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
+ BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
+
+ };
+
+ var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
+ if (single != null) salesOrder.Id = single.Id;
+
+ return salesOrder;
+ }
+
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
+ List<ErpSalesReturnDetailDto> erpDtoList)
+
+ {
+ var salesOrderSubList =
+ new List<SalesReturnNoticeDetail>();
+
+ 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
+ }
+
+
+
+ foreach (var erpDto in erpDtoList)
+ {
+ var salesOrderSub = new SalesReturnNoticeDetail
+ {
+ ErpLineId = erpDto.ErpID,//ERP琛孖D
+ ErpHeadId = erpDto.EHID,//ERP澶碔D
+ MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
+ SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
+ SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
+ IsFree = erpDto.FIsFree,//鏄惁璧犲搧
+ ReturnDate = ParseDateTime(erpDto.FDeliverydate),//閫�璐ф棩鏈�
+ Warehouse = erpDto.FStockId,//浠撳簱
+ PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
+ LotNumber = erpDto.FLot,//鎵瑰彿
+ Note = erpDto.FEntryDescription,//澶囨敞
+ ReturnType = erpDto.FRmType,//閫�璐х被鍨�
+ InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
+ InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
+ OwnerTypeId = erpDto.FOwnerTypeID,//璐т富绫诲瀷
+ OwnerId = erpDto.FOwnerId,//璐т富
+ SourceBillType = erpDto.FSrcType,
+ SourceBillNo = erpDto.FSrcBillNo,
+ OrderBillNo = erpDto.FOrderNo
+
+ };
+
+ var single = _SalesReturnDetailManager.GetSingle(it =>
+ it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null) salesOrderSub.Id = single.Id;
+
+ salesOrderSubList.Add(salesOrderSub);
+ }
+
+ return salesOrderSubList;
+ }
+
+
}
\ No newline at end of file
diff --git a/StandardInterface/MESApplication/Controllers/BasicData/SalesOrderController.cs b/StandardInterface/MESApplication/Controllers/BasicData/SalesOrderController.cs
index 2e6dcd3..b5da3bd 100644
--- a/StandardInterface/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ b/StandardInterface/MESApplication/Controllers/BasicData/SalesOrderController.cs
@@ -1,9 +1,15 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
using MES.Service.service.BasicData;
+
using MES.Service.service.BasicData.Sales;
using MES.Service.util;
+using MES.Service.Dto.webApi;
+using MES.Service.service;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Newtonsoft.Json;
+
namespace MESApplication.Controllers.BasicData;
@@ -12,9 +18,103 @@
public class SalesOrderController : ControllerBase
{
private readonly SalesOrderManager m = new();
+ private readonly MessageCenterManager _manager = 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.Route = salesOrder.OrderDto.FBillNo;
+ 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);
+ }
+ }
+
/// <summary>
/// 鑾峰彇鎵�鏈�
diff --git a/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs b/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
index f62bfa2..de68b97 100644
--- a/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
+++ b/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
@@ -1,9 +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.service.BasicData.Sales;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
@@ -11,8 +13,110 @@
[Route("api/[controller]")]
public class SalesReturnNoticeController : ControllerBase
{
+ private readonly MessageCenterManager _manager = new();
+
private readonly SalesReturnNoticeManager m = new();
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "SALES_RETURN_NOTICE";
+
+ private readonly string URL = "http://localhost:10054/api/SalesReturnNotice/";
+
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpSalesRerurn salesOrder)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Route = salesOrder.OrderDto.FBillNo;
+ 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<ErpSalesRerurn> 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);
+ }
+ }
+
+
+
+
+
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
diff --git a/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs b/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
index 4c80931..e8d3092 100644
--- a/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
+++ b/StandardInterface/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
@@ -1,7 +1,6 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
using MES.Service.service.BasicData;
-using MES.Service.service.BasicData.Sales;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
@@ -9,9 +8,9 @@
[ApiController]
[Route("api/[controller]")]
-public class SalesReturnNoticeDetailController : ControllerBase
+public class SalesReturnDetailController : ControllerBase
{
- private readonly SalesReturnNoticeDetailManager m = new();
+ private readonly SalesReturnDetailManager m = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
--
Gitblit v1.9.3