From e3e68c2fc02f2ada02254f1167056278cd570f5c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 21 二月 2023 18:30:47 +0800
Subject: [PATCH] 1.工艺路线删除判断工艺路路线是否被存货绑定 2.新增质检方案列表查询、列表查看编辑带回接口
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/DLL/DAL/ProductModelDAL.cs | 12 +++
VueWebApi/DLL/BLL/QualityManagementBLL.cs | 15 +++
VueWebApi/Controllers/QualityManagementController.cs | 45 ++++++++++
VueWebApi/Logs/2023-02-16.TXT | 0
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/DLL/DAL/QualityManagementDAL.cs | 110 +++++++++++++++++++++++++++
10 files changed, 180 insertions(+), 3 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 5913b5c..d816cfd 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/QualityManagementController.cs b/VueWebApi/Controllers/QualityManagementController.cs
index 9f77797..15a7e4a 100644
--- a/VueWebApi/Controllers/QualityManagementController.cs
+++ b/VueWebApi/Controllers/QualityManagementController.cs
@@ -166,7 +166,6 @@
}
#endregion
-
#region[宸ュ簭妫�楠岄」鐩垪琛ㄦ煡璇
@@ -226,8 +225,6 @@
return TJson.toJson(mes);
}
#endregion
-
-
#region[宸ュ簭妫�楠岃褰曞垪琛ㄦ煡璇
@@ -296,5 +293,47 @@
return TJson.toJson(mes);
}
#endregion
+
+
+ #region[璐ㄦ鏂规鍒楄〃鏌ヨ]
+ /// <summary>
+ /// 璐ㄦ鏂规鍒楄〃鏌ヨ
+ /// </summary>
+ /// <param name="qualityinsptcode">璐ㄦ鏂规缂栫爜</param>
+ /// <param name="qualityinsptname">璐ㄦ鏂规鍚嶇О</param>
+ /// <param name="status">鏈夋晥鐘舵��</param>
+ /// <param name="checktype">璐ㄦ绫诲瀷</param>
+ /// <param name="sampltype">鎶芥牱鏂瑰紡</param>
+ /// <param name="suitobject">閫傜敤瀵硅薄</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "QualityInspectionSearch")]
+ [HttpGet]
+ public HttpResponseMessage QualityInspectionSearch(string qualityinsptcode = null, string qualityinsptname = null, string status=null, string checktype=null,string sampltype=null,string suitobject = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = QualityManagementBLL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[璐ㄦ鏂规鏌ョ湅缂栬緫]
+ /// <summary>
+ /// 璐ㄦ鏂规鏌ョ湅缂栬緫
+ /// </summary>
+ /// <param name="qualityinsptcode">璐ㄦ鏂规缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "QualityInspectionSeeEdit")]
+ [HttpGet]
+ public HttpResponseMessage QualityInspectionSeeEdit(string qualityinsptcode)
+ {
+ mes = QualityManagementBLL.QualityInspectionSeeEdit(qualityinsptcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
diff --git a/VueWebApi/DLL/BLL/QualityManagementBLL.cs b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
index 12052bf..f1c2c14 100644
--- a/VueWebApi/DLL/BLL/QualityManagementBLL.cs
+++ b/VueWebApi/DLL/BLL/QualityManagementBLL.cs
@@ -114,5 +114,20 @@
return QualityManagementDAL.StepCheckTableOutExcel(wocode, partcode, partname, partapec, stepname, standname, checktype, checkresult, prop, order);
}
#endregion
+
+
+ #region[璐ㄦ鏂规鍒楄〃鏌ヨ]
+ public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
+ {
+ return QualityManagementDAL.QualityInspectionSearch(qualityinsptcode, qualityinsptname, status, checktype, sampltype, suitobject, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[璐ㄦ鏂规鏌ョ湅缂栬緫]
+ public static ToMessage QualityInspectionSeeEdit(string qualityinsptcode)
+ {
+ return QualityManagementDAL.QualityInspectionSeeEdit(qualityinsptcode);
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 5517515..9674f59 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -1339,6 +1339,18 @@
var dynamicParams = new DynamicParameters();
try
{
+ //鍒ゆ柇宸ヨ壓璺矾绾挎槸鍚﹁瀛樿揣缁戝畾
+ sql = @"select * from TMateriel_Route where route_code=@routecode";
+ dynamicParams.Add("@routecode", routecode);
+ var data_0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data_0.Rows.Count > 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "瀛樿揣妗ｆ宸插叧鑱斿伐鑹鸿矾绾匡紝涓嶅厑璁稿垹闄�!";
+ mes.data = null;
+ return mes;
+ }
//鍒ゆ柇宸ヨ壓璺嚎鏄惁琚伐鍗曞紩鐢�(琚紩鐢ㄥ垯涓嶈兘鍒犻櫎)
sql = @"select * from TK_Wrk_Man where route_code=@routecode";
dynamicParams.Add("@routecode", routecode);
diff --git a/VueWebApi/DLL/DAL/QualityManagementDAL.cs b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
index 21cec92..a88f0cd 100644
--- a/VueWebApi/DLL/DAL/QualityManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/QualityManagementDAL.cs
@@ -866,5 +866,115 @@
return mes;
}
#endregion
+
+
+
+ #region[璐ㄦ鏂规鍒楄〃鏌ヨ]
+ public static ToMessage QualityInspectionSearch(string qualityinsptcode, string qualityinsptname, string status, string checktype, string sampltype,string suitobject, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (qualityinsptcode != "" && qualityinsptcode != null)
+ {
+ search += "and AA.code like '%'+@qualityinsptcode+'%' ";
+ dynamicParams.Add("@qualityinsptcode", qualityinsptcode);
+ }
+ if (qualityinsptname != "" && qualityinsptname != null)
+ {
+ search += "and AA.name like '%'+@qualityinsptname+'%' ";
+ dynamicParams.Add("@qualityinsptname", qualityinsptname);
+ }
+ if (status != "" && status != null)
+ {
+ search += "and AA.status=@status ";
+ dynamicParams.Add("@status", status);
+ }
+ if (checktype != "" && checktype != null)
+ {
+ search += "and AA.checktype=@checktype ";
+ dynamicParams.Add("@checktype", checktype);
+ }
+ if (sampltype != "" && sampltype != null)
+ {
+ search += "and AA.sampmethod=@sampltype ";
+ dynamicParams.Add("@sampltype", sampltype);
+ }
+ if (suitobject != "" && suitobject != null)
+ {
+ search += "and AA.suitobject=@suitobject ";
+ dynamicParams.Add("@suitobject", suitobject);
+ }
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select * from(
+ select code,name,status,checktype,sampmethod,sampscare,suitobject,descr,suitpart,
+ case when suitobject='P' then
+ STUFF(( SELECT ';' + partname
+ FROM TMateriel_Info
+ where PATINDEX('%;' + RTRIM(TMateriel_Info.partcode) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
+ FOR XML PATH('')), 1, 1,'')
+ when suitobject='PY'
+ then
+ STUFF(( SELECT ';' + name
+ FROM T_Dict
+ where PATINDEX('%;' + RTRIM(T_Dict.code) + ';%',';' + TStepCheckStandard.suitpart + ';')>0
+ FOR XML PATH('')), 1, 1,'')
+ end as suitpartname
+ from TStepCheckStandard
+ ) as AA
+ where " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[璐ㄦ鏂规鏌ョ湅缂栬緫]
+ public static ToMessage QualityInspectionSeeEdit(string qualityinsptcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ 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
+ from TStepCheckStandardSub A
+ inner join TStepCheckItem B on A.stepcheckitem_code=B.code
+ where A.stepstaned_code=@qualityinsptcode";
+ dynamicParams.Add("@qualityinsptcode", qualityinsptcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/VueWebApi/Logs/2023-02-16.TXT b/VueWebApi/Logs/2023-02-16.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2023-02-16.TXT
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 5ee50d6..44af3e2 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index b921405..a75cfd6 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -568,3 +568,4 @@
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
+D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 5ee50d6..44af3e2 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3