From e8eed61d8b70215766a4e5c226e10d2f0d28ff95 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:31:40 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if 4.节拍工价根据工序线编码查找关联设备集合 5.PC/APP工资报表
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index e32bb19..5dac0f0 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -915,20 +915,21 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
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.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
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -956,7 +957,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";
@@ -1030,7 +1031,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 +1044,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);
@@ -1094,7 +1095,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