From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 130 ++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 26 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index bf3e19e..eb0a4b2 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -300,14 +300,16 @@
#endregion
#region[宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛╙
- public static ToMessage StepCheckItemSelect()
+ public static ToMessage StepCheckItemSelect(string WorkShop)
{
string sql = "";
+ var dynamicParams = new DynamicParameters();
try
{
//鑾峰彇宸ュ簭鐐规椤圭洰鏁版嵁
- sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' ";
- var data = DapperHelper.selecttable(sql);
+ sql = @"select code,name,descr from TStepCheckItem where is_delete<>'1' and torg_code=@torg_code";
+ dynamicParams.Add("@torg_code", WorkShop);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -460,12 +462,27 @@
#region[宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇
- public static ToMessage StepCheckItemSearch(string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepCheckItemSearch(string stu_torgcode,string stu_torgtypecode, string itemcode, string itemname, string itemdescr, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (itemcode != "" && itemcode != null)
{
search += "and A.code like '%'+@itemcode+'%' ";
@@ -484,8 +501,10 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
+ var sql = @"select C.org_code,C.org_name,A.code,A.name,A.descr,U.username as lm_user,A.lm_date from TStepCheckItem A
left join TUser U on A.lm_user=U.usercode
+ left join TOrganization C on A.torg_code=C.org_code
+ left join TOrganization L on C.parent_id=L.id
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -505,7 +524,7 @@
#endregion
#region[宸ュ簭妫�楠岄」鐩柊澧炪�佺紪杈戞彁浜
- public static ToMessage AddUpdateStepCheckItem(string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
+ public static ToMessage AddUpdateStepCheckItem(string wkshopcode, string checkitemcode, string checkitemname, string checkitemdescr, string opertype, string username)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -515,8 +534,8 @@
if (opertype == "Add")
{
//鍐欏叆缂洪櫡瀹氫箟瀹氫箟琛�
- sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date)
- values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate)";
+ sql = @"insert into TStepCheckItem(code,name,descr,lm_user,lm_date,torg_code)
+ values(@checkitemcode,@checkitemname,@checkitemdescr,@username,@CreateDate,@torg_code)";
list.Add(new
{
str = sql,
@@ -526,7 +545,8 @@
checkitemname = checkitemname,
checkitemdescr = checkitemdescr,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ torg_code=wkshopcode
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -547,7 +567,7 @@
}
if (opertype == "Update")
{
- sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate where code=@checkitemcode";
+ sql = @"update TStepCheckItem set name=@checkitemname,descr=@checkitemdescr,lm_user=@username,lm_date=@CreateDate,torg_code=@torg_code where code=@checkitemcode";
list.Add(new
{
str = sql,
@@ -557,7 +577,8 @@
checkitemname = checkitemname,
checkitemdescr = checkitemdescr,
username = username,
- CreateDate = DateTime.Now.ToString()
+ CreateDate = DateTime.Now.ToString(),
+ torg_code=wkshopcode
}
});
bool aa = DapperHelper.DoTransaction(list);
@@ -640,12 +661,27 @@
#region[宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇
- public static ToMessage StepCheckTableSearch(string wocode, string partcode, string partname, string partapec, string stepname, string standname, string checktype, string checkresult, int startNum, int endNum, string prop, string order)
+ public static ToMessage StepCheckTableSearch(string stu_torgcode,string stu_torgtypecode, string wocode, string partcode, string partname, string partapec, string stepname, string standname, string checktype, string checkresult, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and C.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -695,6 +731,9 @@
left join TStep S on A.step_code=S.stepcode
left join TStepCheckStandard T on A.checkstaned_code=T.code
left join TUser U on A.check_user=U.usercode
+ left join TK_Wrk_Man M on A.wo_code=M.wo_code
+ left join TOrganization C on A.torg_code=C.org_code
+ left join TOrganization L on C.parent_id=L.id
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";
@@ -762,12 +801,27 @@
#endregion
#region[宸ュ簭妫�楠岃褰曞鍑篯
- public static ToMessage StepCheckTableOutExcel(string wocode, string partcode, string partname, string partapec, string stepname, string standname, string checktype, string checkresult, string prop, string order)
+ public static ToMessage StepCheckTableOutExcel(string stu_torgcode,string stu_torgtypecode, string wocode, string partcode, string partname, string partapec, string stepname, string standname, string checktype, string checkresult, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and L.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and G.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (wocode != "" && wocode != null)
{
search += "and A.wo_code like '%'+@wocode+'%' ";
@@ -859,6 +913,9 @@
left join TStepCheckStandard T on A.checkstaned_code=T.code
left join TStepCheckStandardSub C on A.checkstaned_code=C.stepstaned_code and B.checkitem_code=C.stepcheckitem_code
left join TUser U on A.check_user=U.usercode
+ left join TK_Wrk_Man K on A.wo_code=K.wo_code
+ left join TOrganization G on A.torg_code=G.org_code
+ left join TOrganization L on G.parent_id=L.id
where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
@@ -882,12 +939,27 @@
#region[璐ㄦ鏂规鍒楄〃鏌ヨ]
- public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
+ public static ToMessage QualityInspectionSearch(string stu_torgcode,string stu_torgtypecode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype, string suitobject, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
try
{
+ switch (stu_torgtypecode)
+ {
+ case "":
+ break;
+ case "D":
+ search += "and AA.Lorg_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ case "W":
+ search += "and AA.org_code=@stu_torgcode ";
+ dynamicParams.Add("@stu_torgcode", stu_torgcode);
+ break;
+ default:
+ break;
+ }
if (qualityinsptcode != "" && qualityinsptcode != null)
{
search += "and AA.code like '%'+@qualityinsptcode+'%' ";
@@ -926,7 +998,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
+ select C.org_code,C.org_name,L.org_code as Lorg_code,A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.stepcode,S.stepname,A.descr,A.suitpart,A.lm_date,U.username,
case when A.suitobject='P' then
STUFF(( SELECT ';' + partname
FROM TMateriel_Info
@@ -942,6 +1014,8 @@
from TStepCheckStandard A
left join TUser U on A.lm_user=U.usercode
left join TStep S on A.stepcode=S.stepcode
+ left join TOrganization C on A.torg_code=C.org_code
+ left join TOrganization L on C.parent_id=L.id
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -992,7 +1066,7 @@
#endregion
#region[璐ㄦ鏂规鏂板/缂栬緫鎻愪氦]
- public static ToMessage QualityInspectionAddEditSave(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
+ public static ToMessage QualityInspectionAddEditSave(string wkshopcode, string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampmethod, string sampscare, string suitobject, string suitpart, string descr,string stepcode, string checkitem, string type, string username)
{
var sql = "";
List<object> list = new List<object>();
@@ -1007,8 +1081,8 @@
{
case "Add": //鏂板
//鍐欏叆璐ㄦ鏂规涓昏〃
- sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date)
- values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,stepcode,descr,lm_user,lm_date,torg_code)
+ values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@stepcode,@descr,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1025,14 +1099,15 @@
stepcode= stepcode,
descr = descr,
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code= wkshopcode
}
});
//鍐欏叆璐ㄦ鏂规瀛愯〃
for (int i = 0; i < arra.Count; i++)
{
- sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date)
- values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code)
+ values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1050,7 +1125,8 @@
lowervalue = arra[i]["lowervalue"].ToString(),
stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code=wkshopcode
}
});
}
@@ -1074,7 +1150,7 @@
list.Add(new { str = sql, parm = new { code = qualityinsptcode } });
//淇敼璐ㄦ鏂规涓昏〃
sql = @"update TStepCheckStandard set name=@name,status=@status,checktype=@checktype,sampmethod=@sampmethod,sampscare=@sampscare,
- suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr
+ suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr,torg_code=@torg_code
where code=@code";
list.Add(new
{
@@ -1091,13 +1167,14 @@
suitpart = suitpart,
stepcode = stepcode,
descr = descr,
+ torg_code=wkshopcode
}
});
//鏂板璐ㄦ鏂规瀛愯〃
for (int i = 0; i < arra.Count; i++)
{
- sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date)
- values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date)";
+ sql = @"insert into TStepCheckStandardSub(stepstaned_code,stepcheckitem_seq,stepcheckitem_code,required,numberjudge,unit,decimalnum,standvalue,uppervalue,lowervalue,stepcheckitem_desc,lm_user,lm_date,torg_code)
+ values(@stepstaned_code,@stepcheckitem_seq,@stepcheckitem_code,@required,@numberjudge,@unit,@decimalnum,@standvalue,@uppervalue,@lowervalue,@stepcheckitem_desc,@lm_user,@lm_date,@torg_code)";
list.Add(new
{
str = sql,
@@ -1115,7 +1192,8 @@
lowervalue = arra[i]["lowervalue"].ToString(),
stepcheckitem_desc = arra[i]["stepcheckitem_desc"].ToString(),
lm_user = username,
- lm_date = date
+ lm_date = date,
+ torg_code=wkshopcode
}
});
}
--
Gitblit v1.9.3