From fce9a89fb5ad93277b95c699e892af1bb28aba88 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 02 八月 2022 19:30:15 +0800
Subject: [PATCH] 车间综合看板接口调整，报工控制
---
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index f31070a..f964aaf 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -81,14 +81,13 @@
{
line.lineworkcont=data.Rows[0]["CONT"].ToString(); //浜х嚎鎬诲崟閲�
line.children = new List<TreeOne>();
- //鏌ヨ浜х嚎涓嬪伐鍗曚俊鎭�
- sql = @"select distinct E.saleOrderCode,P.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname from TFlw_Rteqp A
- inner join TFlw_Rtdt B on A.step_code=B.step_code
- inner join TK_Wrk_Man P on B.rout_code=P.route_code
+ //鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
+ 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
- where P.status<>'CLOSED' and P.status<>'NEW' and P.is_delete<>'1' and A.eqp_code=@linecode";
+ where P.status<>'CLOSED' and P.status<>'NEW' and A.eqp_code=@linecode and A.style='S' and A.step_seq='1'";
dynamicParams.Add("@linecode", json[i].code);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0)
@@ -114,7 +113,7 @@
lineone.children = new List<TreeTwo>();
//鏌ユ柊宸ュ崟涓嬪伐搴忎俊鎭�
- sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty
+ sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
where A.wo_code=@wo_code";
@@ -128,6 +127,7 @@
string planqty = data1.Rows[k]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
string good_qty = data1.Rows[k]["GOOD_QTY"].ToString();//鎶ュ伐鏁伴噺
string ng_qty = data1.Rows[k]["NG_QTY"].ToString();//涓嶈壇鏁伴噺
+ string status = data1.Rows[k]["STATUS"].ToString();//鐘舵��
TreeTwo linetwo = new TreeTwo();
linetwo.stepseq = stepseq;
linetwo.stepcode = stepcode;
@@ -135,6 +135,7 @@
linetwo.planqty = planqty;
linetwo.goodqty = good_qty;
linetwo.ngqty = ng_qty;
+ linetwo.status = status;
lineone.children.Add(linetwo);
}
}
@@ -145,7 +146,8 @@
mes.code = "300";
mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
mes.data = null;
- return mes;
+ list.Add(line);
+ continue;
}
}
else
@@ -153,7 +155,9 @@
mes.code = "300";
mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
mes.data = null;
- return mes;
+ list.Add(line);
+ continue;
+
}
}
}
@@ -211,7 +215,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛]
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
public static ToMessage LineSearchTopRightData()
{
string sql = "";
@@ -223,12 +227,12 @@
select M.partname,A.good_qty from TK_Wrk_Record A
inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
inner join TMateriel_Info M on A.materiel_code=M.partcode
- where A.style='B' and S.isend='Y'
+ where A.style='B' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
union all
select 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
inner join TMateriel_Info M on A.materiel_code=M.partcode
- where A.style='S' and S.isend='Y'
+ where A.style='S' and S.isend='Y' and datediff(day,GETDATE(),A.lm_date)=0
) as A group by A.partname order by good_qty desc";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
@@ -246,7 +250,7 @@
}
#endregion
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛]
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
public static ToMessage LineSearchBottomRightData()
{
string sql = "";
@@ -254,7 +258,7 @@
try
{
//鑾峰彇鎶ュ伐涓嶈壇top5淇℃伅
- sql = @"select isnull(COUNT(checkitem_name),0) cont,checkitem_name from TStepCheckRecordSub
+ sql = @"select isnull(COUNT(checkitem_name),0) cont,checkitem_name from TStepCheckRecordSub where DateDiff(dd,lm_date,getdate())<=7
group by checkitem_name order by cont desc";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
--
Gitblit v1.9.3