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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 788f8bc..83fd5d0 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -905,7 +905,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.code,A.name,A.status,A.checktype,A.sampmethod,A.sampscare,A.suitobject,A.descr,A.suitpart,A.lm_date,U.username,
+ 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
@@ -919,7 +919,8 @@
FOR XML PATH('')), 1, 1,'')
end as suitpartname
from TStepCheckStandard A
- left join TUser U on A.lm_user=U.usercode
+ 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);
@@ -970,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>();
@@ -985,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,
@@ -1000,6 +1001,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode= stepcode,
descr = descr,
lm_user = username,
lm_date = date
@@ -1051,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
{
@@ -1066,6 +1068,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode = stepcode,
descr = descr,
}
});
--
Gitblit v1.9.3