From ee546e514efa0951bd5b309e2d54dbe53a488c74 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 22 五月 2023 16:31:49 +0800
Subject: [PATCH] 1.app生产进度看板接口开发 2.app工序检验接口开发 3.存货档案基础资料查询接口开发 4.PC工序检验接口调整
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index e32bb19..83fd5d0 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -686,13 +686,8 @@
search += "and A.check_result=@checkresult ";
dynamicParams.Add("@checkresult", checkresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
+ var total = 0; //鎬绘潯鏁�(棣栨銆佸贰妫�銆佸畬宸ユ楠�)
var sql = @"select A.id,A.wo_code,A.partcode,B.partname,B.partspec,A.step_code,S.stepname,A.checkstaned_code,T.name as checkstaned_name,A.check_user,
A.check_type,A.check_result,A.check_descr,A.check_qty,U.username as lm_user,A.lm_date
from TStepCheckRecord A
@@ -700,7 +695,7 @@
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
- where " + search;
+ 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 = "鏌ヨ鎴愬姛!";
@@ -794,11 +789,6 @@
search += "and A.check_result=@checkresult ";
dynamicParams.Add("@checkresult", checkresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select
@@ -848,7 +838,7 @@
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
- where " + search;
+ where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
string msg = DownLoad.DataTableToExcel(data, "宸ュ簭妫�楠岃褰�");
@@ -915,20 +905,22 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select code,name,status,checktype,sampmethod,sampscare,suitobject,descr,suitpart,
- case when suitobject='P' then
+ 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,
+ case when A.suitobject='P' then
STUFF(( SELECT ';' + partname
FROM TMateriel_Info
- where PATINDEX('%;' + RTRIM(TMateriel_Info.partcode) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
+ where PATINDEX('%;' + RTRIM(TMateriel_Info.partcode) + ';%',';' + A.suitpart + ';')>0
FOR XML PATH('')), 1, 1,'')
- when suitobject='PY'
+ when A.suitobject='PY'
then
STUFF(( SELECT ';' + name
FROM T_Dict
- where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
+ where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + A.suitpart + ';')>0
FOR XML PATH('')), 1, 1,'')
end as suitpartname
- from TStepCheckStandard
+ from TStepCheckStandard A
+ left join TUser U on A.lm_user=U.usercode
+ left join TStep S on A.stepcode=S.stepcode
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -956,7 +948,7 @@
try
{
sql = @"select A.stepcheckitem_seq,A.stepcheckitem_code,B.name as stepcheckitem_name,A.required,
- A.numberjudge,A.unit,A.decimal,A.standvalue,A.uppervalue,A.lowervalue
+ A.numberjudge,A.unit,A.decimalnum,A.standvalue,A.uppervalue,A.lowervalue,A.stepcheckitem_desc
from TStepCheckStandardSub A
inner join TStepCheckItem B on A.stepcheckitem_code=B.code
where A.stepstaned_code=@qualityinsptcode";
@@ -979,7 +971,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 checkitem, string type, string username)
+ 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)
{
var sql = "";
List<object> list = new List<object>();
@@ -994,8 +986,8 @@
{
case "Add": //鏂板
//鍐欏叆璐ㄦ鏂规涓昏〃
- sql = @"insert into TStepCheckStandard(code,name,status,checktype,sampmethod,sampscare,suitobject,suitpart,descr,lm_user,lm_date)
- values(@code,@name,@status,@checktype,@sampmethod,@sampscare,@suitobject,@suitpart,@descr,@lm_user,@lm_date)";
+ 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)";
list.Add(new
{
str = sql,
@@ -1009,6 +1001,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode= stepcode,
descr = descr,
lm_user = username,
lm_date = date
@@ -1030,7 +1023,7 @@
required = arra[i]["required"].ToString(),
numberjudge = arra[i]["numberjudge"].ToString(),
unit = arra[i]["unit"].ToString(),
- decimalnum = Convert.ToInt32(arra[i]["decimalnum"].ToString()),
+ decimalnum = arra[i]["decimalnum"].ToString(),
standvalue = arra[i]["standvalue"].ToString(),
uppervalue = arra[i]["uppervalue"].ToString(),
lowervalue = arra[i]["lowervalue"].ToString(),
@@ -1043,7 +1036,7 @@
break;
case "Update"://淇敼
//鍒ゆ柇鏄惁鐢熸垚妫�楠岃褰�(鍏ュ巶妫�楠�(InCheck) 鍑哄巶妫�楠�(OutCheck) FirstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�))
- sql = @"select * from TStepCheckRecord where checkstaned_code=@qualityinsptcode and checktype=@checktype";
+ sql = @"select * from TStepCheckRecord where checkstaned_code=@qualityinsptcode and check_type=@checktype";
dynamicParams.Add("@qualityinsptcode", qualityinsptcode);
dynamicParams.Add("@checktype", checktype);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1060,7 +1053,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,descr=@descr
+ suitobject=@suitobject,suitpart=@suitpart,stepcode=@stepcode,descr=@descr
where code=@code";
list.Add(new
{
@@ -1075,6 +1068,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode = stepcode,
descr = descr,
}
});
@@ -1094,7 +1088,7 @@
required = arra[i]["required"].ToString(),
numberjudge = arra[i]["numberjudge"].ToString(),
unit = arra[i]["unit"].ToString(),
- decimalnum = Convert.ToInt32(arra[i]["decimalnum"].ToString()),
+ decimalnum = arra[i]["decimalnum"].ToString(),
standvalue = arra[i]["standvalue"].ToString(),
uppervalue = arra[i]["uppervalue"].ToString(),
lowervalue = arra[i]["lowervalue"].ToString(),
--
Gitblit v1.9.3