From 5b43dece3a0043b2e3b45d0c1649715ec4692daa Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 16 十一月 2022 11:49:54 +0800
Subject: [PATCH] ERP订单查询接口修改、T8数据同步接口开发
---
VueWebApi/DLL/DAL/ErpSyncMesDAL.cs | 12 ++++++------
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.dll | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 7 +++----
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
10 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 2eb2b30..cd1658b 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs b/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
index 1206d10..43abbff 100644
--- a/VueWebApi/DLL/DAL/ErpSyncMesDAL.cs
+++ b/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)
{
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index a56f202..3949ff3 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/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";
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index cb464f9..bc047d1 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/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>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index 7d11b53..fe1e348 100644
--- a/VueWebApi/bin/VueWebApi.dll
+++ b/VueWebApi/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index ce6cc51..37e5ab4 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
index 7d11b53..fe1e348 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index ce6cc51..37e5ab4 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.dll b/VueWebApi/obj/Release/VueWebApi.dll
index 7d11b53..fe1e348 100644
--- a/VueWebApi/obj/Release/VueWebApi.dll
+++ b/VueWebApi/obj/Release/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index ce6cc51..37e5ab4 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3