From 6ed869a57b0a1758ea925cd204dc5618207f62ae Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 05 六月 2024 19:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/PlateBindingController.cs | 43 +++++++++++++++++++--
WebAPI/Web.config | 11 +++--
WebAPI/Controllers/WebAPIController.cs | 56 ++++++++++++++++------------
3 files changed, 77 insertions(+), 33 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..4ffa124 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11983,19 +11983,24 @@
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);
- ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
- ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ // 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, "h_v_Sc_MouldMaintainRuleBillSub_Item");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//閰嶄欢
list.Add(ds1.Tables[0]);
list.Add(ds2.Tables[0]);
objJsonResult.code = "0";
@@ -12129,19 +12134,22 @@
List<object> list = new List<object>();
DataSet ds2;
DataSet ds1;
- string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
- from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_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=" + EquipProjectID);
- string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
- left join Sb_EquipMaintainRuleBillSub 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=" + EquipProjectID);
+ // string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ // from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_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=" + EquipProjectID);
+ // string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ //left join Sb_EquipMaintainRuleBillSub 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=" + EquipProjectID);
- ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
- ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);
+ string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);
+
+ ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//閰嶄欢
list.Add(ds1.Tables[0]);
list.Add(ds2.Tables[0]);
objJsonResult.code = "0";
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 49df9b9..2beafce 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> --><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,9 +35,10 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> --><!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
-
+ <add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/><!--鏂帿灏�-->
+
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
@@ -105,7 +106,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://61.130.182.102:18181/WEBSCS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -114,7 +115,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>
+ <value>http://61.130.182.102:18181/WEBSCS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1