From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs | 163 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 57 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
index 070cb4c..662e98d 100644
--- a/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/QualityManagementDAL.cs
@@ -51,7 +51,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -59,7 +59,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -100,14 +100,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "缂洪櫡缂栫爜:" + defectcode + "缂洪櫡鍚嶇О:" + defectname, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟鏂板鎴愬姛!";
+ mes.message = "缂洪櫡瀹氫箟鏂板鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟鏂板澶辫触!";
+ mes.message = "缂洪櫡瀹氫箟鏂板澶辫触!";
mes.data = null;
}
}
@@ -133,14 +133,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "缂洪櫡缂栫爜:" + defectcode + "缂洪櫡鍚嶇О:" + defectname, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟淇敼鎴愬姛!";
+ mes.message = "缂洪櫡瀹氫箟淇敼鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡瀹氫箟淇敼澶辫触!";
+ mes.message = "缂洪櫡瀹氫箟淇敼澶辫触!";
mes.data = null;
}
}
@@ -149,7 +149,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -171,7 +171,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠缂洪櫡椤瑰凡鐢熸垚鎶ュ伐缂洪櫡璁板綍,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠缂洪櫡椤瑰凡鐢熸垚鎶ュ伐缂洪櫡璁板綍,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -186,14 +186,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "缂洪櫡缂栫爜:" + defectcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "缂洪櫡鍒犻櫎鎴愬姛!";
+ mes.message = "缂洪櫡鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "缂洪櫡鍒犻櫎澶辫触!";
+ mes.message = "缂洪櫡鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -201,7 +201,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -239,7 +239,7 @@
where 1=1 " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -247,7 +247,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -286,14 +286,14 @@
LogHelper.DbOperateLog(us.usercode, "鏂板", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩柊澧炴垚鍔�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩柊澧炴垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩柊澧炲け璐�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩柊澧炲け璐�!";
mes.data = null;
}
}
@@ -319,14 +319,14 @@
LogHelper.DbOperateLog(us.usercode, "淇敼", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩慨鏀规垚鍔�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩慨鏀规垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠岄」鐩慨鏀瑰け璐�!";
+ mes.message = "宸ュ簭妫�楠岄」鐩慨鏀瑰け璐�!";
mes.data = null;
}
}
@@ -335,7 +335,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -357,7 +357,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠妫�楠岄」椤瑰凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
+ mes.message = "褰撳墠妫�楠岄」椤瑰凡鐢熸垚妫�楠岃褰�,涓嶅厑璁稿垹闄�!";
mes.data = null;
return mes;
}
@@ -372,14 +372,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "宸ュ簭妫�楠岄」鐩�:" + checkitemcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠屽垹闄ゆ垚鍔�!";
+ mes.message = "宸ュ簭妫�楠屽垹闄ゆ垚鍔�!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "宸ュ簭妫�楠屽垹闄ゅけ璐�!";
+ mes.message = "宸ュ簭妫�楠屽垹闄ゅけ璐�!";
mes.data = null;
}
}
@@ -387,7 +387,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -449,8 +449,8 @@
when A.suitobject='PY'
then
STUFF(( SELECT ';' + name
- FROM T_Dict
- where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + A.suitpart + ';')>0
+ FROM TMateriel_Class
+ where PATINDEX('%;' + RTRIM(TMateriel_Class.code) + ';%',';' + A.suitpart + ';')>0
FOR XML PATH('')), 1, 1,'')
end as suitpartname
from TStepCheckStandard A
@@ -460,7 +460,7 @@
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -468,7 +468,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -491,14 +491,38 @@
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
catch (Exception e)
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[宸ュ簭璐ㄦ鏂规鏂板銆佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
+ public static ToMessage QualityStepCheckItemSelect()
+ {
+ string sql = "";
+ try
+ {
+ //鑾峰彇宸ュ簭鐐规椤圭洰鏁版嵁
+ sql = @"select code,name,descr from TStepCheckItem";
+ var data = DapperHelper.selecttable(sql);
+ 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;
@@ -579,7 +603,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "淇敼澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
+ mes.message = "淇敼澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
mes.data = null;
return mes;
}
@@ -655,14 +679,14 @@
}
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -670,7 +694,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -693,7 +717,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鍒犻櫎澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
+ mes.message = "鍒犻櫎澶辫触,褰撳墠璐ㄦ鏂规宸茬敓鎴愬搴旀楠岃褰�!";
mes.data = null;
return mes;
}
@@ -711,14 +735,14 @@
LogHelper.DbOperateLog(us.usercode, "鍒犻櫎", "璐ㄦ鏂规:" + qualityinsptcode, us.usertype);
mes.code = "200";
mes.count = 0;
- mes.Message = "璐ㄦ鏂规鍒犻櫎鎴愬姛!";
+ mes.message = "璐ㄦ鏂规鍒犻櫎鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璐ㄦ鏂规鍒犻櫎澶辫触!";
+ mes.message = "璐ㄦ鏂规鍒犻櫎澶辫触!";
mes.data = null;
}
}
@@ -726,7 +750,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -751,7 +775,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "璇锋壂鎻忓伐搴忔潯鐮�!";
+ mes.message = "璇锋壂鎻忓伐搴忔潯鐮�!";
mes.data = null;
return mes;
}
@@ -760,8 +784,33 @@
ordercode = arra[0]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
stepcode = arra[1]; //鑾峰彇鎸囧畾瀛楃涓插墠闈㈢殑瀛楃
}
+ //0.鍒ゆ柇褰撳墠鏉＄爜宸ュ簭浠诲姟涓嶅瓨鍦�
+ sql = @"select * from TK_Wrk_Step where wo_code=@ordercode and step_code=@step_code";
+ dynamicParams.Add("@ordercode", ordercode);
+ dynamicParams.Add("@step_code", stepcode);
+ var da1 = DapperHelper.selectdata(sql, dynamicParams);
+ if (da1.Rows.Count <= 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "褰撳墠鏉＄爜,宸ュ簭浠诲姟涓嶅瓨鍦�,璇疯仈绯荤鐞嗗憳!";
+ mes.data = null;
+ return mes;
+ }
+ //鍒ゆ柇褰撳墠宸ュ崟鏄惁鍏抽棴
+ sql = @"select * from TK_Wrk_Man where wo_code=@ordercode and status='CLOSED'";
+ dynamicParams.Add("@ordercode", ordercode);
+ var da0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (da0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.message = "褰撳墠宸ュ崟宸插叧闂�,涓嶅厑璁告楠屾搷浣�!";
+ mes.data = null;
+ return mes;
+ }
//閫氳繃鎵弿浜岀淮鐮佷俊鎭煡鎵句换鍔′俊鎭�
- sql = @"select A.wo_code,A.good_qty,M.partcode,M.partname,M.partspec,M.stocktype_code,S.stepcode,S.stepname
+ sql = @"select A.wo_code,A.good_qty,M.partcode,M.partname,M.partspec,M.idinventoryclass as stocktype_code,S.stepcode,S.stepname
from TK_Wrk_Step 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
@@ -790,14 +839,14 @@
list.Add("chekstand", data1);
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = list;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
+ mes.message = "褰撳墠浜у搧銆�" + data.Rows[0]["partname"].ToString() + "銆�,瀵瑰簲宸ュ簭銆�" + data.Rows[0]["stepname"].ToString() + "銆戯紝鏈寚瀹氳川妫�鏂规!";
mes.data = null;
return mes;
}
@@ -806,7 +855,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
+ mes.message = "褰撳墠宸ュ簭浠诲姟鏃犳姤宸ヤ骇鍑�!";
mes.data = null;
return mes;
}
@@ -815,7 +864,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
+ mes.message = "鐢熶骇浠诲姟涓嶅瓨鍦�!";
mes.data = null;
return mes;
}
@@ -824,7 +873,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = "浜岀淮鐮佷俊鎭负绌�!";
+ mes.message = "浜岀淮鐮佷俊鎭负绌�!";
mes.data = null;
return mes;
}
@@ -833,7 +882,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -860,14 +909,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = data;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
+ mes.message = "褰撳墠璐ㄦ鏂规鏃犳楠岄」!";
mes.data = null;
}
}
@@ -875,7 +924,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -962,14 +1011,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鎿嶄綔鎴愬姛!";
+ mes.message = "鎿嶄綔鎴愬姛!";
mes.data = null;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鎿嶄綔澶辫触!";
+ mes.message = "鎿嶄綔澶辫触!";
mes.data = null;
}
}
@@ -977,7 +1026,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1044,7 +1093,7 @@
where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = data.ToList();
}
@@ -1052,7 +1101,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1074,14 +1123,14 @@
{
mes.code = "200";
mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.data = dt;
}
else
{
mes.code = "300";
mes.count = 0;
- mes.Message = "鏃犳楠屾槑缁嗘暟鎹�!";
+ mes.message = "鏃犳楠屾槑缁嗘暟鎹�!";
mes.data = null;
}
}
@@ -1089,7 +1138,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
@@ -1199,7 +1248,7 @@
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
+ mes.message = "鏌ヨ鎴愬姛!";
mes.count = total;
mes.data = msg;
}
@@ -1207,7 +1256,7 @@
{
mes.code = "300";
mes.count = 0;
- mes.Message = e.Message;
+ mes.message = e.Message;
mes.data = null;
}
return mes;
--
Gitblit v1.9.3