From e3c82e71128ed653e99db4dcef474c7b6aa464c8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 21 十一月 2022 10:35:54 +0800
Subject: [PATCH] nothing
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 47 +++++++++++++++++------
VueWebApi/DLL/DAL/KanBanManagerentDAL.cs | 36 ------------------
2 files changed, 34 insertions(+), 49 deletions(-)
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index b2fa817..e403543 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -451,42 +451,6 @@
return mes;
}
#endregion
-
-
- #region[瀵屽皵杈捐溅闂寸敓浜ф暟瀛楀寲鐪嬫澘锛屼骇绾挎暟鎹甝
- public static ToMessage WkshpLineData(string lineCode)
- {
- string sql = "";
- string search = "";
- var dynamicParams = new DynamicParameters();
- try
- {
- //鑾峰彇浜х嚎閿�鍞鍗曟姤宸ヤ俊鎭�,鎶ュ伐鏁伴噺>0 涓斿伐鍗曠姸鎬佷负闈炲叧闂姸鎬� 涓斿伐搴忎负鏈亾宸ュ簭 锛�--and (S.good_qty+S.ng_qty+S.bad_qty)<S.plan_qty)
- sql = @"select A.saleOrderCode,A.materiel_code,M.partname,
- isnull(sum(S.good_qty),0) as good_qty
- from TKimp_Ewo A
- inner join TK_Wrk_Man B on A.wo=B.m_po
- inner join TK_Wrk_Step S on B.wo_code=S.wo_code
- inner join TFlw_Rteqp R on S.step_code=R.step_code
- left join TMateriel_Info M on A.materiel_code=M.partcode
- where S.good_qty>0 and S.isend='Y' and R.eqp_code=@lineCode and B.status<>'CLOSED'
- group by A.saleOrderCode,A.materiel_code,M.partname";
- dynamicParams.Add("@lineCode", lineCode);
- var data = DapperHelper.selectdata(sql, dynamicParams);
- 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
}
}
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index f073b22..17276d1 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1095,34 +1095,52 @@
}
#endregion
- #region[鐗╂枡娓呭崟鍒犻櫎]
- public static ToMessage DeleteBoIventory(string bomid)
+ #region[宸ヨ壓璺嚎鍒犻櫎]
+ public static ToMessage DeleteRoute(string routecode)
{
var sql = "";
List<object> list = new List<object>();
var dynamicParams = new DynamicParameters();
try
{
- list.Clear();
- //鍒ゆ柇鐗╂枡绫诲瀷鏄惁鏈夊叧鑱旂墿鏂�
- sql = @"select materiel_code from TK_Wrk_Man where materiel_code in (select materiel_code from TBom_Main where id=@bomid ) and bom_id=@bomid";
- dynamicParams.Add("@bomid", bomid);
+ //鍒ゆ柇宸ヨ壓璺嚎鏄惁琚伐鍗曞紩鐢�(琚紩鐢ㄥ垯涓嶈兘鍒犻櫎)
+ sql = @"select * from TK_Wrk_Man where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠鐗╂枡娓呭崟宸茶宸ュ崟鍏宠仈浣跨敤,涓嶅厑璁稿垹闄�!";
+ mes.Message = "宸ヨ壓璺嚎宸茶宸ュ崟寮曠敤锛屼笉鍏佽鍒犻櫎!";
mes.data = null;
+ return mes;
}
else
{
- //鍒犻櫎鐗╂枡娓呭崟瀛愯〃
- sql = @"delete TBom_Deta where m_id=@bomid";
- list.Add(new { str = sql, parm = new { bomid = bomid } });
- //鍒犻櫎鐗╂枡娓呭崟涓昏〃
- sql = @"delete TBom_Main where id=@bomid";
- list.Add(new { str = sql, parm = new { bomid = bomid } });
+ //鍒ゆ柇褰撳墠宸ヨ壓璺嚎鏄惁鏈夎缃妭鎷嶅伐浠�(鏈夎缃紝鎻愮ず鍏堝垹闄よ妭鎷嶅伐浠疯缃�)
+ sql = @"select * from TPrteEqp_Stad where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "宸ヨ壓璺嚎宸茶缃妭鎷嶅伐浠凤紝璇峰厛鍒犻櫎璁剧疆!";
+ mes.data = null;
+ return mes;
+ }
+ else
+ {
+ //鍒犻櫎宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
+ sql = @"delete TFlw_Rtdt where rout_code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ //鍒犻櫎宸ヨ壓璺嚎琛�
+ sql = @"delete TFlw_Rout where code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ //鍒犻櫎鐗╂枡鍏宠仈宸ヨ壓璺嚎琛�
+ sql = @"delete TMateriel_Route where route_code=@routecode";
+ list.Add(new { str = sql, parm = new { routecode = routecode } });
+ }
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
@@ -1130,6 +1148,7 @@
mes.count = 0;
mes.Message = "鍒犻櫎鎴愬姛!";
mes.data = null;
+ return mes;
}
else
{
@@ -1137,6 +1156,7 @@
mes.count = 0;
mes.Message = "鍒犻櫎澶辫触!";
mes.data = null;
+ return mes;
}
}
}
@@ -1146,6 +1166,7 @@
mes.count = 0;
mes.Message = e.Message;
mes.data = null;
+ return mes;
}
return mes;
}
--
Gitblit v1.9.3