Merge branch 'rc' of http://172.16.1.76:3000/caihao/SXS20240115 into rc
# Conflicts: # SRC/MEStc_SXS/tcENT/clsENT.cs # SRC/wsSXS/wxENT/wsENT.cs
This commit is contained in:
fenghongdan
commit
80e73dd72b
@ -111,12 +111,18 @@
|
||||
<Import Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="21684tcENT\clsENT21684.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="tcENT21687\clsENT687.cs" />
|
||||
<Compile Include="tcENT\clsA.cs" />
|
||||
<Compile Include="tcENT\clsENT.cs" />
|
||||
|
||||
<Compile Include="tcTEST21703\clsTEST_21703.cs" />
|
||||
|
||||
<Compile Include="tcENT_21681\clsENT_21681.cs" />
|
||||
<Compile Include="tcTest21681\clsTest21681.cs" />
|
||||
<Compile Include="tcTEST14278\clsTest_14278.cs" />
|
||||
|
||||
<Compile Include="tcWIP\clsLot.cs" />
|
||||
<Compile Include="tc_21685\clsENT_21685.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -128,6 +128,7 @@ namespace MEStc_SXS
|
||||
|
||||
|
||||
public string AddSubcontractor(string SubcontractorNo, string SubcontractorName, string TelNo = defString, string EMail = defString, string Description = defString, string Creator = defString, DateTime CreateDate = default(DateTime), string AdditionalXml = "")
|
||||
|
||||
{
|
||||
string AddSubcontractorRet = default(string);
|
||||
// 此 Function 將新增一筆資料
|
||||
@ -139,6 +140,7 @@ namespace MEStc_SXS
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
strSQLAddField = "Insert into tblENTSubcontractor_21691 (SubcontractorNo, SubcontractorName, IssueState";
|
||||
strSQLAddValue = " Values ('" + SubcontractorNo + "','" + SubcontractorName + "',0";
|
||||
|
||||
@ -200,7 +202,9 @@ namespace MEStc_SXS
|
||||
|
||||
}
|
||||
|
||||
|
||||
public string EditSubcontractor(string SubcontractorNo, string SubcontractorName = defString, string TelNo = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
|
||||
|
||||
{
|
||||
string EditSubcontractorRet = default(string);
|
||||
// 此 Function 將修改一筆資料
|
||||
@ -210,6 +214,7 @@ namespace MEStc_SXS
|
||||
try
|
||||
{
|
||||
// 先給定strSQL一定有的欄位
|
||||
|
||||
strSQL = "Update tblENTSubcontractor_21691 Set ";
|
||||
|
||||
if ((TelNo ?? "") != defString)
|
||||
@ -219,6 +224,7 @@ namespace MEStc_SXS
|
||||
if ((EMail ?? "") != defString)
|
||||
{
|
||||
strSQL += "EMail = '" + EMail + "',";
|
||||
|
||||
}
|
||||
if ((SubcontractorName ?? "") != defString)
|
||||
{
|
||||
@ -294,12 +300,14 @@ namespace MEStc_SXS
|
||||
try
|
||||
{
|
||||
// 1. 刪除Contactor
|
||||
strSQL = "Delete From tblENTSubcontractorCont " + "Where SubcontractorNo='" + SubcontractorNo + "'";
|
||||
strSQL = "Delete From A_21703SUB " + "Where SubcontractorNo='" + SubcontractorNo + "'";
|
||||
CollectionSQL.Add(strSQL);
|
||||
|
||||
// 2. 刪除主檔
|
||||
|
||||
strSQL = "Delete From tblENTSubcontractor_21691 " + " Where SubcontractorNo ='" + SubcontractorNo + "'";
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(AdditionalXml))
|
||||
{
|
||||
// 加上additional的condition
|
||||
@ -342,8 +350,10 @@ namespace MEStc_SXS
|
||||
// //Create connection
|
||||
cnnTemp = CreateConnection(strConnectionString);
|
||||
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractor_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
@ -361,6 +371,7 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21691", cnnTemp);
|
||||
|
||||
// //Combine return value
|
||||
@ -402,8 +413,10 @@ namespace MEStc_SXS
|
||||
// //Create connection
|
||||
cnnTemp = CreateConnection(strConnectionString);
|
||||
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractor_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
@ -421,8 +434,10 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21691", cnnTemp);
|
||||
|
||||
|
||||
// //Return data
|
||||
ShowSubcontractorRet = dsENT;
|
||||
}
|
||||
@ -462,8 +477,10 @@ namespace MEStc_SXS
|
||||
// //Create connection
|
||||
cnnTemp = CreateConnection(strConnectionString);
|
||||
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractor_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
@ -481,8 +498,10 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractor_21691", cnnTemp);
|
||||
|
||||
|
||||
// //Return data
|
||||
if (dsENT.Tables[0].Rows.Count > 0)
|
||||
{
|
||||
@ -522,8 +541,10 @@ namespace MEStc_SXS
|
||||
try
|
||||
{
|
||||
// 先給定strSQL一定有的欄位
|
||||
|
||||
strSQL = "Update tblENTSubcontractor_21691 Set IssueState = " + IssueState + ",";
|
||||
|
||||
|
||||
if (Reviser != defString)
|
||||
strSQL = strSQL + "Reviser = '" + Reviser + "',";
|
||||
|
||||
@ -564,7 +585,7 @@ namespace MEStc_SXS
|
||||
}
|
||||
|
||||
|
||||
public string AddSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime))
|
||||
public string AddSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string Age = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", string Creator = defString, DateTime CreateDate = default(DateTime))
|
||||
{
|
||||
string AddSubcontractorContRet = default(string);
|
||||
// 此 Function 將新增一筆資料
|
||||
@ -573,9 +594,16 @@ namespace MEStc_SXS
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
strSQLAddField = "Insert into tblENTSubcontractorCont_21691 (SubcontractorNo, ContactorName";
|
||||
|
||||
strSQLAddValue = " Values ('" + SubcontractorNo + "','" + ContactorName + "'";
|
||||
|
||||
if ((Age ?? "") != defString)
|
||||
{
|
||||
strSQLAddField += ",Age";
|
||||
strSQLAddValue += ",'" + Age + "'";
|
||||
}
|
||||
if ((TelNo ?? "") != defString)
|
||||
{
|
||||
strSQLAddField += ",TelNo";
|
||||
@ -650,7 +678,7 @@ namespace MEStc_SXS
|
||||
}
|
||||
|
||||
|
||||
public string EditSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
|
||||
public string EditSubcontractorCont(string SubcontractorNo, string ContactorName, string TelNo = defString, string Age = defString, string FaxNo = defString, string Title = defString, string Address = defString, string EMail = defString, string Description = defString, string AdditionalXml = "", int DataStamp = defInteger, string Reviser = defString, DateTime ReviseDate = default(DateTime))
|
||||
{
|
||||
string EditSubcontractorContRet = default(string);
|
||||
|
||||
@ -661,8 +689,14 @@ namespace MEStc_SXS
|
||||
try
|
||||
{
|
||||
// 先給定strSQL一定有的欄位
|
||||
|
||||
strSQL = "Update tblENTSubcontractorCont_21691 Set ";
|
||||
|
||||
|
||||
if ((Age ?? "") != defString)
|
||||
{
|
||||
strSQL += "Age = '" + Age + "',";
|
||||
}
|
||||
if ((TelNo ?? "") != defString)
|
||||
{
|
||||
strSQL += "TelNo = '" + TelNo + "',";
|
||||
@ -751,8 +785,10 @@ namespace MEStc_SXS
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
strSQL = "Delete From tblENTSubcontractorCont_21691 " + " Where SubcontractorNo='" + SubcontractorNo + "'";
|
||||
|
||||
|
||||
if ((ContactorName ?? "") != defString)
|
||||
{
|
||||
strSQL += " And ContactorName = '" + ContactorName + "'";
|
||||
@ -800,6 +836,7 @@ namespace MEStc_SXS
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractorCont_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
|
||||
// 有傳入SubcontractorNo表示只取該SubcontractorNo之資料
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
@ -818,10 +855,12 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21691", cnnTemp);
|
||||
|
||||
// //Combine return value
|
||||
LoadSubcontractorContRet = CombineXMLReturnValue("loadSubcontractorcont", "tblENTSubcontractorCont_21691", "DataSet", FormatXMLSchema(dsENT.GetXmlSchema()), dsENT.GetXml(), "");
|
||||
|
||||
}
|
||||
|
||||
catch (Exception e1)
|
||||
@ -860,7 +899,9 @@ namespace MEStc_SXS
|
||||
// //Create connection
|
||||
cnnTemp = CreateConnection(strConnectionString);
|
||||
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractorCont_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
@ -878,8 +919,10 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21691", cnnTemp);
|
||||
|
||||
|
||||
// //Return data
|
||||
ShowSubcontractorContRet = dsENT;
|
||||
}
|
||||
@ -920,7 +963,9 @@ namespace MEStc_SXS
|
||||
// //Create connection
|
||||
cnnTemp = CreateConnection(strConnectionString);
|
||||
|
||||
|
||||
strSQL = "Select * From tblENTSubcontractorCont_21691 Where SubcontractorNo Is Not Null";
|
||||
|
||||
if ((SubcontractorNo ?? "") != defString)
|
||||
{
|
||||
strSQL += " And SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
@ -938,8 +983,10 @@ namespace MEStc_SXS
|
||||
|
||||
// //Select data
|
||||
dsENT = new DataSet();
|
||||
|
||||
ExecuteSQLQuery_Adapter(strSQL, dsENT, "tblENTSubcontractorCont_21691", cnnTemp);
|
||||
|
||||
|
||||
// //Return data
|
||||
if (dsENT.Tables[0].Rows.Count > 0)
|
||||
{
|
||||
|
||||
@ -146,11 +146,16 @@
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
</Compile>
|
||||
|
||||
<Compile Include="wsTEST_21703\wsTEST_21703.cs" />
|
||||
|
||||
|
||||
<Compile Include="wsENT_21681\wsENT_21681.cs" />
|
||||
<Compile Include="wsTest21681\wsTest21681.cs" />
|
||||
<Compile Include="wsTEST_14278\wsTEST_14278.cs" />
|
||||
|
||||
|
||||
<Compile Include="wsWIP\wsWIP.cs" />
|
||||
<Compile Include="wxENT21687\wsENT687.cs" />
|
||||
<Compile Include="wxENT\wsENT.cs" />
|
||||
<Compile Include="wxENT_21685\ws_21685.cs" />
|
||||
<Compile Include="wsENT\wsENT.cs" />
|
||||
|
||||
@ -121,6 +121,7 @@ namespace wsSXS
|
||||
string TelNo = defString;
|
||||
string EMail = defString;
|
||||
string Description = defString;
|
||||
string Age = defString;
|
||||
string Creator = defString;
|
||||
|
||||
ArriveTime = DateTime.Now;
|
||||
@ -189,6 +190,14 @@ namespace wsSXS
|
||||
Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// Age
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
|
||||
{
|
||||
if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
|
||||
{
|
||||
Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// Creator
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("creator").Count > 0)
|
||||
{
|
||||
@ -198,7 +207,6 @@ namespace wsSXS
|
||||
}
|
||||
}
|
||||
|
||||
// 呼叫Dll執行新增資料
|
||||
objENT.AddSubcontractor(SubcontractorNo, SubcontractorName, TelNo, EMail, Description, Creator);
|
||||
|
||||
strException = "";
|
||||
@ -248,6 +256,7 @@ namespace wsSXS
|
||||
string TelNo = defString;
|
||||
string EMail = defString;
|
||||
string Description = defString;
|
||||
string Age = defString;
|
||||
|
||||
int DataStamp = defInteger;
|
||||
string AdditionalXml = "";
|
||||
@ -330,6 +339,14 @@ namespace wsSXS
|
||||
Description = xmlDoc.DocumentElement.GetElementsByTagName("description").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// Age
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
|
||||
{
|
||||
if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
|
||||
{
|
||||
Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
|
||||
// AdditionalXml
|
||||
GetXMLTagValue(ref AdditionalXml, xmlDoc, "additionalxml");
|
||||
@ -343,7 +360,11 @@ namespace wsSXS
|
||||
if ((SubcontractorName ?? "") != defString | (TelNo ?? "") != defString | (EMail ?? "") != defString | (Description ?? "") != defString)
|
||||
{
|
||||
// 呼叫Dll執行修改
|
||||
<<<<<<< HEAD
|
||||
objENT.EditSubcontractor(SubcontractorNo, SubcontractorName, TelNo, EMail, Description, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
|
||||
=======
|
||||
objENT.EditSubcontractor(SubcontractorNo, SubcontractorName, Description,Age, AdditionalXml, DataStamp: DataStamp, Reviser: GetXMLCurUserNo(xmlDoc), ReviseDate: ArriveTime);
|
||||
>>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6
|
||||
}
|
||||
}
|
||||
|
||||
@ -592,10 +613,17 @@ namespace wsSXS
|
||||
string IssueMasterNo;
|
||||
|
||||
// 核准後應將狀態改為Active
|
||||
<<<<<<< HEAD
|
||||
tmpSQL = "Update tblENTSubcontractor_21691 Set IssueState = 2 Where SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
ApproveSQL.Add(tmpSQL);
|
||||
// 退回則應將狀態回復到Unfrozen
|
||||
tmpSQL = "Update tblENTSubcontractor_21691 Set IssueState = 0 Where SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
=======
|
||||
tmpSQL = "Update A_21703MAIN Set IssueState = 2 Where SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
ApproveSQL.Add(tmpSQL);
|
||||
// 退回則應將狀態回復到Unfrozen
|
||||
tmpSQL = "Update A_21703MAIN Set IssueState = 0 Where SubcontractorNo = '" + SubcontractorNo + "'";
|
||||
>>>>>>> 42de248d2d2ff29266f47df9261e045a7a3351b6
|
||||
RejectSQL.Add(tmpSQL);
|
||||
|
||||
// Creator未傳入表示以目前的User
|
||||
@ -742,6 +770,7 @@ namespace wsSXS
|
||||
string Address = defString;
|
||||
string EMail = defString;
|
||||
string Description = defString;
|
||||
string Age = defString;
|
||||
string AdditionalXml = "";
|
||||
|
||||
ArriveTime = DateTime.Now;
|
||||
@ -795,6 +824,14 @@ namespace wsSXS
|
||||
TelNo = xmlDoc.DocumentElement.GetElementsByTagName("telno").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// Age
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
|
||||
{
|
||||
if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
|
||||
{
|
||||
Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// FaxNo
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("faxno").Count > 0)
|
||||
{
|
||||
@ -840,7 +877,7 @@ namespace wsSXS
|
||||
|
||||
|
||||
// 呼叫Dll執行新增資料
|
||||
objENT.AddSubcontractorCont(SubcontractorNo, ContactorName, TelNo, FaxNo, Title, Address, EMail, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime);
|
||||
objENT.AddSubcontractorCont(SubcontractorNo, ContactorName, TelNo, Age,FaxNo, Title, Address, EMail, Description, AdditionalXml, GetXMLCurUserNo(xmlDoc), ArriveTime);
|
||||
|
||||
strException = "";
|
||||
strResult = "success";
|
||||
@ -890,6 +927,7 @@ namespace wsSXS
|
||||
string Address = defString;
|
||||
string EMail = defString;
|
||||
string Description = defString;
|
||||
string Age = defString;
|
||||
|
||||
int DataStamp = defInteger;
|
||||
string AdditionalXml = "";
|
||||
@ -944,6 +982,14 @@ namespace wsSXS
|
||||
TelNo = xmlDoc.DocumentElement.GetElementsByTagName("telno").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// Age
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("age").Count > 0)
|
||||
{
|
||||
if (xmlDoc.GetElementsByTagName("age").Item(0).SelectNodes("value").Count > 0)
|
||||
{
|
||||
Age = xmlDoc.DocumentElement.GetElementsByTagName("age").Item(0).SelectNodes("value").Item(0).InnerText;
|
||||
}
|
||||
}
|
||||
// FaxNo
|
||||
if (xmlDoc.DocumentElement.GetElementsByTagName("faxno").Count > 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user