From c5f74c8471358dbfb6977f4d9d392b656c31a16a Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期四, 17 七月 2025 17:26:29 +0800
Subject: [PATCH] 购销销售订单，采购订单关联
---
StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 4 ++++
StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs | 5 ++++-
StandardInterface/MES.Service/Modes/SalesOrderDetail.cs | 17 +++++++++++++++++
StandardInterface/MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 15 +++++++++++++++
StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs | 3 +++
StandardInterface/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs | 3 +++
6 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 075c459..c856076 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -39,5 +39,9 @@
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
public string? FEntrynote { get; set; } // 澶囨敞
+ public string? Xsdd { get; set; } // 閿�鍞鍗�
+ public string? Xsdd_id { get; set; } // 閿�鍞鍗曞ごid
+ public string? Xsdd_line_id { get; set; } // 閿�鍞鍗曡id
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/StandardInterface/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
index fc7ddc3..5f3011c 100644
--- a/StandardInterface/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
+++ b/StandardInterface/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -34,4 +34,7 @@
public string? FMapId { get; set; } //瀹㈡埛鐗╂枡缂栫爜
public string? FMapName { get; set; } //瀹㈡埛鐗╂枡鍚嶇О
public string? FMapSpec { get; set; } //瀹㈡埛鐗╂枡瑙勬牸鍨嬪彿
+ public string? Cgdd { get; set; } //閲囪喘璁㈠崟
+ public string? Cgdd_id { get; set; } //閲囪喘璁㈠崟id
+ public string? Cgdd_line_id { get; set; } //閲囪喘璁㈠崟琛宨d
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/StandardInterface/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 6ef6d52..d31f739 100644
--- a/StandardInterface/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/StandardInterface/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -180,5 +180,20 @@
///</summary>
[SugarColumn(ColumnName = "FEntrynote")]
public string NOTE { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗�
+ ///</summary>
+ [SugarColumn(ColumnName = "XSDD")]
+ public string Xsdd { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗昳d
+ ///</summary>
+ [SugarColumn(ColumnName = "XSDD_ID")]
+ public string XsddId { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗�
+ ///</summary>
+ [SugarColumn(ColumnName = "XSDD_LINE_ID")]
+ public string XsddLineId { get; set; }
}
}
diff --git a/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs b/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
index 18e671d..2bceef8 100644
--- a/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
+++ b/StandardInterface/MES.Service/Modes/SalesOrderDetail.cs
@@ -244,5 +244,22 @@
[SugarColumn(ColumnName = "DDLY")]
public string? Ddly { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "CGDD")]
+ public string? Cgdd { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟id
+ /// </summary>
+ [SugarColumn(ColumnName = "CGDD_ID")]
+ public string? CgddId { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鏉ユ簮
+ /// </summary>
+ [SugarColumn(ColumnName = "CGDD_LINE_ID")]
+ public string? CgddLineId { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
index 3fc4c37..4c1bf3a 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesDeliveryNoticeManager.cs
@@ -242,7 +242,10 @@
TerminationDate = ParseDateTime(erpDto.FTerminateDate),//涓氬姟缁堟鏃ユ湡
SumOutQty = erpDto.FSumOutQty,//绱鍑哄簱鏁伴噺
RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
- NOTE = erpDto.FEntrynote//澶囨敞
+ NOTE = erpDto.FEntrynote,//澶囨敞
+ Xsdd=erpDto.Xsdd,
+ XsddId=erpDto.Xsdd_id,
+ XsddLineId=erpDto.Xsdd_line_id,
};
diff --git a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
index 04a5146..663a73b 100644
--- a/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Sales/SalesOrderManager.cs
@@ -193,6 +193,9 @@
ItemNo = erpDto.FMapId,
ItemName = erpDto.FMapName,
ItemModel = erpDto.FMapSpec,
+ Cgdd=erpDto.Cgdd,
+ CgddId=erpDto.Cgdd_id,
+ CgddLineId=erpDto.Cgdd_line_id,
};
--
Gitblit v1.9.3