From c2948e9d6c94278037676a55ddda244681b41b5c Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期一, 24 二月 2025 16:22:21 +0800
Subject: [PATCH] 销售接口添加相关字段
---
MES.Service/Modes/SalesReturnNoticeDetail.cs | 12 ++++++
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 4 ++
MES.Service/Modes/SalesOrderDetail.cs | 56 ++++++++++++++++++++++++++++
MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs | 2 +
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 5 ++
MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 18 +++++++++
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 4 +
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs | 10 ++++
MES.Service/service/BasicData/SalesOrderManager.cs | 9 ++++
9 files changed, 117 insertions(+), 3 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 60c9165..073e6b6 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -43,4 +43,8 @@
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
+ public string? FXSHTH { get; set; } // 閿�鍞鍗曞彿
+ public string? F_ZJXF_TEXT_QTR_LEE { get; set; } // 瀹㈡埛璁㈠崟鍙�
+ public string? FXSHTBH { get; set; } // 閿�鍞悎鍚岀紪鍙�
+
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
index a3436a2..d4afaa6 100644
--- a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -34,5 +34,13 @@
public string? FBASEARQTY { get; set; } // 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
-
+ public string? FXSHTH { get; set; } //閿�鍞鍗曞彿
+ public string? F_ZJXF_TEXT_QTR_LEE { get; set; } //瀹㈡埛璁㈠崟鍙�
+ public string? FXSHTBH { get; set; } //閿�鍞悎鍚岀紪鍙�
+ public string? F_CPLH { get; set; } //鎴愬搧鏂欏彿
+ public string? F_ZJXF_REMARKS_YRR { get; set; } //鎴愬搧鍚嶇О
+ public string? F_ZJXF_TEXT_KF { get; set; } //瀹㈡埛
+ public string? F_ZJXF_CGDHRQ { get; set; } //閲囪喘鍒拌揣璐ф湡
+ public string? F_ZJXF_KHGGXH { get; set; } //瀹㈡埛鐗╂枡瑙勬牸鍨嬪彿
+ public string? F_ZJXF_DDLY { get; set; } //璁㈠崟鏉ユ簮
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
index c5547a3..f1a486a 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
@@ -27,5 +27,7 @@
public string? FOrderNo { get; set; } // 璁㈠崟鍗曞彿
public string? ErpID { get; set; } // ERPID
public string? EHID { get; set; } // ERP澶碔D
+ public string? F_XSHTH { get; set; } // 閿�鍞鍗曞彿
+ public string? F_ZJXF_Text_re5_lee { get; set; } // 瀹㈡埛璁㈠崟鍙�
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index 6620ac6..4864e81 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -170,5 +170,23 @@
///</summary>
[SugarColumn(ColumnName="ERP_HEAD_ID" )]
public string ErpHeadId { 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; }
}
+
}
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 17ae63e..28de21c 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -200,4 +200,60 @@
[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/MES.Service/Modes/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNoticeDetail.cs
index 38d4584..8e563a0 100644
--- a/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -158,4 +158,16 @@
[SugarColumn(ColumnName = "ERP_HEAD_ID")]
public string ErpHeadId { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER")]
+ public string? SalesOrder { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_ORDER")]
+ public string? CustOrder { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 99f79d2..9bd69ae 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -208,7 +208,10 @@
TerminationStatus = erpDto.FTerminationStatus,//缁堟鐘舵��
TerminationDate = ParseDateTime(erpDto.FTerminateDate),//涓氬姟缁堟鏃ユ湡
SumOutQty = erpDto.FSumOutQty,//绱鍑哄簱鏁伴噺
- RemainOutQty = erpDto.FRemainOutQty//鏈嚭搴撴暟閲�
+ RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
+ SalesOrder = erpDto.FXSHTH,//閿�鍞鍗曞彿
+ CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,//瀹㈡埛璁㈠崟鍙�
+ SalesContractNo = erpDto.FXSHTBH//閿�鍞悎鍚岀紪鍙�
};
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 228cf5c..95ae9e9 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -191,6 +191,15 @@
BaseReturnQty = Convert.ToDecimal(erpDto.FBaseReturnQty),
BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
+ SalesOrder = erpDto.FXSHTH,
+ CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,
+ SalesContractNo = erpDto.FXSHTBH,
+ ItemNo = erpDto.F_CPLH,
+ ItemName = erpDto.F_ZJXF_REMARKS_YRR,
+ CustId = erpDto.F_ZJXF_TEXT_KF,
+ ArrivalDate = Convert.ToDateTime(erpDto.F_ZJXF_CGDHRQ),
+ ItemModel = erpDto.F_ZJXF_KHGGXH,
+ Ddly = erpDto.F_ZJXF_DDLY
};
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index 41c8c09..c4cca56 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -194,7 +194,9 @@
OwnerId = erpDto.FOwnerId,//璐т富
SourceBillType = erpDto.FSrcType,
SourceBillNo = erpDto.FSrcBillNo,
- OrderBillNo = erpDto.FOrderNo
+ OrderBillNo = erpDto.FOrderNo,
+ SalesOrder = erpDto.F_XSHTH,
+ CustOrder = erpDto.F_ZJXF_Text_re5_lee
};
--
Gitblit v1.9.3