From 7b6a3fab34e4867f011246248ae66b4d75a6eb72 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 01 六月 2023 20:49:58 +0800
Subject: [PATCH] 1.生产开包工末道工序传入入库条码 2.App工序检验提交接口修改 3.基本资料增加ERP接口：车间部门、仓库查询、用户信息 4.PC端报工、收料、工序检验提交接口增加入库条码字段 5.系统设置新增：条码规则生成(固定条码)接口 6.DapperHelper增加方法 7.增加App图标图片
---
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 106 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 41 deletions(-)
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 788f8bc..bf3e19e 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -720,16 +720,35 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select A.checkitem_seq,A.checkitem_code,A.checkitem_name,A.checkitem_descr,A.check_result,U.username as lm_user,A.lm_date
- from TStepCheckRecordSub A
- left join TUser U on A.lm_user=U.usercode
- where A.m_id=@id";
- dynamicParams.Add("@id", id);
- var data = DapperHelper.selectdata(sql, dynamicParams);
+ //sql = @"select A.checkitem_seq,A.checkitem_code,A.checkitem_name,A.checkitem_descr,A.check_result,U.username as lm_user,A.lm_date
+ // from TStepCheckRecordSub A
+ // left join TUser U on A.lm_user=U.usercode
+ // where A.m_id=@id";
+ //dynamicParams.Add("@id", id);
+ //var data = DapperHelper.selectdata(sql, dynamicParams);
- mes.code = "200";
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
+ //mes.code = "200";
+ //mes.Message = "鏌ヨ鎴愬姛!";
+ //mes.data = data;
+
+ //瀛樺偍杩囩▼鍚�
+ sql = @"h_p_IFCLD_WuLiuCheckSubSelect";
+ dynamicParams.Add("@checkid", id);
+ DataTable dt = DapperHelper.selectProcedure(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dt;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "鏃犳楠屾槑缁嗘暟鎹�!";
+ mes.data = null;
+ }
}
catch (Exception e)
{
@@ -793,50 +812,52 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select
CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.wo_code ORDER BY B.checkitem_code) = 1 THEN A.wo_code
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.wo_code
ELSE ''END AS '宸ュ崟鍙�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partcode
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partcode
ELSE ''END AS '浜у搧缂栫爜',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partname
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partname
ELSE ''END AS '浜у搧鍚嶇О',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.partcode ORDER BY B.checkitem_code) = 1 THEN M.partspec
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN M.partspec
ELSE ''END AS '瑙勬牸鍨嬪彿',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.step_code ORDER BY B.checkitem_code) = 1 THEN S.stepname
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN S.stepname
ELSE ''END AS '宸ュ簭鍚嶇О',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.checkstaned_code ORDER BY B.checkitem_code) = 1 THEN A.checkstaned_code
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.checkstaned_code
ELSE ''END AS '鏍囧噯缂栫爜',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.checkstaned_code ORDER BY B.checkitem_code) = 1 THEN T.name
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN T.name
ELSE ''END AS '鏍囧噯鍚嶇О',
CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.check_user ORDER BY B.checkitem_code) = 1 THEN U.username
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN U.username
ELSE ''END AS '妫�楠屼汉鍛�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.check_typename ORDER BY B.checkitem_code) = 1 THEN A.check_typename
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_typename
ELSE ''END AS '妫�楠岀被鍨�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.check_result ORDER BY B.checkitem_code) = 1 THEN A.check_result
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_result
ELSE ''END AS '妫�楠岀粨鏋�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.check_descr ORDER BY B.checkitem_code) = 1 THEN A.check_descr
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_descr
ELSE ''END AS '妫�楠屾弿杩�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.check_qty ORDER BY B.checkitem_code) = 1 THEN A.check_qty
- END AS '妫�楠屾暟閲�',
- CASE WHEN
- ROW_NUMBER() OVER (PARTITION BY A.lm_date ORDER BY B.checkitem_code) = 1 THEN A.lm_date
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.check_qty
+ END AS '鏍锋湰鏁伴噺',
+ CASE WHEN
+ ROW_NUMBER() OVER (PARTITION BY A.id ORDER BY B.id) = 1 THEN A.lm_date
END AS '妫�楠屾椂闂�',
- B.checkitem_seq as '妫�楠岄」鐩簭鍙�',B.checkitem_code '妫�楠岄」鐩紪鐮�',B.checkitem_name '妫�楠岄」鐩悕绉�',B.checkitem_descr '妫�楠岄」鐩弿杩�',B.check_result '妫�楠岄」鐩粨鏋�'
+ B.checknum as 妫�楠屼欢娆�,B.checkitem_seq as '妫�楠岄」鐩簭鍙�',B.checkitem_code '妫�楠岄」鐩紪鐮�',B.checkitem_name '妫�楠岄」鐩悕绉�',B.checkitem_descr '妫�楠岄」鐩弿杩�',B.check_result '妫�楠岄」鐩粨鏋�',
+ C.standvalue as '鏍囧噯鍊�',C.uppervalue as '涓婇檺鍊�',C.lowervalue as '涓嬮檺鍊�',B.check_value as '瀹炴祴鍊�'
from TStepCheckRecord A
left join TStepCheckRecordSub B on A.id=B.m_id
left join TMateriel_Info M on A.partcode=M.partcode
left join TStep S on A.step_code=S.stepcode
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
where A.check_type in('FirstCheck','PatroCheck','EndCheck') " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
@@ -905,7 +926,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 +940,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 +992,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 +1007,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 +1022,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode= stepcode,
descr = descr,
lm_user = username,
lm_date = date
@@ -1051,7 +1074,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 +1089,7 @@
sampscare = sampscare,
suitobject = suitobject,
suitpart = suitpart,
+ stepcode = stepcode,
descr = descr,
}
});
--
Gitblit v1.9.3