From 8f25fecab6e6a79096b9940ab3432401b9045b39 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 10 七月 2025 18:00:14 +0800
Subject: [PATCH] 首检\巡检\入库检适配
---
MES.Service/service/PLM/PLMManager.cs | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/PLM/PLMManager.cs b/MES.Service/service/PLM/PLMManager.cs
index eb82984..9a0bc58 100644
--- a/MES.Service/service/PLM/PLMManager.cs
+++ b/MES.Service/service/PLM/PLMManager.cs
@@ -1,6 +1,6 @@
锘縰sing Kingdee.CDP.WebApi.SDK;
using MES.Service.Dto.webApi.PLM;
-using Newtonsoft.Json;
+using System.Diagnostics;
using System.Text;
namespace MES.Service.service.PLM;
@@ -10,19 +10,30 @@
public List<StdDocument> RetrieveDrawings(string ItemNo)
{
List<BaseObject> baseObjects = GetPlmCfgBase(ItemNo);
-
- List<RelatedObject> relatedObjects = GetPlmCfgRelatedObject(baseObjects[0].FID);
+ Debug.WriteLine($"绗竴瀹屾暣鍐呭锛圝SON锛�: {Newtonsoft.Json.JsonConvert.SerializeObject(baseObjects, Newtonsoft.Json.Formatting.Indented)}");
// 妫�鏌ヨ繑鍥炵粨鏋滄槸鍚︿负绌�
- if (relatedObjects == null || !relatedObjects.Any())
+ if (baseObjects == null || !baseObjects.Any())
{
throw new NotImplementedException("杩斿洖缁撴灉涓虹┖");
}
- List<StdDocument> stdDocuments = GetPlmStdDocument(relatedObjects);
- return stdDocuments;
+ else
+ {
+ List<RelatedObject> relatedObjects = GetPlmCfgRelatedObject(baseObjects[0].FID);
+ Debug.WriteLine($"绗簩瀹屾暣鍐呭锛圝SON锛�: {Newtonsoft.Json.JsonConvert.SerializeObject(relatedObjects, Newtonsoft.Json.Formatting.Indented)}");
+
+ // 妫�鏌ヨ繑鍥炵粨鏋滄槸鍚︿负绌�
+ if (relatedObjects == null || !relatedObjects.Any())
+ {
+ throw new NotImplementedException("杩斿洖缁撴灉涓虹┖");
+ }
+ List<StdDocument> stdDocuments = GetPlmStdDocument(relatedObjects);
+ return stdDocuments;
+ }
+
}
-
+ #region 1.閫氳繃鐗╂枡缂栫爜锛堥渶瑕佸敮涓�锛夎幏鍙栫墿鏂檌d
public List<BaseObject> GetPlmCfgBase(string ItemNo)
{
//娉ㄦ剰 1锛氭澶勪笉鍐嶄娇鐢ㄥ弬鏁板舰寮忎紶鍏ョ敤鎴峰悕鍙婂瘑鐮佺瓑鏁忔劅淇℃伅锛屾敼涓哄湪鐧诲綍閰嶇疆鏂囦欢涓缃��
@@ -57,6 +68,7 @@
};
//璋冪敤鎺ュ彛
var result = client.ExecuteBillQuery(param.ToJson());
+ Debug.WriteLine($"绗竴涓厓绱犲唴瀹�: {result}");
return result.Select(s =>
{
@@ -69,7 +81,9 @@
return entity;
}).ToList();
}
+ #endregion
+ #region 2.閫氳繃鐗╂枡id鑾峰彇鐩稿叧瀵硅薄銆愪笅杞介渶瑕佺殑鏂囨。銆戠殑id
public List<RelatedObject> GetPlmCfgRelatedObject(long? FRelatedObject)
{
//娉ㄦ剰 1锛氭澶勪笉鍐嶄娇鐢ㄥ弬鏁板舰寮忎紶鍏ョ敤鎴峰悕鍙婂瘑鐮佺瓑鏁忔劅淇℃伅锛屾敼涓哄湪鐧诲綍閰嶇疆鏂囦欢涓缃��
@@ -104,6 +118,7 @@
};
//璋冪敤鎺ュ彛
var result = client.ExecuteBillQuery(param.ToJson());
+ Debug.WriteLine(result);
return result.Select(s =>
{
@@ -116,7 +131,9 @@
return entity;
}).ToList();
}
+ #endregion
+ #region 3.鏍规嵁鏂囨。id鑾峰彇鏂囨。鐗╃悊鏂囦欢id
public List<StdDocument> GetPlmStdDocument(List<RelatedObject> relatedObjects)
{
//娉ㄦ剰 1锛氭澶勪笉鍐嶄娇鐢ㄥ弬鏁板舰寮忎紶鍏ョ敤鎴峰悕鍙婂瘑鐮佺瓑鏁忔劅淇℃伅锛屾敼涓哄湪鐧诲綍閰嶇疆鏂囦欢涓缃��
@@ -168,4 +185,5 @@
return entity;
}).ToList();
}
+ #endregion
}
--
Gitblit v1.9.3