From 5a10098b80f0d731e6a84f4ea3adc25ddfc74556 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 26 十一月 2022 10:56:17 +0800
Subject: [PATCH] 排程接口修改
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Logs/2022-11-26.TXT | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 15 +++++++++------
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 0863672..3e93bad 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index 21b5842..6bf5f23 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -3530,23 +3530,26 @@
public static DataTable AlreadyScheduling(string wocode, string wkshpcode, string partcode, string botproccode, string startdate, string enddate)
{
var dynamicParams = new DynamicParameters();
+ DataTable dt;
try
{
List<APSList> listData = SchedulingMethod.SchedulingMethodTF(wocode, wkshpcode, partcode);
string[] empIds = listData.Select(a => a.eqp_id).ToArray();
string str = string.Join(",", empIds);
- string s1 = string.Format("'{0}'", str.Replace(",", "','"));
+ string[] s1 = Array.ConvertAll<string, string>(str.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ //string s1 = string.Format("'{0}'", str.Replace(",", "','"));
string sql = @"select B.wo_code, B.eqp_code,B.time_start,B.time_end, 'S' status , B.alloc_qty,D.partname as part_name
from TK_Wrk_EqpAps B
left join TK_Wrk_Man C on B.wo_code=C.wo_code
left join TMateriel_Info D on C.materiel_code=D.partcode
- where B.eqp_code in(@s1)
+ where B.eqp_code in @eqpcode
and convert(varchar(100),B.Time_Start,21)>=@startdate and convert(varchar(100),B.Time_End,21)<=@enddate order by time_end";
- dynamicParams.Add("@s1", s1);
- dynamicParams.Add("@startdate", startdate + " 00:00:00");
- dynamicParams.Add("@enddate", enddate + " 23:59:59");
- var dt_0 = DapperHelper.selectdata(sql, dynamicParams);
+ dt = DapperHelper.selectlist(sql, new { eqpcode = s1.ToArray(), startdate= startdate + " 00:00:00", enddate= enddate + " 23:59:59" });
+ //dynamicParams.Add("@s1", new { shopcode = s1.ToArray() });
+ //dynamicParams.Add("@startdate", startdate + " 00:00:00");
+ //dynamicParams.Add("@enddate", enddate + " 23:59:59");
+ //var dt_0 = DapperHelper.selectdata(sql, dynamicParams);
if (dt == null || dt.Rows.Count == 0)
{
return null;
diff --git a/VueWebApi/Logs/2022-11-26.TXT b/VueWebApi/Logs/2022-11-26.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-11-26.TXT
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index e031bdb..8a11ceb 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index e031bdb..8a11ceb 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3