yl
2022-11-16 5b43dece3a0043b2e3b45d0c1649715ec4692daa
ERP订单查询接口修改、T8数据同步接口开发
已修改10个文件
29 ■■■■ 文件已修改
.vs/VueWebApi/v16/.suo 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ErpSyncMesDAL.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/DLL/DAL/ProductionManagementDAL.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.dll 补丁 | 查看 | 原始文档 | blame | 历史
VueWebApi/obj/Release/VueWebApi.pdb 补丁 | 查看 | 原始文档 | blame | 历史
.vs/VueWebApi/v16/.suo
Binary files differ
VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
@@ -19,7 +19,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPUnit";
                sql = @"h_p_IFCLD_T8ERPUnit";
                dynamicParams.Add("@username", username);
                bool a = DapperHelper.IsProcedure(sql, dynamicParams);
                if (a)
@@ -56,7 +56,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPInventory_Class";
                sql = @"h_p_IFCLD_T8ERPInventory_Class";
                bool a = DapperHelper.IsProcedureNo(sql);
                if (a)
                {
@@ -92,7 +92,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPInventory";
                sql = @"h_p_IFCLD_T8ERPInventory";
                dynamicParams.Add("@username", username);
                bool a = DapperHelper.IsProcedure(sql, dynamicParams);
                if (a)
@@ -129,7 +129,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPWhareHousesLocation";
                sql = @"h_p_IFCLD_T8ERPWhareHousesLocation";
                dynamicParams.Add("@username", username);
                bool a = DapperHelper.IsProcedure(sql, dynamicParams);
                if (a)
@@ -166,7 +166,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPPartner";
                sql = @"h_p_IFCLD_T8ERPPartner";
                dynamicParams.Add("@username", username);
                bool a = DapperHelper.IsProcedure(sql, dynamicParams);
                if (a)
@@ -203,7 +203,7 @@
            try
            {
                //存储过程名
                sql = @"h_p_IFCLD_ERPMO";
                sql = @"h_p_IFCLD_T8ERPMO";
                bool a = DapperHelper.IsProcedureNo(sql);
                if (a)
                {
VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -66,7 +66,7 @@
                }
                if (creatuser != "" && creatuser != null)
                {
                    search += "and U.username like '%'+@creatuser+'%' ";
                    search += "and A.createuser like '%'+@creatuser+'%' ";
                    dynamicParams.Add("@creatuser", creatuser);
                }
@@ -77,12 +77,11 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
                            A.stck_code,D.name as stck_name,A.planstartdate,A.planenddate,U.username as createuser,A.createdate
                            A.stck_code,D.name as stck_name,A.planstartdate,A.planenddate,A.createuser as createuser,A.createdate
                            from TKimp_Ewo A
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.org_code
                            left join T_Sec_Stck D on A.stck_code=D.code
                            left join TUser U on A.createuser=U.usercode
                            left join T_Sec_Stck D on A.stck_code=D.code
                            where A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\MES灵翔</_PublishTargetUrl>
    <History>True|2022-11-16T01:54:50.9630719Z;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
    <History>True|2022-11-16T02:30:15.8662476Z;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -705,13 +705,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>11/16/2022 09:54:44</publishTime>
      <publishTime>11/16/2022 10:30:10</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>11/16/2022 09:54:44</publishTime>
      <publishTime>11/16/2022 10:30:10</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>11/16/2022 09:54:44</publishTime>
      <publishTime>11/16/2022 10:30:10</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1074,7 +1074,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/16/2022 09:54:50</publishTime>
      <publishTime>11/16/2022 10:30:15</publishTime>
    </File>
  </ItemGroup>
</Project>
VueWebApi/bin/VueWebApi.dll
Binary files differ
VueWebApi/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
Binary files differ
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
VueWebApi/obj/Release/VueWebApi.dll
Binary files differ
VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ