LMES/DingDing_autoGetData.cs
@@ -63,6 +63,17 @@ return false; } //设å¤ç»´ä¿®è®°å½å if (obj.getData_EquipRepairWeiXiu(ref msg) == false) { return false; } //æ¨¡å ·ç»´ä¿®è®°å½å ä¿å »è®°å½å if (obj.getData_MouldFileWeiXiuBaoYang(ref msg) == false) { return false; } return true; } catch (Exception e) LMES/LMES.csproj
@@ -37,7 +37,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> LMES/Program.cs
@@ -15,44 +15,44 @@ { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); //Application.Run(new DingDing_autoGetData()); Application.Run(new DingDing_autoGetData()); DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory; Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory; Pub_Class.ClsPub.SetIPAddress(); DBUtility.ClsPub.SetIPAddress(); DBUtility.ClsPub.VersionNum = "12.1"; Pub_Class.ClsPub.VersionNum = "12.1";// //=================================================================== try { if (DBUtility.ClsPub.CheckUpdate()) { MessageBox.Show("åç°ææ°çæ¬,éè¦æ´æ°ï¼"); string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe"; System.Diagnostics.Process.Start(strFileName); Application.Exit(); return; } else { //============================================ BLL.FrmLogin frmlg = new BLL.FrmLogin(); frmlg.ShowDialog(); if (frmlg.isOk) { MDIMain MainFrm = new MDIMain(); Application.Run(MainFrm); } } } catch (Exception e) { MessageBox.Show(e.Message); Application.Exit(); return; } //DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory; //Pub_Class.ClsPub.AppPath = System.Environment.CurrentDirectory; //Pub_Class.ClsPub.SetIPAddress(); //DBUtility.ClsPub.SetIPAddress(); //DBUtility.ClsPub.VersionNum = "12.1"; //Pub_Class.ClsPub.VersionNum = "12.1";// ////=================================================================== //try //{ // if (DBUtility.ClsPub.CheckUpdate()) // { // MessageBox.Show("åç°ææ°çæ¬,éè¦æ´æ°ï¼"); // string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe"; // System.Diagnostics.Process.Start(strFileName); // Application.Exit(); // return; // } // else // { // //============================================ // BLL.FrmLogin frmlg = new BLL.FrmLogin(); // frmlg.ShowDialog(); // if (frmlg.isOk) // { // MDIMain MainFrm = new MDIMain(); // Application.Run(MainFrm); // } // } //} //catch (Exception e) //{ // MessageBox.Show(e.Message); // Application.Exit(); // return; //} } } } LMES/bin/Debug.rarBinary files differ
PayM/bin/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/bin/Debug/BLL.dllBinary files differ
PayM/bin/Debug/BLL.pdbBinary files differ
PayM/bin/Debug/DAL.dllBinary files differ
PayM/bin/Debug/DAL.pdbBinary files differ
PayM/bin/Debug/DBUtility.dllBinary files differ
PayM/bin/Debug/DBUtility.pdbBinary files differ
PayM/bin/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/bin/Debug/Model.dllBinary files differ
PayM/bin/Debug/Model.pdbBinary files differ
PayM/bin/Debug/PayM.dllBinary files differ
PayM/bin/Debug/PayM.pdbBinary files differ
PayM/bin/Debug/Pub_Class.dllBinary files differ
PayM/bin/Debug/Pub_Class.pdbBinary files differ
PayM/bin/Debug/Pub_Control.dllBinary files differ
PayM/bin/Debug/Pub_Control.pdbBinary files differ
PayM/bin/Debug/SQLHelper.dllBinary files differ
PayM/bin/Debug/SQLHelper.pdbBinary files differ
PayM/obj/Debug/AxInterop.gregn6Lib.dllBinary files differ
PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resourcesBinary files differ
PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resourcesBinary files differ
PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resourcesBinary files differ
PayM/obj/Debug/Interop.gregn6Lib.dllBinary files differ
PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resourcesBinary files differ
PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_ContractBookBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_ContractBookBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_EmpChangeBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_EmpChangeBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_EmpDimissionBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_FamilyMemberBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_InsuranceBookBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_LearnHistoryBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_PaperPhotoBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_RewardsPunishBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkInjuryBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkSkillBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkSkillBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkStoryBill.resourcesBinary files differ
PayM/obj/Debug/PayM.HR_WorkStoryBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.KQ_sourceReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_GroupBalBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_GroupBalBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_InnerScrap.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OtherBalBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OtherBalBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OutApplyBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OutApplyBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OuterScrap.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OverApplyBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_OverApplyBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentDayBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentSendList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_PayMentYearReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SingleBalBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SingleBalBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_WorkTimesBill.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_WorkTimesList.resourcesBinary files differ
PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resourcesBinary files differ
PayM/obj/Debug/PayM.csproj.GenerateResource.CacheBinary files differ
PayM/obj/Debug/PayM.csproj.ResolveComReference.cacheBinary files differ
PayM/obj/Debug/PayM.dllBinary files differ
PayM/obj/Debug/PayM.pdbBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -10,3 +10,8 @@ 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 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 SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -2295,6 +2295,7 @@ ",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" + ",'" + oItem.HRepairEndDate + "'" + ",'" + oItem.HInstanceID + "','',0,0,'OK')"; LogService.Write(sql_main); oCN.RunProc(sql_main); int i = 1; foreach (Sc_MouldMaintainBillSub oItem_Detail in oItem.DetailColMouldMaintain) @@ -2310,6 +2311,7 @@ ",'" + oItem.HEmpID + "'" + ",'','','" + oItem_Detail.HMaintainResult + "'" + ",'0','0','','',0,0,'')"; LogService.Write(sql_sub); oCN.RunProc(sql_sub); i += 1; } @@ -2344,7 +2346,7 @@ ",'å°æ¶','" + oItem.HPlanTimes + "','" + oItem.HTimes + "','" + oItem.HEmpID + "',0" + ",'" + oItem.HDeptID + "','','" + oItem.HInstanceID + "','" + oItem.HMouldID + "'" + ",'0','å é¨ç»´ä¿®','','" + oItem.HNewDesignLife + "','',0,0)"; LogService.Write(sql_main); oCN.RunProc(sql_main); int i = 1; foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair) @@ -2356,6 +2358,7 @@ "('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" + ",0,0,'','',0,0" + ",0,'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)"; LogService.Write(sql_sub); oCN.RunProc(sql_sub); i += 1; } @@ -2627,7 +2630,7 @@ ",'" + oItem.HEquipID + "','0','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" + ",'" + oItem.HDeptID + "','" + oItem.HExplanation + "','" + oItem.HInstanceID + "','',''" + ",'" + oItem.HRepairContent + "','å°æ¶','','0',0)"; LogService.Write(sql_main); oCN.RunProc(sql_main); int i = 1; foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair) @@ -2639,6 +2642,7 @@ "values('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" + ",0,0,'','',0,0" + ",0,'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')"; LogService.Write(sql_sub); oCN.RunProc(sql_sub); i += 1; } sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,3 +4,8 @@ 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 E:\æºäºmes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll E:\æºäºmes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb E:\æºäºmes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache E:\æºäºmes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll E:\æºäºmes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ