Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

5 天以前 4d8b0e7a867484b73c4413a6ff3fe9f7d2853c37

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

# Conflicts:
#	WebAPI/App_Start/WebApiConfig.cs
#	WebAPI/WebAPI.csproj.user

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Class/bin/Release/SyntacticSugar.dll

Binary files differ

 Pub_Class/bin/Release/SyntacticSugar.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/bin/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Release/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -4,3 +4,8 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
5dd9c82feb12f833c78ecebea7d9a46c99f29e3f

 SyntacticSugar/obj/Release/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Release/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/WebAPIController.cs

@@ -24368,6 +24368,8 @@

        #region APP根据设备id进行自动登录
       


        [HttpGet]
        [Route("Web/getSysParameter")]
        public object getSysParameter(string HClientID)
@@ -24411,8 +24413,153 @@
                return objJsonResult;
            }
        }

        #endregion
      

        #region 根据表名获取sql语句
        [HttpGet]
        [Route("Web/getSQL")]
        public object getSQL(string TableName, string ModeName, string OpertionType, string Identityid)
        {
            if (OpertionType == "insert")
            {
                string sql = $"select * from {TableName}";
                DataSet ds = oCN.RunProcReturn(sql, TableName);

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "系统参数不存在，请联系管理";
                    objJsonResult.data = 0;
                    return objJsonResult;
                }

                sql = $"exec h_p_sqlhelper '{TableName}'";
                ds = oCN.RunProcReturn(sql, "h_p_sqlhelper");

                if (ds == null || ds.Tables.Count < 2 || ds.Tables[1].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "系统参数不存在，请联系管理";
                    objJsonResult.data = 0;
                    return objJsonResult;
                }

                StringBuilder sb = new StringBuilder();
                string columnsStr = ds.Tables[0].Rows[0][0].ToString();
                sb.AppendLine($"sqlRes = $\"INSERT INTO [{TableName}] ({columnsStr})");
                sb.AppendLine("                VALUES (");

                // 2. 拼接 VALUES 里面的参数
                int count = ds.Tables[1].Rows.Count;
                for (int i = 0; i < count; i++)
                {
                    string propName = ds.Tables[1].Rows[i][0].ToString();
                    string valueFormat = "";
                    if (propName == "HMakeDate")
                    {
                        valueFormat = "getdata()";
                    }
                    else if (propName == "HERPItemID")
                    {
                        valueFormat = "'{0}'";
                    }
                    else
                    {
                        valueFormat = $"'{{{ModeName}.{propName}}}'"; // 默认通用逻辑
                    }
                    sb.Append("                " + valueFormat);

                    if (i < count - 1)
                    {
                        sb.Append(",");
                    }
                    sb.AppendLine();
                }
                sb.AppendLine("                ); \";");
                sb.Append(" oCN.RunProc(sqlRes);");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = sb;
                return objJsonResult;
            }
            else
            {
                string whereKey = Identityid;
                string sql = $"select * from {TableName}";
                DataSet ds = oCN.RunProcReturn(sql, TableName);

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "系统参数不存在，请联系管理";
                    objJsonResult.data = 0;
                    return objJsonResult;
                }
                sql = $"exec h_p_sqlhelper '{TableName}'";
                ds = oCN.RunProcReturn(sql, "h_p_sqlhelper");

                if (ds == null || ds.Tables.Count < 2 || ds.Tables[1].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "系统参数不存在，请联系管理";
                    objJsonResult.data = 0;
                    return objJsonResult;
                }
                StringBuilder sb = new StringBuilder();

                sb.Append($"sqlRes =$\"Update {TableName} set ");

                int count = ds.Tables[1].Rows.Count;
                int setFieldCount = 0;

                for (int i = 0; i < count; i++)
                {
                    string propName = ds.Tables[1].Rows[i][0].ToString();


                    if (propName == whereKey)
                        continue;


                    if (setFieldCount > 0)
                    {
                        sb.Append(",");
                    }
                    string valueFormat = "";
                    if (propName == "HModifyTime" || propName == "HUpDateDate")
                    {
                        valueFormat = $"{propName}=getdate()";
                    }
                    else
                    {
                        valueFormat = $"{propName}='{{{ModeName}.{propName}}}'";
                    }
                    sb.Append("\r\n                " + valueFormat);

                    setFieldCount++;
                }

                sb.Append($" where {whereKey}='{{{ModeName}.{whereKey}}}'\"");
                sb.AppendLine();
                sb.Append("oCN.RunProc(sqlRes);");


                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = sb;
                return objJsonResult;
            }
        }
        #endregion
    }


}


 WebAPI/WebAPI.csproj.user

@@ -13,34 +13,10 @@
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\CHZFolderProfile.pubxml</NameOfLastUsedPublishProfile>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
          </StartExternalURL>
          <StartCmdLineArguments>
          </StartCmdLineArguments>
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
  <ProjectExtensions />
</Project>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -27,3 +27,8 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ