From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 ：单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端：外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表：(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发
---
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index aa5bc8d..5e67faf 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -56,15 +56,21 @@
{
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
+ 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
- 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);
+ 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)";
+ 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 +154,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 +166,10 @@
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'
+ and A.plan_qty>(B.good_qty+B.ng_qty+B.bad_qty)
)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 +190,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,16 +200,15 @@
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
inner join TMateriel_Info M on A.materiel_code=M.partcode
- inner join TCustomer C on A.wx_code=C.code and C.btype='WX'
+ inner join TCustomer C on A.wx_code=C.code
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 +229,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 +237,9 @@
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;
@@ -330,7 +337,7 @@
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopLeft";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopLeft order by voucherdate";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -354,7 +361,7 @@
try
{
//鑾峰彇浠撳簱鐢熶骇鍔犲伐鍗曞緟鍏ュ簱鍒楄〃
- sql = @"select * from h_v_DDKanBan_WareHouseTopBottom";
+ sql = @"select * from h_v_DDKanBan_WareHouseTopBottom order by voucherdate";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -416,5 +423,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