From 777eb41b54602375bf6e7a0f26207f5fbaf27031 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:36:33 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 96a995d..21cec92 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -652,7 +652,7 @@
}
if (partcode != "" && partcode != null)
{
- search += "and A.partcode like '%'+@stanedname+'%' ";
+ search += "and A.partcode like '%'+@partcode+'%' ";
dynamicParams.Add("@partcode", partcode);
}
if (partname != "" && partname != null)
@@ -692,13 +692,13 @@
search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select 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,
+ 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
left join TMateriel_Info B on A.partcode=B.partcode
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.lm_user=U.usercode
+ left join TUser U on A.check_user=U.usercode
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
--
Gitblit v1.9.3