APSM/bin/Release/APSM.dllBinary files differ
APSM/bin/Release/APSM.pdbBinary files differ
APSM/bin/Release/BLL.dllBinary files differ
APSM/bin/Release/BLL.pdbBinary files differ
APSM/bin/Release/BaseSet.dllBinary files differ
APSM/bin/Release/BaseSet.pdbBinary files differ
APSM/bin/Release/DAL.dllBinary files differ
APSM/bin/Release/DAL.pdbBinary files differ
APSM/bin/Release/DBUtility.dllBinary files differ
APSM/bin/Release/DBUtility.pdbBinary files differ
APSM/bin/Release/Model.dllBinary files differ
APSM/bin/Release/Model.pdbBinary files differ
APSM/bin/Release/PlanM.dllBinary files differ
APSM/bin/Release/PlanM.pdbBinary files differ
APSM/bin/Release/Pub_Class.dllBinary files differ
APSM/bin/Release/Pub_Class.pdbBinary files differ
APSM/bin/Release/Pub_Control.dllBinary files differ
APSM/bin/Release/Pub_Control.pdbBinary files differ
APSM/bin/Release/SQLHelper.dllBinary files differ
APSM/bin/Release/SQLHelper.pdbBinary files differ
APSM/bin/Release/WarM.dllBinary files differ
APSM/bin/Release/WarM.pdbBinary files differ
APSM/bin/Release/WorkM.dllBinary files differ
APSM/bin/Release/WorkM.pdbBinary files differ
BLL/bin/Release/BLL.dllBinary files differ
BLL/bin/Release/BLL.pdbBinary files differ
BLL/bin/Release/DAL.dllBinary files differ
BLL/bin/Release/DAL.pdbBinary files differ
BLL/bin/Release/DBUtility.dllBinary files differ
BLL/bin/Release/DBUtility.pdbBinary files differ
BLL/bin/Release/Model.dllBinary files differ
BLL/bin/Release/Model.pdbBinary files differ
BLL/bin/Release/Pub_Class.dllBinary files differ
BLL/bin/Release/Pub_Class.pdbBinary files differ
BLL/bin/Release/Pub_Control.dllBinary files differ
BLL/bin/Release/Pub_Control.pdbBinary files differ
BLL/bin/Release/SQLHelper.dllBinary files differ
BLL/bin/Release/SQLHelper.pdbBinary files differ
BaseSet/bin/Release/BLL.dllBinary files differ
BaseSet/bin/Release/BLL.pdbBinary files differ
BaseSet/bin/Release/BaseSet.dllBinary files differ
BaseSet/bin/Release/BaseSet.pdbBinary files differ
BaseSet/bin/Release/DAL.dllBinary files differ
BaseSet/bin/Release/DAL.pdbBinary files differ
BaseSet/bin/Release/DBUtility.dllBinary files differ
BaseSet/bin/Release/DBUtility.pdbBinary files differ
BaseSet/bin/Release/Model.dllBinary files differ
BaseSet/bin/Release/Model.pdbBinary files differ
BaseSet/bin/Release/Pub_Class.dllBinary files differ
BaseSet/bin/Release/Pub_Class.pdbBinary files differ
BaseSet/bin/Release/Pub_Control.dllBinary files differ
BaseSet/bin/Release/Pub_Control.pdbBinary files differ
BaseSet/bin/Release/SQLHelper.dllBinary files differ
BaseSet/bin/Release/SQLHelper.pdbBinary files differ
DAL/bin/Release/DAL.dllBinary files differ
DAL/bin/Release/DAL.pdbBinary files differ
DAL/bin/Release/DBUtility.dllBinary files differ
DAL/bin/Release/DBUtility.pdbBinary files differ
DAL/bin/Release/Model.dllBinary files differ
DAL/bin/Release/Model.pdbBinary files differ
DAL/bin/Release/Pub_Class.dllBinary files differ
DAL/bin/Release/Pub_Class.pdbBinary files differ
DAL/bin/Release/Pub_Control.dllBinary files differ
DAL/bin/Release/Pub_Control.pdbBinary files differ
DAL/bin/Release/SQLHelper.dllBinary files differ
DAL/bin/Release/SQLHelper.pdbBinary files differ
DAL/¹¤×ʹÜÀí/ClsPay_WorkTimesBill.cs
@@ -146,9 +146,7 @@ oCn.RollBack(); return false; } sReturn = "åæ®å·ï¼"+ omodel.HBillNo+ " ä¿®æ¹æåï¼"; oCn.Commit(); return true; } catch (Exception e) { @@ -156,7 +154,37 @@ oCn.RollBack(); throw (e); } //å®¡æ ¸åæ® //è·åç³»ç»åæ° Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false) { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " ä¿®æ¹æåï¼å¤ææ¯å¦èªå¨å®¡æ ¸æ¶è·åç³»ç»åæ°å¤±è´¥ï¼ " + sReturn; return true; } if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸ { //å®¡æ ¸åæ® if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo)) { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " ä¿®æ¹æåï¼å®¡æ ¸å¤±è´¥ï¼"; return true; } else { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " ä¿®æ¹å®¡æ ¸æåï¼"; return true; } } else { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " ä¿®æ¹æåï¼"; return true; } } //æ°å¢åæ® public override bool AddBill(ref string sReturn) { @@ -211,9 +239,7 @@ oCn.RollBack(); return false; } sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢æåï¼"; oCn.Commit(); return true; } catch (Exception e) { @@ -221,6 +247,35 @@ oCn.RollBack(); throw (e); } //å®¡æ ¸åæ® //è·åç³»ç»åæ° Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false) { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢æåï¼å¤ææ¯å¦èªå¨å®¡æ ¸æ¶è·åç³»ç»åæ°å¤±è´¥ï¼ " + sReturn; return true; } if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸ { //å®¡æ ¸åæ® if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo)) { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢æåï¼å®¡æ ¸å¤±è´¥ï¼"; return true; } else { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢å®¡æ ¸æåï¼"; return true; } } else { sReturn = "åæ®å·ï¼" + omodel.HBillNo + " æ°å¢æåï¼"; return true; } } //æ¾ç¤ºåæ® public override bool ShowBill(Int64 lngBillKey, ref string sReturn) DAL/Ó¦ÊÕ¹ÜÀí/ClsYS_ReceiveBill.cs
@@ -104,7 +104,7 @@ ",HYear='" + omodel.HYear.ToString() + "'" + ",HPeriod='" + omodel.HPeriod.ToString() + "'" + ",HRemark='" + omodel.HRemark + "'" + ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" + ",HUpDater='" + omodel.HUpDater + "'" + ",HUpDateDate=getdate()" + //======================================== ",HAccDate='" + omodel.HAccDate + "'" + @@ -261,7 +261,7 @@ ", " + omodel.HYear.ToString() + "" + "," + omodel.HPeriod.ToString() + "" + ",'" + omodel.HRemark + "'" + ",'" + DBUtility.ClsPub.CurUserName + "'" + ",'" + omodel.HMaker + "'" + ",getdate()" + ""; mainSql += DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs
@@ -346,7 +346,22 @@ { omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); } //æ£æ¥ä¸»è¡¨å ç æ¯å¦éå¤ï¼è¥éå¤åéæ°çæå¹¶ç»§ç»æ£æ¥ï¼ç´å°ä¸åéå¤ DataSet ds_repeat; while (true) { ds_repeat = oCn.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HInterID = " + omodel.HInterID, "Sc_ProcessExchangeBillMain"); if (ds_repeat != null && ds_repeat.Tables[0].Rows.Count > 0) { omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); } else { break; } } //è¥MAINDIéå¤åéæ°è·å //ä¿ååæ§å¶========================================= DBUtility/bin/Release/DBUtility.dllBinary files differ
DBUtility/bin/Release/DBUtility.pdbBinary files differ
DBUtility/bin/Release/Pub_Class.dllBinary files differ
DBUtility/bin/Release/Pub_Class.pdbBinary files differ
DBUtility/bin/Release/Pub_Control.dllBinary files differ
DBUtility/bin/Release/Pub_Control.pdbBinary files differ
DBUtility/bin/Release/SQLHelper.dllBinary files differ
DBUtility/bin/Release/SQLHelper.pdbBinary files differ
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_BillType.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resourcesBinary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.CacheBinary files differ
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.dllBinary files differ
DBUtility/obj/Release/DBUtility.pdbBinary files differ
Model/bin/Release/DBUtility.dllBinary files differ
Model/bin/Release/DBUtility.pdbBinary files differ
Model/bin/Release/Model.dllBinary files differ
Model/bin/Release/Model.pdbBinary files differ
Model/bin/Release/Pub_Class.dllBinary files differ
Model/bin/Release/Pub_Class.pdbBinary files differ
Model/bin/Release/Pub_Control.dllBinary files differ
Model/bin/Release/Pub_Control.pdbBinary files differ
Model/bin/Release/SQLHelper.dllBinary files differ
Model/bin/Release/SQLHelper.pdbBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.dllBinary files differ
Model/obj/Release/Model.pdbBinary files differ
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/BLL.dllBinary files differ
PayM/bin/x86/Debug/BLL.pdbBinary files differ
PayM/bin/x86/Debug/DAL.dllBinary files differ
PayM/bin/x86/Debug/DAL.pdbBinary files differ
PayM/bin/x86/Debug/DBUtility.dllBinary files differ
PayM/bin/x86/Debug/DBUtility.pdbBinary files differ
PayM/bin/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/bin/x86/Debug/Model.dllBinary files differ
PayM/bin/x86/Debug/Model.pdbBinary files differ
PayM/bin/x86/Debug/PayM.dllBinary files differ
PayM/bin/x86/Debug/PayM.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Class.dllBinary files differ
PayM/bin/x86/Debug/Pub_Class.pdbBinary files differ
PayM/bin/x86/Debug/Pub_Control.dllBinary files differ
PayM/bin/x86/Debug/Pub_Control.pdbBinary files differ
PayM/bin/x86/Debug/SQLHelper.dllBinary files differ
PayM/bin/x86/Debug/SQLHelper.pdbBinary files differ
PayM/obj/Release/PayM.csproj.ResolveComReference.cacheBinary files differ
PayM/obj/x86/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
PayM/obj/x86/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cacheBinary files differ
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cacheBinary files differ
PayM/obj/x86/Debug/PayM.dllBinary files differ
PayM/obj/x86/Debug/PayM.pdbBinary files differ
PlanM/bin/Release/BLL.dllBinary files differ
PlanM/bin/Release/BLL.pdbBinary files differ
PlanM/bin/Release/DAL.dllBinary files differ
PlanM/bin/Release/DAL.pdbBinary files differ
PlanM/bin/Release/DBUtility.dllBinary files differ
PlanM/bin/Release/DBUtility.pdbBinary files differ
PlanM/bin/Release/Model.dllBinary files differ
PlanM/bin/Release/Model.pdbBinary files differ
PlanM/bin/Release/PlanM.dllBinary files differ
PlanM/bin/Release/PlanM.pdbBinary files differ
PlanM/bin/Release/Pub_Class.dllBinary files differ
PlanM/bin/Release/Pub_Class.pdbBinary files differ
PlanM/bin/Release/Pub_Control.dllBinary files differ
PlanM/bin/Release/Pub_Control.pdbBinary files differ
PlanM/bin/Release/SQLHelper.dllBinary files differ
PlanM/bin/Release/SQLHelper.pdbBinary files differ
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -3759,7 +3759,14 @@ omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //å·¥èµç³»ç»åæ° //==============================è夿±æ¥å if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck") { omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //=======JITç³»ç»åæ° Pub_Class/bin/Release/Pub_Class.dllBinary files differ
Pub_Class/bin/Release/Pub_Class.pdbBinary files differ
Pub_Class/bin/Release/SyntacticSugar.dllBinary files differ
Pub_Class/bin/Release/SyntacticSugar.pdbBinary files differ
Pub_Control/bin/Release/Pub_Class.dllBinary files differ
Pub_Control/bin/Release/Pub_Class.pdbBinary files differ
Pub_Control/bin/Release/Pub_Control.dllBinary files differ
Pub_Control/bin/Release/Pub_Control.pdbBinary files differ
SQLHelper/bin/Release/Pub_Class.dllBinary files differ
SQLHelper/bin/Release/Pub_Class.pdbBinary files differ
SQLHelper/bin/Release/SQLHelper.dllBinary files differ
SQLHelper/bin/Release/SQLHelper.pdbBinary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cacheBinary files differ
SQLHelper/obj/Release/SQLHelper.dllBinary files differ
SQLHelper/obj/Release/SQLHelper.pdbBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/bin/Release/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Release/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,21 +1,6 @@ D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\vs\项ç®ä»£ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb <<<<<<< HEAD E:\æºäºmes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache ======= C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache >>>>>>> 9ebf0d1329b78732aa2f8d0ae0ebaf03d13ccb26 D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
New file @@ -0,0 +1,4 @@ // <autogenerated /> using System; using System.Reflection; [assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
New file @@ -0,0 +1 @@ 5dd9c82feb12f833c78ecebea7d9a46c99f29e3f SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
New file @@ -0,0 +1,6 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb SyntacticSugar/obj/Release/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.pdbBinary files differ
WarM/WarM.csproj
@@ -100,6 +100,7 @@ <Reference Include="System.Drawing" /> <Reference Include="System.EnterpriseServices" /> <Reference Include="System.Management" /> <Reference Include="System.Printing" /> <Reference Include="System.Web.Services" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> WarM/bin/Release/BLL.dllBinary files differ
WarM/bin/Release/BLL.pdbBinary files differ
WarM/bin/Release/DAL.dllBinary files differ
WarM/bin/Release/DAL.pdbBinary files differ
WarM/bin/Release/DBUtility.dllBinary files differ
WarM/bin/Release/DBUtility.pdbBinary files differ
WarM/bin/Release/Model.dllBinary files differ
WarM/bin/Release/Model.pdbBinary files differ
WarM/bin/Release/Pub_Class.dllBinary files differ
WarM/bin/Release/Pub_Class.pdbBinary files differ
WarM/bin/Release/Pub_Control.dllBinary files differ
WarM/bin/Release/Pub_Control.pdbBinary files differ
WarM/bin/Release/SQLHelper.dllBinary files differ
WarM/bin/Release/SQLHelper.pdbBinary files differ
WarM/bin/Release/WarM.dllBinary files differ
WarM/bin/Release/WarM.pdbBinary files differ
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill_automaticallyByPLC_New.cs
@@ -14,6 +14,7 @@ using System.IO; using System.Management; using System.Net.NetworkInformation; using System.Printing; namespace WarM { @@ -407,22 +408,40 @@ #region çææé® private void bc_Click(object sender, EventArgs e) { //å®¡æ ¸æé if (!DBUtility.ClsPub.Security_Log_second("Gy_BarCodeBill_automaticallyByPLC_ProduceByHand", 1, false, DBUtility.ClsPub.CurUserName)) { MessageBox.Show("çæå¤±è´¥ï¼æ æéï¼"); return; } //æ¸ é¤æå°ä»»å¡ string msg = ""; if (!clearPrinterTask(ref msg)) { MessageBox.Show(msg); return; } this.Sub_SaveBill(); Display(); //设置æå°æ¨¡æ¿ï¼æå° grdList.Rows[0].Cells[0].Value = "*"; Report = new GridppReport(); Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); if (comboBox_PrinterParams.Text != "") if (radioButton_IsPrint_Yes.Checked == true) { Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", ""); //设置æå°æ¨¡æ¿ï¼æå° grdList.Rows[0].Cells[0].Value = "*"; Report = new GridppReport(); Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); if (comboBox_PrinterParams.Text != "") { Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", ""); } Report.Print(false); } Report.Print(false); Display4(); } //ä¿ååæ® @@ -1156,9 +1175,43 @@ return false; } //æ¸ é¤æå®æå°æºä»»å¡ private bool clearPrinterTask(ref string msg) { try { PrintServer localPrintServer = new LocalPrintServer(); PrintQueue pq = localPrintServer.GetPrintQueue(comboBox_PrinterParams.Text.Replace("(é»è®¤)", "").ToLower()); pq.Refresh(); PrintJobInfoCollection allPrintJobs = pq.GetPrintJobInfoCollection(); foreach (PrintSystemJobInfo printJob in allPrintJobs) { printJob.Cancel(); } return true; } catch(Exception ex) { msg = ex.Message; return false; } } //æ ¹æ®é讯信æ¯çææ¡ç å¹¶æå° private void timer2_Tick(object sender, EventArgs e) { if (produceQty > 0) { //æ¸ é¤æå°ä»»å¡ string msg = ""; if (!clearPrinterTask(ref msg)) { MessageBox.Show(msg); produceQty = 0; } } for (int i = 0; i < produceQty; i++) { //çææ¡ç @@ -1167,18 +1220,21 @@ //è·åéè¦æå°çæ°æ® Display(); //设置æå°æ¨¡æ¿ï¼æå° grdList.Rows[0].Cells[0].Value = "*"; Report = new GridppReport(); Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); if (comboBox_PrinterParams.Text != "") if (radioButton_IsPrint_Yes.Checked == true) { Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", ""); //设置æå°æ¨¡æ¿ï¼æå° grdList.Rows[0].Cells[0].Value = "*"; Report = new GridppReport(); Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here . Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord); Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable); Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd); if (comboBox_PrinterParams.Text != "") { Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(é»è®¤)", ""); } Report.Print(false); } Report.Print(false); if (i == produceQty - 1) { WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs
@@ -148,6 +148,9 @@ this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer3 = new System.Windows.Forms.Timer(this.components); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.radioButton_IsPrint_Yes = new System.Windows.Forms.RadioButton(); this.radioButton_IsPrint_No = new System.Windows.Forms.RadioButton(); this.Tool.SuspendLayout(); this.P1.SuspendLayout(); this.tabControl_MainInfo.SuspendLayout(); @@ -168,6 +171,7 @@ this.tabControl1.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).BeginInit(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // Tool @@ -556,6 +560,7 @@ // gbUp // this.gbUp.BackColor = System.Drawing.Color.Transparent; this.gbUp.Controls.Add(this.groupBox1); this.gbUp.Controls.Add(this.cmdSourceBillNo); this.gbUp.Controls.Add(this.cmbHWorksNumber); this.gbUp.Controls.Add(this.label4); @@ -1503,6 +1508,38 @@ this.timer3.Interval = 5000; this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // // groupBox1 // this.groupBox1.Controls.Add(this.radioButton_IsPrint_No); this.groupBox1.Controls.Add(this.radioButton_IsPrint_Yes); this.groupBox1.Location = new System.Drawing.Point(24, 162); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(200, 100); this.groupBox1.TabIndex = 45; this.groupBox1.TabStop = false; // // radioButton_IsPrint_Yes // this.radioButton_IsPrint_Yes.AutoSize = true; this.radioButton_IsPrint_Yes.Checked = true; this.radioButton_IsPrint_Yes.Location = new System.Drawing.Point(7, 13); this.radioButton_IsPrint_Yes.Name = "radioButton_IsPrint_Yes"; this.radioButton_IsPrint_Yes.Size = new System.Drawing.Size(69, 22); this.radioButton_IsPrint_Yes.TabIndex = 0; this.radioButton_IsPrint_Yes.TabStop = true; this.radioButton_IsPrint_Yes.Text = "æå°"; this.radioButton_IsPrint_Yes.UseVisualStyleBackColor = true; // // radioButton_IsPrint_No // this.radioButton_IsPrint_No.AutoSize = true; this.radioButton_IsPrint_No.Location = new System.Drawing.Point(6, 68); this.radioButton_IsPrint_No.Name = "radioButton_IsPrint_No"; this.radioButton_IsPrint_No.Size = new System.Drawing.Size(87, 22); this.radioButton_IsPrint_No.TabIndex = 1; this.radioButton_IsPrint_No.Text = "䏿å°"; this.radioButton_IsPrint_No.UseVisualStyleBackColor = true; // // Gy_BarCodeBill_automaticallyByPLC_New // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); @@ -1552,6 +1589,8 @@ this.tabControl1.ResumeLayout(false); this.tabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.ResumeLayout(false); } @@ -1676,5 +1715,8 @@ private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1; private System.Windows.Forms.Timer timer2; private System.Windows.Forms.Timer timer3; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.RadioButton radioButton_IsPrint_No; private System.Windows.Forms.RadioButton radioButton_IsPrint_Yes; } } WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -46,6 +46,11 @@ objJsonResult.data = null; return objJsonResult; } //æ ¹æ®ç¨æ·å¯¹åºçç»çå ³ç³»ï¼è¿æ»¤æ¡ä»¶ä¸å¢å åªæ¾ç¤ºå¯¹åºççç» DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser"); sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by çç»ä»£ç ", "h_v_GroupList"); WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -817,6 +817,77 @@ } #endregion #region è¿åå·¥åºè¿ç«æ¥æ¶åå表-å页 [Route("Cj_StationInBill/get_Display_ByPage")] [HttpGet] public object get_Display_ByPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType) { try { List<object> columnNameList = new List<object>(); if (HBillSubType == "SUB") { //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¼å·¥åæ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } else { //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¿ç«åæ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_MES_StationInBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationInBillList"); } else { ds = oCN.RunProcReturn("exec h_p_MES_StationInBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationInBillList"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ç¼è¾å夿 [Route("Cj_StationInBill/set_ShowBillJudge")] [HttpGet] WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1721,31 +1721,74 @@ } #endregion #region å·¥åºåºç«æ±æ¥åå表 [Route("Cj_StationOutBill/page")] #region è¿åå·¥åºåºç«æ±æ¥åå表-å页 [Route("Cj_StationOutBill/get_Display_byPage")] [HttpGet] public json page(string sWhere, string user, int page, int size) public object get_Display_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType) { json res = new json(); try { List<object> columnNameList = new List<object>(); //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) { res.code = "0"; res.count = 0; res.Message = "åºç«åæ æ¥è¯¢æé!"; res.data = null; return res; } if (sWhere == null || sWhere.Equals("")) if (HBillSubType == "SUB") { ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList"); //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®å·¥åæ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } else { ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList"); //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åºç«åæ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } //è·åç³»ç»åæ° string Ret = ""; if (oSystemParameter.ShowBill(ref Ret)) { //夿客æ·ä¸ºé¾å±±æ±½é if (oSystemParameter.omodel.WMS_CampanyName == "é¾å±±æ±½é ") { //è·åéè¦æ¼æ¥çå符串 string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "å·¥åºæ±æ¥åå表"); if (sql_splice == "æ²¡ææ¥è¯¢å°ç¸å ³ç¨æ·ä¿¡æ¯") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ²¡ææ¥è¯¢å°ç¸å ³ç¨æ·ä¿¡æ¯!"; objJsonResult.data = null; return objJsonResult; } else { sWhere += sql_splice; } } } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList"); } else { ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList"); } //æ·»å åå @@ -1756,23 +1799,24 @@ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } res.code = CodeConstant.SUCCEED; res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); res.Message = "Sucessï¼"; res.list = columnNameList; res.data = ds.Tables[0]; return res; objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { res.code = CodeConstant.FAIL; res.count = CountConstant.FAIL; res.Message = "Exceptionï¼" + e.ToString(); res.data = null; objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥åºåºç«æ±æ¥å å表æ¥è¯¢ [Route("Cj_StationOutBill/get_SubDisplay")] [HttpGet] WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1258,7 +1258,10 @@ if (IsAudit == 0) //å®¡æ ¸å¤æ { oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID); oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID); //å·æ°é»è®¤å·¥èºè·¯çº¿ //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; WebAPI/Controllers/LMESController.cs
@@ -192,7 +192,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by æ¥æ desc ", "h_v_Sc_ProcessExchangeBillList_Query"); ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by åæ®å· desc ", "h_v_Sc_ProcessExchangeBillList_Query"); //æ·»å åå @@ -205,6 +205,98 @@ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¼å¸¸ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥åºæµè½¬å¡ç»´æ¤-æ¥è¯¢-å页 /// <summary> /// è¿åå·¥åºæµè½¬å¡ç»´æ¤å表主表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("LEMS/Sc_ProcessExchangeBillList_Query_byPage")] [HttpGet] public object Sc_ProcessExchangeBillList_Query_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType) { DataSet ds; try { List<object> columnNameList = new List<object>(); if (HBillSubType == "SUB") { //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_SubQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æå¼å¡æ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } else { //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æµè½¬å¡æ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } } //è·åç³»ç»åæ° string Ret = ""; if (oSystemParameter.ShowBill(ref Ret)) { //夿客æ·ä¸ºé¾å±±æ±½é if (oSystemParameter.omodel.WMS_CampanyName == "é¾å±±æ±½é ") { //è·åéè¦æ¼æ¥çå符串 string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "å·¥åºæ´¾å·¥åå表"); sWhere += sql_splice; } } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Sc_ProcessExchangeBillList_Query"); } else { ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_Query"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; @@ -1731,31 +1823,49 @@ return GetObjectJson(ds); } #region ç产订åå页å表 [Route("LEMS/MES_IF_ICMOBillListPage")] #region ç产订åå表-å页 [Route("LEMS/MES_IF_ICMOBillList_Json_byPage")] [HttpGet] public object MES_IF_ICMOBillListPage(string sWhere, string user, int page, int size) public object MES_IF_ICMOBillList_Json_byPage(string sWhere, string user, string Organization, int page, int size) { DataSet ds; try { List<object> columnNameList = new List<object>(); //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOBillQuery", 1, false, user)) List<object> columnNameList = new List<object>() ; //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } //è·åç³»ç»åæ° string Ret = ""; if (oSystemParameter.ShowBill(ref Ret)) { //夿客æ·ä¸ºé¾å±±æ±½é if (oSystemParameter.omodel.WMS_CampanyName == "é¾å±±æ±½é ") { //è·åéè¦æ¼æ¥çå符串 string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "ç产订åå表"); sWhere += sql_splice; } } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",''", "h_p_IF_ICMOBillList"); ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_ICMOBillList"); } else { ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_ICMOBillList"); ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_ICMOBillList"); } //æ·»å åå @@ -1777,10 +1887,11 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } return GetObjectJson(ds); } #endregion @@ -3259,6 +3370,152 @@ } #region å·¥èºè·¯çº¿å表 å¯ç¨é»è®¤_æé夿 [Route("Gy_RoutingBill/set_defaultRoute_CheckRight")] [HttpGet] public object set_defaultRoute_CheckRight(string user, string HBillSubType) { try { if (HBillSubType == "SUB") { //夿æ¯å¦æå 餿é if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_SetDefaultRoute", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå·¥èºè·¯çº¿æ æéå¯ç¨é»è®¤å·¥èºè·¯çº¿!"; objJsonResult.data = null; return objJsonResult; } } else { //夿æ¯å¦æå 餿é if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_SetDefaultRoute", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å·¥èºè·¯çº¿æ æéå¯ç¨é»è®¤!"; objJsonResult.data = null; return objJsonResult; } } objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æ§è¡æåï¼"; objJsonResult.data = null; return objJsonResult; ; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥èºè·¯çº¿å表 å¯ç¨é»è®¤ [Route("Gy_RoutingBill/set_defaultRoute")] [HttpGet] public object set_defaultRoute(string HInterID, string user, string HBillSubType) { try { if (HBillSubType == "SUB") { //夿æ¯å¦æå 餿é if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_SetDefaultRoute", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå·¥èºè·¯çº¿æ æéå¯ç¨é»è®¤å·¥èºè·¯çº¿!"; objJsonResult.data = null; return objJsonResult; } } else { //夿æ¯å¦æå 餿é if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_SetDefaultRoute", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å·¥èºè·¯çº¿æ æéå¯ç¨é»è®¤!"; objJsonResult.data = null; return objJsonResult; } } if (string.IsNullOrWhiteSpace(HInterID)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "HInterID为空ï¼"; objJsonResult.data = null; return objJsonResult; } ClsPub.CurUserName = user; BillOld.MvarItemKey = "Gy_RoutingBillMain"; oCN.BeginTran();//å¼å§äºå¡ //夿忮æ¯å¦å·²ç»å®¡æ ¸ DataSet ds; string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID; ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey); if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0) { if (!(ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªå®¡æ ¸!ä¸å¯ä»¥è¢«å¯ç¨ä¸ºè¯¥ç©æçé»è®¤å·¥èºè·¯çº¿!"; objJsonResult.data = null; return objJsonResult; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ä¸åå¨ï¼æ£æ¥è¯¥åæ®æ¯å¦å·²ç»è¢«å é¤!"; objJsonResult.data = null; return objJsonResult; } //å·æ°é»è®¤å·¥èºè·¯çº¿ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID+",'" + user + "'"); oCN.Commit();//æäº¤äºå¡ objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æ§è¡æåï¼"; objJsonResult.data = null; return objJsonResult; ; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥èºè·¯çº¿å®¡æ ¸/åå®¡æ ¸åè½ [Route("Gy_RoutingBill/CheckGy_RoutingBill")] [HttpGet] @@ -3323,15 +3580,22 @@ return objJsonResult; } } //å®¡æ ¸åæ® if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } //å®¡æ ¸å·¥èºè·¯çº¿ oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString()); ////å·æ°é»è®¤å·¥èºè·¯çº¿ //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); ////å®¡æ ¸åæ® //if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 1; // objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo; // objJsonResult.data = null; // return objJsonResult; //} } else { @@ -3403,6 +3667,8 @@ } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ§è¡å¤±è´¥ï¼" + e.ToString(); WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1871,6 +1871,66 @@ return objJsonResult; } } #region éå®åºåºåå表-å页 /// <summary> /// éå®åºåºåå表 /// </summary> /// <returns></returns> [Route("Kf_SellOutBill/GetSellOutBillList_byPage")] [HttpGet] public object GetSellOutBillList_byPage(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //å®ä¹å£°æåé ï¼æéè¿ new List<object>()å建ç å®ä¾ï¼èµå¼ç»åé //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ²¡ææ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SellOutBillList"); } else { ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SellOutBillList"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception ex) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion /// <summary> ///éå®åºåºåå é¤åè½ /// </summary> WebAPI/Controllers/WebAPIController.cs
@@ -1537,6 +1537,52 @@ } /// <summary> /// è·åçç»å表 æ ¹æ®ç¨æ·å¯¹åºçç»å ³ç³»ï¼è·åç¨æ·å¯¹åºççç» ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Web/GetGroupListByUser_Json")] [HttpGet] public object GetGroupListByUser_Json(string sWhere, string user) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //æ ¹æ®ç¨æ·å¯¹åºçç»çå ³ç³»ï¼è¿æ»¤æ¡ä»¶ä¸å¢å åªæ¾ç¤ºå¯¹åºççç» DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser"); sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]); DataSet ds = oCN.RunProcReturn("Select HItemID,çç»ä»£ç çç»ä»£ç ,çç»åç§° çç» from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "è·å失败"; objjson.data = null; return objjson; } else { objjson.code = "0"; objjson.count = 1; objjson.Message = "è·åæå!"; objjson.data = ds.Tables[0]; return objjson; } } catch (Exception e) { objjson.code = "0"; objjson.count = 0; objjson.Message = "è·å失败" + e.ToString(); objjson.data = null; return objjson; } } /// <summary> /// è·åé¨é¨å表 /// </summary> /// <returns></returns> WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -85,6 +85,66 @@ } #endregion #region åºæ¶åå表 æ¥è¯¢-å页 /// <summary> /// è¿ååºæ¶åå表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Xs_ReceivableBill/list_byPage")] [HttpGet] public object getXs_ReceivableBill_byPage(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //æ¥çæé if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.data = null; return objJsonResult; } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Xs_ReceivableBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Xs_ReceivableBillList_Query"); } else { ds = oCN.RunProcReturn("exec h_p_Xs_ReceivableBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Xs_ReceivableBillList_Query"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region åºæ¶åä¿å æ°å¢/ç¼è¾ [Route("Xs_ReceivableBill/SaveXs_ReceivableBill")] [HttpPost] WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1164,6 +1164,58 @@ #region éå®è®¢å å页æ¥è¯¢ [Route("Xs_SeOrderBill/list_ByPage")] [HttpGet] public object list_ByPage(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log_second("Xs_SeOrderBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.data = null; return objJsonResult; } if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "'," + "'',1", "h_p_Xs_SeOrderBillList_Query"); } else { ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',1", "h_p_Xs_SeOrderBillList_Query"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region éå®è®¢åä¿å æ°å¢/ç¼è¾ [Route("Xs_SeOrderBill/SaveXs_SeOrderBill")] [HttpPost] @@ -3317,6 +3369,59 @@ } #endregion #region éå®è®¢å è·åæåºåçæ°æ®-å页 [Route("Xs_SeOrderBill/sortList__ByPage")] [HttpGet] public object sortList_ByPage(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //夿æ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "'," + "'',2", "h_p_Xs_SeOrderBillList_Query"); } else { ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',2", "h_p_Xs_SeOrderBillList_Query"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region éå®è®¢å䏿¨æ¥è¯¢å表 [Route("Xs_SeOrderBill/PushList")] [HttpGet] WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -132,6 +132,63 @@ return objJsonResult; } } #region åè´§éç¥å æ¥è¯¢-å页 [Route("Xs_SeOutStockBill/list_byPage")] [HttpGet] public object list_byPag(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //å®ä¹å£°æåé ï¼æéè¿ new List<object>()å建ç å®ä¾ï¼èµå¼ç»åé //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SeOutStockBillList"); } else { ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SeOutStockBillList"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion /// <summary> ///å é¤åè½ /// </summary> WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -85,6 +85,67 @@ } #endregion #region æ¶æ¬¾åå表 æ¥è¯¢-å页 /// <summary> /// è¿å项ç®é¶æ®µå表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("YS_ReceiveBill/list_byPage")] [HttpGet] public object getYS_ReceiveBill_byPage(string sWhere, string user, string Organization, int page, int size) { try { List<object> columnNameList = new List<object>(); //æ¥çæé if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.data = null; return objJsonResult; } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_YS_ReceiveBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_YS_ReceiveBillList_Query"); } else { ds = oCN.RunProcReturn("exec h_p_YS_ReceiveBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_YS_ReceiveBillList_Query"); } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "1"; objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); objJsonResult.Message = "Sucessï¼"; objJsonResult.list = columnNameList; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region æ¶æ¬¾åä¿å æ°å¢/ç¼è¾ [Route("YS_ReceiveBill/SaveYS_ReceiveBill")] [HttpPost] @@ -170,6 +231,8 @@ return objJsonResult; } } oItem.HMaker = msg4; oItem.HUpDater = msg4; UserName = oItem.HMaker; //å¶å人 oItem.HBillType = "2003"; oItem.HBillSubType = "2003"; WebAPI/Controllers/¹¤×ʹÜÀí/Pay_WorkTimesBillController.cs
@@ -14,7 +14,6 @@ public class Pay_WorkTimesBillController : ApiController { Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();//ç³»ç»åé public DBUtility.ClsPub.Enum_BillStatus BillStatus; public const string ModName = "2203"; //åæ®ç±»å public const string ModCaption = "è夿±æ¥å"; //åæ®åç§° @@ -749,14 +748,6 @@ if (bResult) { string sReturn = ""; if (oSystemParameter.ShowBill(ref sReturn) == true) { if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸ { object objResult = GetPay_WorkTimesBill_Check_Json(lsmain[0].HInterID,1, HMaker); } } objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //æåï¼ WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs
@@ -4094,5 +4094,45 @@ return response; } #endregion #region èªå¨å 载页é¢è¡¨å¤´ /// <summary> /// è¿å项ç®é¶æ®µå表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("Xt_DefineBillMainSet/getDefineBillMainSet")] [HttpGet] public object getDefineBillMainSet(string HModName, string user) { try { string sql = "select b.* from Xt_DefineBillMainSetMain as a inner join Xt_DefineBillMainSetSub as b on a.HInterID = b.HInterID where a.HModName ='" + HModName + "' and a.HUser ='" + user + "' order by b.HArrangeOrder,b.HArrangeOrderSub"; ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet"); if(ds!=null && ds.Tables[0].Rows.Count == 0) { sql = "select b.* from Xt_DefineBillMainSetMain as a inner join Xt_DefineBillMainSetSub as b on a.HInterID = b.HInterID where a.HModName ='" + HModName + "' and a.HUser ='admin' order by b.HArrangeOrder,b.HArrangeOrderSub"; ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet"); } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,7 +4,11 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <<<<<<< HEAD <History>True|2024-10-10T01:20:57.7783364Z;False|2024-10-10T09:20:10.8221644+08:00;True|2024-10-09T08:49:22.1848893+08:00;False|2024-10-09T08:48:40.5932270+08:00;True|2024-10-09T08:40:29.9989815+08:00;False|2024-10-09T08:39:45.7279311+08:00;True|2024-09-29T10:44:45.8122563+08:00;True|2024-09-29T10:37:04.9148934+08:00;False|2024-09-29T10:36:08.2864165+08:00;True|2024-09-26T20:54:30.2118641+08:00;True|2024-09-26T20:42:07.9287721+08:00;True|2024-09-26T20:22:41.4824127+08:00;True|2024-09-26T16:31:50.6152466+08:00;True|2024-09-26T15:53:40.7117538+08:00;True|2024-09-26T15:13:00.9866970+08:00;True|2024-09-26T14:35:36.7604454+08:00;True|2024-09-26T11:11:47.9891891+08:00;False|2024-09-26T11:11:01.5036268+08:00;True|2024-09-26T10:45:07.1552480+08:00;False|2024-09-26T10:44:06.6593537+08:00;True|2024-09-25T16:07:11.4134593+08:00;False|2024-09-25T16:06:08.0731439+08:00;True|2024-09-25T14:39:10.0505260+08:00;True|2024-09-25T13:18:18.1313831+08:00;True|2024-09-25T10:37:26.6757003+08:00;False|2024-09-25T10:36:48.1910470+08:00;True|2024-09-24T20:10:41.0520259+08:00;False|2024-09-24T20:09:45.7807962+08:00;True|2024-09-19T16:42:08.0598619+08:00;True|2024-09-19T16:32:26.7785955+08:00;False|2024-09-19T16:31:43.4990851+08:00;True|2024-09-19T15:36:45.2033244+08:00;False|2024-09-19T15:35:51.1927491+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> ======= <History>True|2024-10-09T08:29:57.1468906Z;True|2024-10-09T14:03:09.2281786+08:00;True|2024-10-09T13:21:06.6101996+08:00;True|2024-10-09T13:02:11.2267277+08:00;True|2024-10-09T12:55:32.8160247+08:00;True|2024-10-09T11:43:26.9890355+08:00;True|2024-10-09T10:24:01.6949058+08:00;True|2024-10-09T10:11:25.4766977+08:00;False|2024-10-09T10:11:19.1851145+08:00;True|2024-10-08T20:15:35.4234814+08:00;True|2024-10-08T20:06:06.2945727+08:00;True|2024-10-08T19:49:49.1754103+08:00;True|2024-10-08T17:34:17.5322468+08:00;True|2024-10-08T17:12:12.3620840+08:00;False|2024-10-08T17:12:04.5176642+08:00;True|2024-10-08T12:14:49.3930712+08:00;True|2024-10-08T11:02:49.9540132+08:00;False|2024-10-08T11:02:39.1418793+08:00;True|2024-09-27T15:00:21.0482043+08:00;True|2024-09-27T14:57:07.0747471+08:00;True|2024-09-27T14:53:52.8423718+08:00;True|2024-09-27T13:29:58.8925618+08:00;False|2024-09-27T13:29:52.7163123+08:00;True|2024-09-26T20:27:04.5201970+08:00;True|2024-09-26T19:16:26.6734751+08:00;True|2024-09-26T19:13:46.3429211+08:00;True|2024-09-26T18:50:55.3033341+08:00;True|2024-09-26T18:35:44.3607797+08:00;True|2024-09-26T18:33:11.2986890+08:00;True|2024-09-26T18:08:00.5018121+08:00;True|2024-09-26T17:57:04.3987105+08:00;False|2024-09-26T17:55:37.3316215+08:00;True|2024-09-26T17:53:52.1377436+08:00;False|2024-09-26T17:53:46.2067050+08:00;True|2024-09-25T17:21:24.1078881+08:00;True|2024-09-25T17:04:17.9619045+08:00;True|2024-09-23T10:58:34.6129284+08:00;True|2024-09-23T10:58:28.2863739+08:00;True|2024-09-23T10:46:39.8062504+08:00;False|2024-09-23T10:46:28.2127212+08:00;True|2024-09-23T10:41:36.7887633+08:00;False|2024-09-23T10:41:31.1693720+08:00;True|2024-09-20T14:36:35.1508292+08:00;True|2024-09-20T14:23:14.7828767+08:00;True|2024-09-20T10:20:42.4614808+08:00;False|2024-09-20T10:20:30.9842799+08:00;True|2024-09-19T14:20:56.6643781+08:00;True|2024-09-19T09:54:32.7563188+08:00;False|2024-09-19T09:54:16.5345071+08:00;True|2024-09-19T09:07:11.2182586+08:00;False|2024-09-19T09:07:00.2356340+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +49,49 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:24</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>10/10/2024 09:20:24</publishTime> ======= <publishTime>10/09/2024 16:29:38</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>10/09/2024 16:29:38</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:23</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>10/10/2024 09:20:23</publishTime> ======= <publishTime>10/09/2024 16:29:37</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>10/09/2024 16:29:37</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:18</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>10/10/2024 09:20:18</publishTime> ======= <publishTime>10/09/2024 16:29:34</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>10/09/2024 16:29:34</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +136,17 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:19</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>10/10/2024 09:20:19</publishTime> ======= <publishTime>10/09/2024 16:29:35</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>10/09/2024 16:29:35</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -147,6 +179,18 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:17</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>10/10/2024 09:20:17</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>10/10/2024 09:20:18</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>10/10/2024 09:20:18</publishTime> ======= <publishTime>10/09/2024 16:29:33</publishTime> </File> <File Include="bin/Pub_Class.pdb"> @@ -157,24 +201,39 @@ </File> <File Include="bin/Pub_Control.pdb"> <publishTime>10/09/2024 16:29:34</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:18</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>10/10/2024 09:20:18</publishTime> ======= <publishTime>10/09/2024 16:29:34</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>10/09/2024 16:29:34</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:17:57</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>10/10/2024 09:17:57</publishTime> ======= <publishTime>10/09/2024 16:29:27</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>10/09/2024 16:29:27</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +344,33 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:18:03</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>10/10/2024 09:18:03</publishTime> ======= <publishTime>10/09/2024 16:29:24</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>10/09/2024 16:29:24</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <<<<<<< HEAD <publishTime>10/10/2024 09:20:55</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>10/10/2024 09:20:55</publishTime> ======= <publishTime>10/09/2024 16:29:55</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>10/09/2024 16:29:55</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -384,7 +457,11 @@ <publishTime>05/25/2024 09:46:41</publishTime> </File> <File Include="packages.config"> <<<<<<< HEAD <publishTime>09/19/2024 10:10:46</publishTime> ======= <publishTime>09/19/2024 09:05:04</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>05/25/2024 09:46:41</publishTime> @@ -492,7 +569,11 @@ <publishTime>05/25/2024 09:46:41</publishTime> </File> <File Include="Web.config"> <<<<<<< HEAD <publishTime>09/19/2024 15:36:40</publishTime> ======= <publishTime>10/09/2024 16:29:56</publishTime> >>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629 </File> </ItemGroup> </Project> WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -3,4 +3,499 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> </Project> <PropertyGroup> <History>True|2024-10-11T08:49:55.1188159Z;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History> <_PublishTargetUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/AlibabaCloud.EndpointUtil.dll"> <publishTime>04/07/2020 16:33:48</publishTime> </File> <File Include="bin/AlibabaCloud.GatewayDingTalk.dll"> <publishTime>04/25/2023 17:49:04</publishTime> </File> <File Include="bin/AlibabaCloud.GatewaySpi.dll"> <publishTime>07/31/2024 20:50:30</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiClient.dll"> <publishTime>08/06/2024 18:07:52</publishTime> </File> <File Include="bin/AlibabaCloud.OpenApiUtil.dll"> <publishTime>11/22/2022 11:24:18</publishTime> </File> <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll"> <publishTime>08/08/2024 19:43:22</publishTime> </File> <File Include="bin/AlibabaCloud.TeaUtil.dll"> <publishTime>07/15/2024 20:25:56</publishTime> </File> <File Include="bin/AlibabaCloud.TeaXML.dll"> <publishTime>08/03/2022 21:46:08</publishTime> </File> <File Include="bin/Aliyun.Credentials.dll"> <publishTime>07/24/2024 10:36:58</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>10/11/2024 13:37:29</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>10/11/2024 13:37:29</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>10/11/2024 13:37:28</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>10/11/2024 13:37:28</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>10/11/2024 13:37:23</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>10/11/2024 13:37:23</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> </File> <File Include="bin/Grpc.Core.Api.pdb"> <publishTime>03/19/2022 07:39:42</publishTime> </File> <File Include="bin/Grpc.Core.dll"> <publishTime>03/22/2022 13:17:20</publishTime> </File> <File Include="bin/Grpc.Core.pdb"> <publishTime>03/19/2022 07:39:48</publishTime> </File> <File Include="bin/grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/grpc_csharp_ext.x86.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.dll"> <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/ICSharpCode.SharpZipLib.pdb"> <publishTime>05/09/2021 01:08:30</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="bin/libgrpc_csharp_ext.x64.so"> <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/19/2015 01:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>10/11/2024 13:37:24</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>10/11/2024 13:37:24</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>03/08/2023 15:09:56</publishTime> </File> <File Include="bin/NPOI.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OOXML.dll"> <publishTime>10/23/2021 09:07:56</publishTime> </File> <File Include="bin/NPOI.OOXML.pdb"> <publishTime>10/23/2021 17:07:56</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXml4Net.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.dll"> <publishTime>10/23/2021 09:07:54</publishTime> </File> <File Include="bin/NPOI.OpenXmlFormats.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/NPOI.pdb"> <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>10/11/2024 13:37:21</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>10/11/2024 13:37:21</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>10/11/2024 13:37:22</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>10/11/2024 13:37:22</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>10/11/2024 13:37:22</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>10/11/2024 13:37:22</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>10/11/2024 13:37:19</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>10/11/2024 13:37:19</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Configuration.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.DataSetExtensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Data.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Drawing.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.EnterpriseServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> <publishTime>08/19/2014 18:03:34</publishTime> </File> <File Include="bin/System.Memory.dll"> <publishTime>04/18/2019 00:24:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Extensions.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> <publishTime>11/28/2018 21:00:36</publishTime> </File> <File Include="bin/System.Net.Http.Primitives.dll"> <publishTime>02/20/2015 04:10:46</publishTime> </File> <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll"> <publishTime>09/19/2018 03:38:10</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.ApplicationServices.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> <publishTime>11/28/2018 20:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.DynamicData.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Entity.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Extensions.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> <publishTime>11/28/2018 21:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 12:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> <publishTime>02/11/2014 23:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> <publishTime>01/28/2015 12:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> <publishTime>01/28/2015 12:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Xml.Linq.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Tea.dll"> <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>10/11/2024 13:37:24</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>10/11/2024 13:37:24</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>10/11/2024 16:49:47</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>10/11/2024 16:49:47</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>10/11/2024 16:49:54</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> <publishTime>11/29/2018 21:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> <publishTime>11/29/2018 21:26:30</publishTime> </File> <File Include="Config/kdapi.config"> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="Content/Site.css"> <publishTime>04/06/2023 15:57:01</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Global.asax"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="grpc_csharp_ext.x64.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="grpc_csharp_ext.x86.dll"> <publishTime>03/22/2022 13:17:22</publishTime> </File> <File Include="Index.html"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.dylib"> <publishTime>03/19/2022 07:38:44</publishTime> </File> <File Include="libgrpc_csharp_ext.x64.so"> <publishTime>03/19/2022 07:38:42</publishTime> </File> <File Include="libman.json"> <publishTime>07/12/2023 08:14:21</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="packages.config"> <publishTime>09/19/2024 10:10:46</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/web.config"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>04/06/2023 15:57:02</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> <publishTime>10/11/2024 13:50:30</publishTime> </File> </ItemGroup> </Project> 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.11/WEBS-WMS/WebService1.asmx" />--> <!--é¢å°å¼æº--> <add key="sUrl" value="http://192.168.0.11/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,7 +35,7 @@ <!--<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"/>--><!--æ¯è«å°--> @@ -106,13 +106,13 @@ </basicHttpBinding> </bindings> <client> <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" /> </client> </system.serviceModel> <applicationSettings> <WebAPI.Properties.Settings> <setting name="WebAPI_WebS_WebService1" serializeAs="String"> <value>http://localhost/webs-web/webservice1.asmx</value> <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value> </setting> </WebAPI.Properties.Settings> </applicationSettings> WebAPI/WebAPI.csproj
@@ -432,6 +432,7 @@ <Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" /> <Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" /> <Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" /> <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" /> WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> WorkM/bin/Release/BLL.dllBinary files differ
WorkM/bin/Release/BLL.pdbBinary files differ
WorkM/bin/Release/DAL.dllBinary files differ
WorkM/bin/Release/DAL.pdbBinary files differ
WorkM/bin/Release/DBUtility.dllBinary files differ
WorkM/bin/Release/DBUtility.pdbBinary files differ
WorkM/bin/Release/Model.dllBinary files differ
WorkM/bin/Release/Model.pdbBinary files differ
WorkM/bin/Release/Pub_Class.dllBinary files differ
WorkM/bin/Release/Pub_Class.pdbBinary files differ
WorkM/bin/Release/Pub_Control.dllBinary files differ
WorkM/bin/Release/Pub_Control.pdbBinary files differ
WorkM/bin/Release/SQLHelper.dllBinary files differ
WorkM/bin/Release/SQLHelper.pdbBinary files differ
WorkM/bin/Release/WarM.dllBinary files differ
WorkM/bin/Release/WarM.pdbBinary files differ
WorkM/bin/Release/WorkM.dllBinary files differ
WorkM/bin/Release/WorkM.pdbBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -16,3 +16,9 @@ C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
New file @@ -0,0 +1 @@ eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
New file @@ -0,0 +1,6 @@ D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll D:\ç½ç«åå¸\å端代ç \MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ