From 8aad6ba8e082d1fb63bfdd947f7e9da1bc133611 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 24 六月 2022 23:47:19 +0800
Subject: [PATCH] 工序定义接口开发、节拍工价接口开发
---
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 1745424..4e5559c 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -59,7 +59,7 @@
//寰幆鍐欏叆璁惧绫诲瀷琛�
for (int i = 0; i < json.Count; i++)
{
- sql = @"insert into TRoleType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
+ sql = @"insert into TEqpType(code,name,lm_user,lm_date,remark) values(@code,@name,@username,@createdate,@description)";
list.Add(new
{
str = sql,
@@ -112,8 +112,8 @@
//鍒ゆ柇璁惧绫诲瀷涓嬫槸鍚﹀叧鑱旇澶囩粍
sql = @"select * from TEqpGroup where eqptype_code=@devicetypecode and is_delete<>'1'";
dynamicParams.Add("@devicetypecode", devicetypecode);
- var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data.Count > 0)
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -125,8 +125,8 @@
//鍒ゆ柇璁惧鏈夋棤鍏宠仈璁惧绫诲瀷
sql = @"select * from TEqpInfo where eqptype_code=@devicetypecode and is_delete<>'1'";
dynamicParams.Add("@devicetypecode", devicetypecode);
- var data0 = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data0.Count > 0)
+ var data0 = DapperHelper.selectdata(sql, dynamicParams);
+ if (data0.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -288,8 +288,8 @@
//鍒ゆ柇璁惧缁勪笅鏄惁鍏宠仈璁惧
sql = @"select * from TEqpInfo where eqpgroup_code=@devicegroupcode and is_delete<>'1'";
dynamicParams.Add("@devicegroupcode", devicegroupcode);
- var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
- if (data.Count > 0)
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
{
mes.code = "300";
mes.count = 0;
@@ -382,6 +382,33 @@
}
#endregion
+ #region[鎵�灞炶溅闂存煡鎵炬墍灞炰骇绾挎帴鍙
+ public static ToMessage WorkShopSelectLine(string workshopcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ List<TreeObejct> list = new List<TreeObejct>();
+ try
+ {
+ //鑾峰彇瑙掕壊绫诲瀷闆嗗悎(鍖呭惈缁戝畾鏍囪瘑)
+ dynamicParams.Add("@workshop_code", workshopcode);
+ var data = DapperHelper.selectProcedure("h_p_T_WorkShopSelectLine", 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
+
#region [璁惧娓呭崟鏌ヨ]
public static ToMessage DeviceMangerSearch(string deviceCode, string deviceName, string status, string workShop, string deviceType, string deviceGroup, int startNum, int endNum, string prop, string order)
{
@@ -401,7 +428,7 @@
}
if (status != "" && status != null)
{
- search += "and A.status=@status ";
+ search += "and A.enable=@status ";
dynamicParams.Add("@status", status);
}
if (workShop != "" && workShop != null)
@@ -426,7 +453,7 @@
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.eqpgroup_code,G.name as eqpgroup_name,A.enable,
+ var sql = @"select A.id,A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.eqpgroup_code,G.name as eqpgroup_name,A.enable,
A.input_date,A.wksp_code,T.org_name as wksp_name,A.Line_code,L.org_name as Line_name,A.opc_uom,A.operation_ration,A.lm_user,A.lm_date
from TEqpInfo A
left join TEqpType B on A.eqptype_code=B.code
@@ -492,7 +519,7 @@
if (operType == "Update")
{
var sql = @"update TEqpInfo set name=@devicename,eqptype_code=@devicetype,eqpgroup_code=@devicegroup,input_date=@importdate,
- wksp_code=@workshop,line_code=@linecode,enable=@status,operation_ration=@ratio,lm_user=@usercode,lm_date=@CreateDate,
+ wksp_code=@workshop,line_code=@linecode,enable=@status,operation_ration=@ratio,lm_user=@usercode,lm_date=@CreateDate
where id=@deviceid";
dynamicParams.Add("@deviceid", deviceid);
dynamicParams.Add("@devicename", devicename);
--
Gitblit v1.9.3