From 78ccddadb87e0d4dd7f74733a031393395db2869 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 五月 2024 14:38:39 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 268 +++++++++++++++++++++++++++++------------------------
1 files changed, 148 insertions(+), 120 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 9f927ac..942ff34 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -20,22 +20,16 @@
public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
-
- #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鐢熶骇杞﹂棿鏌ユ壘浜х嚎鎺ュ彛]
- public static ToMessage ShopSearchLine(string shopcode)
+ #region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鑾峰彇鐢熶骇杞﹂棿]
+ public static ToMessage ShopSearch()
{
string sql = "";
string search = "";
var dynamicParams = new DynamicParameters();
try
{
- if (shopcode != "" && shopcode != null) //杞﹂棿缂栫爜涓嶄负绌�
- {
- search += "where wksp_code=@shopcode ";
- dynamicParams.Add("@shopcode", shopcode);
- }
- //杞﹂棿缂栫爜鑾峰彇浜х嚎淇℃伅
- sql = @"select code ,name from TEqpInfo " + search;
+ //鑾峰彇杞﹂棿淇℃伅
+ sql = @"select org_code ,org_name from TOrganization where is_delete='0' and description='W'";
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -53,118 +47,104 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笂浜х嚎鍔犲伐浠诲姟鎺ュ彛]
- public static ToMessage LineSearchTopLeftData(List<ObjectData> json)
+ public static ToMessage LineSearchTopLeftData(string shopcode)
{
string sql = "";
- string search = "";
List<ShopTopLeft> list = new List<ShopTopLeft>();
var dynamicParams = new DynamicParameters();
try
{
- if (json == null || json.Count>0) //浜х嚎缂栫爜涓嶄负绌�
+ if (shopcode != null || shopcode != "") //浜х嚎缂栫爜涓嶄负绌�
{
- //鑾峰彇浜х嚎淇℃伅
- for (int i = 0; i < json.Count; i++)
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ //鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
+ //sql = @"select * from (
+ // select distinct E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,S.good_qty,S.ng_qty,S.bad_qty 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
+ // left join (
+ // select wo_code,sum(good_qty) as good_qty,sum(ng_qty) as ng_qty,sum(bad_qty) as bad_qty from TK_Wrk_Step where isend='Y' group by wo_code
+ // ) S on P.wo_code=S.wo_code
+ // where P.status<>'CLOSED' and P.status<>'NEW' and P.wkshp_code in @shopcode and A.style='S' and A.step_seq='1'
+ // ) as AA where AA.plan_qty>(AA.good_qty+aa.bad_qty+AA.ng_qty)";
+ sql = @"select AA.lm_date,AA.saleOrderCode,AA.wo_code,AA.plan_qty,AA.partcode,AA.partname,AA.partspec,AA.uomname,
+ sum(AA.good_qty) as good_qty,sum(AA.ng_qty)+sum(AA.bad_qty) as ng_qty,sum(AA.bad_qty) as bad_qty
+ from(
+ select P.lm_date,E.saleOrderCode,A.wo_code,P.plan_qty,M.partcode,M.partname,M.partspec,T.name as uomname,A.good_qty,A.ng_qty,A.bad_qty
+ 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 DateDiff(dd,P.lm_date,getdate())<=15
+ ) as AA group by AA.lm_date,AA.saleOrderCode,AA.wo_code,AA.plan_qty,AA.partcode,AA.partname,AA.partspec,AA.uomname
+ order by AA.lm_date desc";
+ var data0 = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
+
+ if (data0.Rows.Count > 0)
{
- ShopTopLeft line = new ShopTopLeft();
- line.linecode = json[i].code;
- line.linename = json[i].name;
- //鑾峰彇浜х嚎涓嬪紑宸ユ�诲崟閲�
- sql = @"select COUNT(*) cont from(
- select distinct B.rout_code,M.wo_code from TFlw_Rteqp A
- inner join TFlw_Rtdt B on A.step_code=B.step_code
- inner join TK_Wrk_Man M on B.rout_code=M.route_code
- where M.status<>'CLOSED' and M.is_delete<>'1' and A.eqp_code=@linecode) as A";
- dynamicParams.Add("@linecode", json[i].code);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0 && decimal.Parse(data.Rows[0]["CONT"].ToString())>0)
+ for (int j = 0; j < data0.Rows.Count; j++)
{
- line.lineworkcont=data.Rows[0]["CONT"].ToString(); //浜х嚎鎬诲崟閲�
- line.children = new List<TreeOne>();
- //鏌ヨ浜х嚎涓嬪凡寮�宸ョ殑鍔犲伐鍗曚俊鎭�
- 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 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)
- {
- for (int j = 0; j < data0.Rows.Count; j++)
- {
- string saleOrderCode = data0.Rows[j]["SALEORDERCODE"].ToString();//閿�鍞鍗曞彿
- string wo_code = data0.Rows[j]["WO_CODE"].ToString();//宸ュ崟鍙�
- string plan_qty = data0.Rows[j]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
- string partcode = data0.Rows[j]["PARTCODE"].ToString();//浜у搧缂栫爜
- string partname = data0.Rows[j]["PARTNAME"].ToString();//浜у搧鍚嶇О
- string partspec = data0.Rows[j]["PARTSPEC"].ToString();//浜у搧瑙勬牸
- string uomname = data0.Rows[j]["UOMNAME"].ToString();//鍗曚綅鍚嶇О
- TreeOne lineone = new TreeOne();
- lineone.saleordercode = saleOrderCode;
- lineone.workcode = wo_code;
- lineone.qty = plan_qty;
- lineone.partnumber = partcode;
- lineone.partname = partname;
- lineone.partspec = partspec;
- lineone.uom = uomname;
- line.children.Add(lineone);
- lineone.children = new List<TreeTwo>();
+ string saleOrderCode = data0.Rows[j]["SALEORDERCODE"].ToString();//閿�鍞鍗曞彿
+ string wo_code = data0.Rows[j]["WO_CODE"].ToString();//宸ュ崟鍙�
+ string plan_qty = data0.Rows[j]["PLAN_QTY"].ToString();//浠诲姟鏁伴噺
+ string partcode = data0.Rows[j]["PARTCODE"].ToString();//浜у搧缂栫爜
+ string partname = data0.Rows[j]["PARTNAME"].ToString();//浜у搧鍚嶇О
+ string partspec = data0.Rows[j]["PARTSPEC"].ToString();//浜у搧瑙勬牸
+ string uomname = data0.Rows[j]["UOMNAME"].ToString();//鍗曚綅鍚嶇О
+ ShopTopLeft lineone = new ShopTopLeft();
+ lineone.saleordercode = saleOrderCode;
+ lineone.workcode = wo_code;
+ lineone.qty = plan_qty;
+ lineone.partnumber = partcode;
+ lineone.partname = partname;
+ lineone.partspec = partspec;
+ lineone.uom = uomname;
+ lineone.children = new List<TreeTwo>();
- //鏌ユ柊宸ュ崟涓嬪伐搴忎俊鎭�
- sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty,A.status
+ //鏌ユ柊宸ュ崟涓嬪伐搴忎俊鎭�
+ sql = @"select A.seq,T.stepcode,T.stepname,A.plan_qty,A.good_qty,A.ng_qty+A.bad_qty as 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";
- dynamicParams.Add("@wo_code", wo_code);
- var data1 = DapperHelper.selectdata(sql, dynamicParams);
- for (int k = 0; k < data1.Rows.Count; k++)
- {
- string stepseq= data1.Rows[k]["SEQ"].ToString();//宸ュ簭搴忓彿
- string stepcode = data1.Rows[k]["STEPCODE"].ToString();//宸ュ簭缂栫爜
- string stepname = data1.Rows[k]["STEPNAME"].ToString();//宸ュ簭鍚嶇О
- 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;
- linetwo.stepname = stepname;
- linetwo.planqty = planqty;
- linetwo.goodqty = good_qty;
- linetwo.ngqty = ng_qty;
- linetwo.status = status;
- lineone.children.Add(linetwo);
- }
- }
- list.Add(line);
- }
- else
+ dynamicParams.Add("@wo_code", wo_code);
+ var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ for (int k = 0; k < data1.Rows.Count; k++)
{
- mes.code = "300";
- mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
- mes.data = null;
- list.Add(line);
- continue;
+ string stepseq = data1.Rows[k]["SEQ"].ToString();//宸ュ簭搴忓彿
+ string stepcode = data1.Rows[k]["STEPCODE"].ToString();//宸ュ簭缂栫爜
+ string stepname = data1.Rows[k]["STEPNAME"].ToString();//宸ュ簭鍚嶇О
+ 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;
+ linetwo.stepname = stepname;
+ linetwo.planqty = planqty;
+ linetwo.goodqty = good_qty;
+ linetwo.ngqty = ng_qty;
+ linetwo.status = status;
+ lineone.children.Add(linetwo);
}
- }
- else
- {
- mes.code = "300";
- mes.Message = "褰撳墠浜х嚎涓嬫棤鍦ㄧ敓浜т换鍔�!";
- mes.data = null;
- list.Add(line);
- continue;
-
+ list.Add(lineone);
}
}
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠杞﹂棿涓嬫棤鍦ㄧ敓浜т换鍔�!";
+ mes.data = null;
+ }
}
- else
+ else
{
mes.code = "300";
- mes.Message = "浜х嚎鍙傛暟涓嶈兘涓虹┖!";
+ mes.Message = "杞﹂棿鍙傛暟涓嶈兘涓虹┖!";
mes.data = null;
}
}
@@ -183,23 +163,39 @@
#endregion\
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,宸︿笅鍒楄〃鎺ュ彛]
- public static ToMessage LineSearchBottomLeftData()
+ public static ToMessage LineSearchBottomLeftData(string shopcode)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
try
{
//鑾峰彇浠诲姟鍒楄〃淇℃伅
- sql = @"select A.*,ROW_NUMBER() OVER(ORDER BY (case when A.warning<=2 then A.planenddate end) asc ,A.planstartdate asc) AS RowNum from(
+ //sql = @"select A.*,ROW_NUMBER() OVER(ORDER BY (case when A.warning<=2 then A.planenddate end) asc ,A.planstartdate asc) AS RowNum from(
+ // select A.status,A.lm_date,E.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,U.name,
+ // A.plan_qty,B.good_qty,B.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
+ // from TK_Wrk_Man A
+ // inner join TK_Wrk_Step B on A.wo_code=B.wo_code
+ // 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'
+ // and A.plan_qty>(B.good_qty+B.ng_qty+B.bad_qty)
+ // )as A ";
+ sql = @"select * from(
+ select A.*,ROW_NUMBER() OVER(ORDER BY A.lm_date desc) AS RowNum from(
select A.status,A.lm_date,E.saleOrderCode,A.wo_code,M.partcode,M.partname,M.partspec,U.name,
- A.plan_qty,B.good_qty,B.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
+ A.plan_qty,B.good_qty,BS.ng_qty,E.planstartdate,E.planenddate, datediff(day,getdate(),E.planenddate) warning
from TK_Wrk_Man A
- inner join TK_Wrk_Step B on A.wo_code=B.wo_code
- inner join TKimp_Ewo E on A.m_po=E.wo
+ inner join (select wo_code, sum(good_qty) as good_qty from TK_Wrk_Step where isend='Y' group by wo_code) B on A.wo_code=B.wo_code
+ inner join (select wo_code, sum(ng_qty)+sum(bad_qty) as ng_qty from TK_Wrk_Step group by wo_code) BS on A.wo_code=BS.wo_code
+ 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.is_delete<>'1' and B.isend='Y'
- )as A ";
- var data = DapperHelper.selecttable(sql);
+ where A.status<>'CLOSED' and A.wkshp_code in @shopcode and A.is_delete<>'1' and DateDiff(dd,A.lm_date,getdate())<=15
+ )as A
+ ) as AA ";
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -216,10 +212,11 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笂top鎺掕鎺ュ彛,褰撴棩]
- public static ToMessage LineSearchTopRightData()
+ public static ToMessage LineSearchTopRightData(string shopcode)
{
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,7 +226,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 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
@@ -237,7 +234,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";
- var data = DapperHelper.selecttable(sql);
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -254,19 +251,21 @@
#endregion
#region[澶у矝杞﹂棿缁煎悎鐪嬫澘,鍙充笅top鎺掕鎺ュ彛,褰撳墠鏃堕棿寰�鍓嶄竴鍛╙
- public static ToMessage LineSearchBottomRightData()
+ public static ToMessage LineSearchBottomRightData(string shopcode)
{
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淇℃伅
sql = @"select isnull(COUNT(B.name),0) cont,B.name
from CSR_WorkRecord_Defect A
inner join TDefect B on A.defect_code=B.code
- where DateDiff(dd,A.lm_date,getdate())<=7
+ 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
group by B.name order by cont desc";
- var data = DapperHelper.selecttable(sql);
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -314,7 +313,7 @@
try
{
//鑾峰彇閲囪喘璁㈠崟璺熻釜鍒楄〃
- sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom ";
+ sql = @"select * from h_v_DDKanBan_PurchaseLeftBottom order by voucherdate desc";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -364,7 +363,7 @@
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopLeft order by voucherdate desc";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -388,7 +387,7 @@
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopBottom order by voucherdate desc";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -450,5 +449,34 @@
return mes;
}
#endregion
+
+
+ #region[杞﹂棿鐪嬫澘鍏憡]
+ public static ToMessage WkspReportNotice(string shopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
+ //鑾峰彇杞﹂棿鍏憡淇℃伅
+ sql = @"select contents from TSystemAnnouncement
+ where wksp_code in @shopcode";
+ var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
-}
\ No newline at end of file
+}
+
--
Gitblit v1.9.3