From c48eb7425ab857ac6e1fee2f548971e87969fa84 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 九月 2022 18:31:51 +0800
Subject: [PATCH] 大岛车间综合看板接口调整、车间公告开发、节拍工价导入接口开发
---
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index aa5bc8d..aa496a9 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -56,15 +56,16 @@
{
if (shopcode != null || shopcode != "") //浜х嚎缂栫爜涓嶄负绌�
{
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
//鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
sql = @"select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TK_Wrk_Record A
inner join TK_Wrk_Man P on A.wo_code=P.wo_code
left join TMateriel_Info M on P.materiel_code=M.partcode
left join TUom T on M.uom_code=T.code
left join TKimp_Ewo E on P.m_po=E.wo and P.sourceid=E.id
- where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in(@shopcode) and A.style='S' and A.step_seq='1'";
- dynamicParams.Add("@shopcode", shopcode);
- var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'";
+ var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
+
if (data0.Rows.Count > 0)
{
for (int j = 0; j < data0.Rows.Count; j++)
@@ -148,6 +149,7 @@
{
string sql = "";
var dynamicParams = new DynamicParameters();
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
try
{
//鑾峰彇浠诲姟鍒楄〃淇℃伅
@@ -159,10 +161,9 @@
inner join TKimp_Ewo E on A.m_po=E.wo and A.sourceid=E.id
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TUom U on M.uom_code=U.code
- where A.status<>'CLOSED' and A.wkshp_code in(@shopcode) and A.is_delete<>'1' and B.isend='Y'
+ where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and B.isend='Y'
)as A ";
- dynamicParams.Add("@shopcode", shopcode);
- var data = DapperHelper.selectdata(sql,dynamicParams);
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -183,6 +184,7 @@
{
string sql = "";
var dynamicParams = new DynamicParameters();
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
try
{
//鑾峰彇浜у搧鎶ュ伐top5淇℃伅
@@ -192,7 +194,7 @@
inner join TMateriel_Info M on A.materiel_code=M.partcode
inner join TEqpInfo E on A.eqp_code=E.code
inner join TOrganization W on E.wksp_code=W.org_code and W.description='W'
- where A.style='B' and S.isend='Y' and W.org_code in(@shopcode) and datediff(day,GETDATE(),A.lm_date)=0
+ where A.style='B' and S.isend='Y' and W.org_code in @shopcode and datediff(day,GETDATE(),A.lm_date)=0
union all
select C.name as linename,'' as wkshname,M.partname,A.sqty as good_qty from TK_Wrk_OutRecord A
inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
@@ -200,8 +202,7 @@
inner join TCustomer C on A.wx_code=C.code and C.btype='WX'
where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
) as A group by A.org_name,A.name,A.partname order by good_qty desc";
- dynamicParams.Add("@shopcode", shopcode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -222,6 +223,7 @@
{
string sql = "";
var dynamicParams = new DynamicParameters();
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
try
{
//鑾峰彇鎶ュ伐涓嶈壇top5淇℃伅
@@ -229,10 +231,10 @@
from CSR_WorkRecord_Defect A
inner join TDefect B on A.defect_code=B.code
inner join TK_Wrk_Man M on A.wo_code=M.wo_code
- where DateDiff(dd,A.lm_date,getdate())<=7 and M.wkshp_code in(@shopcode)
+ where DateDiff(dd,A.lm_date,getdate())<=7 and M.wkshp_code in @shopcode
group by B.name order by cont desc";
dynamicParams.Add("@shopcode", shopcode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
--
Gitblit v1.9.3