MES-WEB-API.git

parent: cbb3c45a | 补丁 | 提交 | ignore whitespace

yangle

2024-09-23 c3a392bb937376cfab5707b8660a288ca84c1bcf

29个文件已修改

	LMES/Program.cs	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/AxInterop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/BLL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/BLL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/DAL.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/DAL.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/DBUtility.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/DBUtility.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Interop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Model.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Model.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/PayM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/PayM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Pub_Class.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Pub_Class.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Pub_Control.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/Pub_Control.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/SQLHelper.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/bin/Debug/SQLHelper.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/obj/Debug/AxInterop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/obj/Debug/Interop.gregn6Lib.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/obj/Debug/PayM.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	PayM/obj/Debug/PayM.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/bin/Debug/TopSdk.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.dll	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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;
            }
        }
    }
}

 PayM/bin/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/bin/Debug/BLL.dll

Binary files differ

 PayM/bin/Debug/BLL.pdb

Binary files differ

 PayM/bin/Debug/DAL.dll

Binary files differ

 PayM/bin/Debug/DAL.pdb

Binary files differ

 PayM/bin/Debug/DBUtility.dll

Binary files differ

 PayM/bin/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/bin/Debug/Model.dll

Binary files differ

 PayM/bin/Debug/Model.pdb

Binary files differ

 PayM/bin/Debug/PayM.dll

Binary files differ

 PayM/bin/Debug/PayM.pdb

Binary files differ

 PayM/bin/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/Debug/SQLHelper.pdb

Binary files differ

 PayM/obj/Debug/AxInterop.gregn6Lib.dll

Binary files differ

 PayM/obj/Debug/Interop.gregn6Lib.dll

Binary files differ

 PayM/obj/Debug/PayM.dll

Binary files differ

 PayM/obj/Debug/PayM.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 WebAPI/Controllers/Êý¾ÝÍ¬²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs

@@ -523,10 +523,10 @@
                //OriginatorId = "12",                                                                                          //æ ¹æ®æµç¨åèµ·äººå·¥å·æ¥è¯¢ã

                //TaskId = "12",                                                                                                //ä»»å¡IDã
                CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"),                                          //åå»ºæ¶é´èµ·å§å¼ã
                CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //åå»ºæ¶é´ç»æ¢å¼ã
                //ModifiedFromTimeGMT = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd"),                                          //ä¿®æ¹æ¶é´èµ·å§å¼ã
                //ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //ä¿®æ¹æ¶é´ç»æ¢å¼ã
                //CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"),                                          //åå»ºæ¶é´èµ·å§å¼ã
                //CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //åå»ºæ¶é´ç»æ¢å¼ã
                ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),                                          //ä¿®æ¹æ¶é´èµ·å§å¼ã
                ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //ä¿®æ¹æ¶é´ç»æ¢å¼ã

                PageSize = pageSize,                                                  //åé¡µå¤§å°ã
                PageNumber = pageNumber,                                                 //åé¡µé¡µç 

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

			@@ -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;
			}
			}
			}
			}

			@@ -523,10 +523,10 @@
			//OriginatorId = "12", //æ ¹æ®æµç¨åèµ·äººå·¥å·æ¥è¯¢ã

			//TaskId = "12", //ä»»å¡IDã
			CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"), //åå»ºæ¶é´èµ·å§å¼ã
			CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //åå»ºæ¶é´ç»æ¢å¼ã
			//ModifiedFromTimeGMT = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd"), //ä¿®æ¹æ¶é´èµ·å§å¼ã
			//ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //ä¿®æ¹æ¶é´ç»æ¢å¼ã
			//CreateFromTimeGMT = DateTime.Now.AddMonths(-10).ToString("yyyy-MM-dd"), //åå»ºæ¶é´èµ·å§å¼ã
			//CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //åå»ºæ¶é´ç»æ¢å¼ã
			ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), //ä¿®æ¹æ¶é´èµ·å§å¼ã
			ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //ä¿®æ¹æ¶é´ç»æ¢å¼ã

			PageSize = pageSize, //åé¡µå¤§å°ã
			PageNumber = pageNumber, //åé¡µé¡µç