From 387c9a7271272644bd872b896e8d0ead23451dc4 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期一, 25 八月 2025 13:39:12 +0800
Subject: [PATCH] 1
---
MES.Service/Modes/SalesOrder/SalesOrder.cs | 8 ++++----
MES.Service/service/SalesOrder/SalesOrderManager.cs | 29 +++++++++++++++++++++++++----
MES.Service/service/QC/RKJService.cs | 4 ++--
3 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/MES.Service/Modes/SalesOrder/SalesOrder.cs b/MES.Service/Modes/SalesOrder/SalesOrder.cs
index 77fdf73..bd63d0c 100644
--- a/MES.Service/Modes/SalesOrder/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder/SalesOrder.cs
@@ -179,22 +179,22 @@
/// 鍙戣揣鏃ユ湡
///</summary>
[SugarColumn(ColumnName = "F_WWC_DATE")]
- public DateTime? FWwcDate { get; set; }
+ public DateTime? F_WWC_DATE { get; set; }
/// <summary>
/// 鏄惁璇勫
///</summary>
[SugarColumn(ColumnName = "F_WWC_CHECKBOX")]
- public string? FWwcCheckbox { get; set; }
+ public string? F_WWC_CHECKBOX { get; set; }
/// <summary>
/// 鎶�鏈瘎瀹�
///</summary>
[SugarColumn(ColumnName = "F_WWC_LARGETEXT")]
- public string? FWwcLargetext { get; set; }
+ public string? F_WWC_LARGETEXT { get; set; }
/// <summary>
/// PMC璇勫
///</summary>
[SugarColumn(ColumnName = "F_WWC_LARGETEXT1")]
- public string? FWwcLargetext1 { get; set; }
+ public string? F_WWC_LARGETEXT1 { get; set; }
/// <summary>
/// 澶囨敞锛堟槑缁嗭級
///</summary>
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index 886d05b..4eec802 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -527,9 +527,9 @@
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, da.Daa021 == ca.Caa020,//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
JoinType.Left, da.Daa015 == c.LineNo, // 鍏宠仈宸ュ崟淇℃伅
- JoinType.Left, us.Fcode == a.CreateBy // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, us.Fcode == a.CreateBy, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
diff --git a/MES.Service/service/SalesOrder/SalesOrderManager.cs b/MES.Service/service/SalesOrder/SalesOrderManager.cs
index 89ff28b..89e68fe 100644
--- a/MES.Service/service/SalesOrder/SalesOrderManager.cs
+++ b/MES.Service/service/SalesOrder/SalesOrderManager.cs
@@ -82,6 +82,23 @@
return result.All(b => b);
}
+ //鑷姩鏄犲皠瀛楁
+ public static void MapProperties<T>(T target, object source)
+ {
+ var targetProps = typeof(T).GetProperties();
+ var sourceProps = source.GetType().GetProperties();
+
+ foreach (var targetProp in targetProps)
+ {
+ var sourceProp = sourceProps.FirstOrDefault(p => p.Name == targetProp.Name && p.PropertyType == targetProp.PropertyType);
+ if (sourceProp != null)
+ {
+ var value = sourceProp.GetValue(source);
+ targetProp.SetValue(target, value);
+ }
+ }
+ }
+
private SalesOrder ConvertErpToSalesOrder(
ErpSalesOrder erpDto1)
{
@@ -99,7 +116,9 @@
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
var erpDto = erpDto1.OrderDto;
- var salesOrder = new SalesOrder
+ var salesOrder = new SalesOrder();
+ MapProperties(salesOrder, erpDto);
+ /*var salesOrder = new SalesOrder
{
Id = erpDto.Id,
Erpid = erpDto.Erpid,
@@ -143,7 +162,7 @@
//long.Parse()
//Convert.ToDecimal()
//Convert.ToDouble()
- };
+ };*/
var single = base.GetSingle(it => it.Erpid == erpDto.Erpid);
if (single != null) salesOrder.Id = single.Id;
@@ -160,7 +179,9 @@
foreach (var erpDto in erpDtoList.Items)
{
- var salesOrderSub = new SalesOrderDetail
+ var salesOrderSub = new SalesOrderDetail();
+ MapProperties(salesOrderSub, erpDto);
+ /*var salesOrderSub = new SalesOrderDetail
{
Id = erpDto.Id,
Erpid = erpDto.Erpid,
@@ -196,7 +217,7 @@
Fmapid = erpDto.Fmapid,
Fmapname = erpDto.Fmapname,
Fmapspec = erpDto.Fmapspec
- };
+ };*/
var single = _SalesOrderDetailManager.GetSingle(it =>
it.Erpid == salesOrderSub.Erpid);
--
Gitblit v1.9.3