From b9bdd104ce8e53aa1cb27b6701f92ccfa21a965a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 05 六月 2024 17:00:22 +0800
Subject: [PATCH] 平板绑定自动创建文件夹，模具保养记录单自动带出保养项目改为查询视图
---
WebAPI/Controllers/PlateBindingController.cs | 43 +++++++++++++++++++--
WebAPI/Controllers/WebAPIController.cs | 25 +++++++-----
2 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/PlateBindingController.cs b/WebAPI/Controllers/PlateBindingController.cs
index 1821d54..dab2992 100644
--- a/WebAPI/Controllers/PlateBindingController.cs
+++ b/WebAPI/Controllers/PlateBindingController.cs
@@ -34,13 +34,15 @@
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg1 = sArray[0].ToString();
string user = sArray[1].ToString();
+ string HPath = sArray[2].ToString();
- string filePath = "Configuration";
+ string filePath = "MESConfiguration";
bool isAppend = true;
filePath = $@"{filePath}\PlateBinding.txt";
- filePath = "D:\\" + filePath;
+ //filePath = "C:\\" + filePath;
+ filePath = HPath;
if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
{
@@ -95,12 +97,45 @@
[Route("Get/Xt_PlateBinding")]
[HttpGet]
- public object Get(string user)
+ public object Get(string user,string HPath)
{
try
{
+ //鍒ゆ柇鏄惁瀛樺湪鏂囦欢澶癸紝鑻ヤ笉瀛樺湪鍒欏垱寤�
+ if (!System.IO.Directory.Exists(Path.GetDirectoryName(HPath)))
+ {
+ System.IO.Directory.CreateDirectory(Path.GetDirectoryName(HPath));
+ }
+
+ //鍒ゆ柇鏄惁宸茬粡瀛樺湪骞虫澘缁戝畾鏂囦欢锛岃嫢涓嶅瓨鍦ㄥ垯鍒涘缓涓�浠芥枃浠�
+ bool fileExists = System.IO.File.Exists(HPath);
+
+ //涓嶅瓨鍦ㄥ垯鍒涘缓璇ユ枃浠�
+ if (!fileExists)
+ {
+ bool isAppend = true;
+ using (StreamWriter writer = new StreamWriter(HPath, isAppend))
+ {
+ //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+ if (fileExists && isAppend)
+ {
+ writer.WriteLine();
+ }
+ string msg1 = "";
+ var content = msg1 is string ? msg1 : JsonConvert.SerializeObject(msg1);
+ writer.WriteLine($"{DateTime.Now}");
+ writer.WriteLine("");
+ msg1 = msg1.Replace("{", "").Replace("}", "").Replace("\"", "");
+ string[] arr = msg1.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+ for (int i = 0; i < arr.Length; i++)
+ {
+ writer.WriteLine(arr[i]);
+ }
+ }
+ }
+
//鏍规嵁鎸囧畾璺緞锛岃鍙栨枃浠跺唴瀹癸紝杩斿洖鏁版嵁涓烘暟缁勬牸寮�
- string[] ConfigFileInfo = File.ReadAllLines(@"D:\Configuration\PlateBinding.txt");
+ string[] ConfigFileInfo = File.ReadAllLines(HPath);
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index ad05fa7..888879e 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11983,17 +11983,22 @@
List<object> list = new List<object>();
DataSet ds2;
DataSet ds1;
- string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
- left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
- left join Gy_Employee e on e.HItemID=t.HManagerID
- where a.HInterID=" + MouldMaintainRuleID);
- string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
- left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
- left join h_v_IF_Material m on b.HMaterID=m.HItemID
- left join h_v_IF_Unit u on b.HUnitID=u.HItemID
- where a.HInterID=" + MouldMaintainRuleID);
+ // string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ // from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ // left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ // left join Gy_Employee e on e.HItemID=t.HManagerID
+ // where a.HInterID=" + MouldMaintainRuleID);
+
+ // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
+ //left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
+ // left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ //left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ // where a.HInterID=" + MouldMaintainRuleID);
+
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);
+ string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);
+
ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
list.Add(ds1.Tables[0]);
--
Gitblit v1.9.1