From 59d429fd2caa1ecb879abfd21e9be17d42a39ee0 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 22 九月 2022 17:38:22 +0800
Subject: [PATCH] 点检记录导出接口报错优化、不良明细查询接口优化 安灯系统PC端接口开发
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 250 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 244 insertions(+), 6 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 4dd4d7c..7f77c18 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -1,4 +1,5 @@
锘縰sing Dapper;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
@@ -21,7 +22,7 @@
#region[鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
- public static ToMessage ScanDeviceQrCodeData(string eqpcode)
+ public static ToMessage CheckScanDeviceQrCodeData(string eqpcode)
{
string sql = "";
var dynamicParams = new DynamicParameters();
@@ -44,7 +45,7 @@
else
{
mes.code = "300";
- mes.Message = "褰撳墠璁惧寮傚父!";
+ mes.Message = "褰撳墠璁惧/宸ヤ綅涓嶅瓨鍦ㄦ垨寮傚父!";
mes.data = data;
}
}
@@ -67,7 +68,7 @@
try
{
//鑾峰彇瀵瑰簲璁惧鍏宠仈鐨勭偣妫�椤圭洰
- sql = @"select S.seq,S.code,S.name,chkdesc,isscan,cycle
+ sql = @"select S.seq,S.code,S.name,S.chkdesc,S.isscan,S.cycle
from TEqpchk_Eqp A
inner join TEqpchk_Main B on A.eqpchkmain_code=B.code
inner join TEqpchk_Deta S on B.code=S.eqpchk_main_code
@@ -103,19 +104,21 @@
public static ToMessage AppDeviceCheckSave(string username, AppDevicecCheck json)
{
var sql = "";
- string djwo = "";
+ string djwo = "",numvalue="";
List<object> list = new List<object>();
try
{
list.Clear();
- mes = SeachEncode.EncodingSeach("1036"); //鐢熸垚鍗曞彿
+ mes = SeachEncode.EncodingSeach("1027"); //鐢熸垚鍗曞彿
if (mes.code == "300")
{
return mes;
}
else
{
- djwo = mes.data.GetType().GetProperty("Encode").GetValue(mes.data, null).ToString(); //鑾峰彇鍗曞彿
+ List<string> wo = (List<string>)mes.data;
+ djwo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue= wo[1].ToString(); //鑾峰彇娴佹按鍙�
}
if (json == null || json.children.Count <= 0)
{
@@ -161,6 +164,9 @@
}
}); ;
}
+ //鍥炲啓瀛楀吀琛�,鏇存柊褰撳墠娴佹按鍙�
+ sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
+ list.Add(new { str = sql, parm = new { cunm2 = numvalue, RightCode = "1027" } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -188,5 +194,237 @@
return mes;
}
#endregion
+
+
+
+ #region[瀹氭湡淇濆吇,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage RepairScanDeviceQrCodeData(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍙婃墍灞炶溅闂�
+ sql = @"select A.code,A.name,T.org_code as wksp_code,T.org_name as wksp_name,
+ E.eapmai_code,M.name as eapmai_name,M.main_cycle
+ from TEqpInfo A
+ left join TOrganization T on A.wksp_code=T.org_code
+ left join TEqpmai_Eqp E on A.code=E.eqp_code
+ left join TEqpmai_Main M on E.eapmai_code=M.code
+ where A.code=@eqpcode and A.enable='Y' and T.description='W'";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 RepairSelectScanDeviceQrCodeItem(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍏宠仈鐨勪繚鍏婚」鐩�
+ sql = @"select S.seq,S.code,S.name,S.chk_desc,S.isscan,B.main_cycle
+ from TEqpmai_Eqp A
+ inner join TEqpmai_Main B on A.eapmai_code=B.code
+ inner join TEqpmai_Deta S on B.code=S.eapmai_code
+ where A.eqp_code=@eqpcode
+ order by S.seq asc";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 AppDeviceRepairSave(string username,string maintcyc, AppDevicecCheck json)
+ {
+ var sql = "";
+ string bywo = "", numvalue = "";
+ List<object> list = new List<object>();
+ try
+ {
+ list.Clear();
+ mes = SeachEncode.EncodingSeach("1028"); //鐢熸垚鍗曞彿
+ if (mes.code == "300")
+ {
+ return mes;
+ }
+ else
+ {
+ List<string> wo = (List<string>)mes.data;
+ bywo = wo[0].ToString(); //鑾峰彇鍗曞彿
+ numvalue = wo[1].ToString(); //鑾峰彇娴佹按鍙�
+ }
+ if (json == null || json.children.Count <= 0)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇濆吇椤逛俊鎭笉鑳戒负绌�!";
+ mes.data = null;
+ return mes;
+ }
+
+ //鍐欏叆淇濆吇璁板綍涓昏〃
+ sql = @"insert into TEqpmaint_Proc_Main(bywo,eqp_code,eqpmaint_code,maint_cyc,maint_result,maint_user,maint_date)
+ values(@bywo,@eqp_code,@eqpmaint_code,@maintcyc,@maint_result,@lm_user,@lm_date)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ bywo = bywo,
+ eqp_code = json.code,
+ eqpmaint_code = json.standcode,
+ maintcyc= maintcyc,
+ lm_user = username,
+ lm_date = DateTime.Now.ToString(),
+ maint_result = json.result
+ }
+ });
+ //寰幆鍐欏叆淇濆吇璁板綍瀛愯〃
+ for (int i = 0; i < json.children.Count; i++)
+ {
+ sql = @"insert into TEqpmaint_Proc_Deta(seq,bywo,eqpmaideta_code,result,maint_cyc,maint_value)
+ values(@seq,@bywo,@eqpmaideta_code,@maint_cyc,@result,@maint_value)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ seq = json.children[i].seq,
+ bywo = bywo,
+ eqpmaideta_code = json.children[i].itemcode,
+ maint_cyc = json.children[i].cycle,
+ result = json.children[i].result,
+ maint_value = json.children[i].value
+ }
+ }); ;
+ }
+ //鍥炲啓瀛楀吀琛�,鏇存柊褰撳墠娴佹按鍙�
+ sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
+ list.Add(new { str = sql, parm = new { cunm2 = numvalue, RightCode = "1028" } });
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "淇濆吇鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "淇濆吇澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+
+ #region[璁惧缁翠慨,鎵弿宸ヤ綅/璁惧浜岀淮鐮乚
+ public static ToMessage MaintainScanDeviceQrCodeData(string eqpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇瀵瑰簲璁惧鍙婃墍灞炶溅闂�
+ sql = @"select A.code,A.name,T.org_code as wksp_code,T.org_name as wksp_name,E.eqpchkmain_code
+ from TEqpInfo A
+ left join TOrganization T on A.wksp_code=T.org_code
+ left join TEqpchk_Eqp E on A.code=E.eqp_code
+ where A.code=@eqpcode and A.enable='Y' and T.description='W'";
+ dynamicParams.Add("@eqpcode", eqpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ else
+ {
+ mes.code = "300";
+ 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 AppDeviceAnDengCallSave(string eqpcode)
+ {
+ throw new NotImplementedException();
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3