From 8945ac4b1c0a1f5e040a5c75e6ae630ba2b32f99 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 13 九月 2022 20:23:55 +0800
Subject: [PATCH] App设备点检获取单号修改接口， 开发委外表表 开发班组工资报表查询接口
---
VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache | 2
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Logs/2022-09-12.TXT | 0
VueWebApi/DLL/DAL/SystemSettingDAL.cs | 2
VueWebApi/Controllers/ReportManagerController.cs | 124 +++++++++++
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1
VueWebApi/Controllers/SendController.cs | 2
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 10
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Tools/SeachEncode.cs | 12
VueWebApi/bin/VueWebApi.xml | 85 +++++++
VueWebApi/Logs/2022-09-11.TXT | 0
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/VueWebApi.csproj | 3
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/DLL/BLL/ReportManagerBLL.cs | 34 +++
VueWebApi/Logs/2022-09-13.TXT | 0
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 9
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 35 +++
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 307 +++++++++++++++++++++++++++
VueWebApi/bin/VueWebApi.pdb | 0
21 files changed, 610 insertions(+), 16 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 2b5277d..dad0ed1 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/ReportManagerController.cs b/VueWebApi/Controllers/ReportManagerController.cs
new file mode 100644
index 0000000..8be455e
--- /dev/null
+++ b/VueWebApi/Controllers/ReportManagerController.cs
@@ -0,0 +1,124 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using VueWebApi.DLL.BLL;
+using VueWebApi.Tools;
+
+namespace VueWebApi.Controllers
+{
+ [RoutePrefix(prefix: "api/ReportManager")]
+ [ControllerGroup("鎶ヨ〃绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ [ChannelActionFilter]
+ public class ReportManagerController : ApiController
+ {
+ //瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
+ ToMessage mes = new ToMessage();
+ RedisHelper redis = new RedisHelper();
+
+
+ #region[濮斿鎶ヨ〃璁板綍鏌ヨ]
+ /// <summary>
+ /// 濮斿鎶ヨ〃璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stepname">宸ュ簭鍚嶇О</param>
+ /// <param name="suppername">渚涙柟鍚嶇О</param>
+ /// <param name="type">鎿嶄綔绫诲瀷</param>
+ /// <param name="receivdate">鏀舵枡鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "OutSourceReportSearch")]
+ [HttpGet]
+ public HttpResponseMessage OutSourceReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null,string receivdate=null)
+ {
+ string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
+ string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
+ if (receivdate != "" && receivdate != null)
+ {
+ receivopendate = receivdate.Split('~')[0].ToString();
+ receivclosedate = receivdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ReportManagerBLL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
+ /// <summary>
+ /// 濮斿鎶ヨ〃璁板綍瀵煎嚭
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stepname">宸ュ簭鍚嶇О</param>
+ /// <param name="suppername">渚涙柟鍚嶇О</param>
+ /// <param name="type">鎿嶄綔绫诲瀷</param>
+ /// <param name="receivdate">鏀舵枡鏃堕棿</param>
+ /// <returns></returns>
+ [Route(template: "OutSourceReportExcelSearch")]
+ [HttpGet]
+ public HttpResponseMessage OutSourceReportExcelSearch(string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string suppername = null, string type = null, string receivdate = null)
+ {
+ string receivopendate = ""; //鏀舵枡寮�濮嬫椂闂�
+ string receivclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
+ if (receivdate != "" && receivdate != null)
+ {
+ receivopendate = receivdate.Split('~')[0].ToString();
+ receivclosedate = receivdate.Split('~')[1].ToString();
+ }
+ mes = ReportManagerBLL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+
+
+ #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
+ /// <summary>
+ /// 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">瑙勬牸鍨嬪彿</param>
+ /// <param name="stepname">宸ュ簭鍚嶇О</param>
+ /// <param name="groupcode">鐢熶骇鐝粍</param>
+ /// <param name="username">鎿嶄綔浜哄憳</param>
+ /// <param name="operdate">鎿嶄綔鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <returns></returns>
+ [Route(template: "GroupSalaryReportSearch")]
+ [HttpGet]
+ public HttpResponseMessage GroupSalaryReportSearch(int page, int rows, string prop, string order, string wocode = null, string partcode = null, string partname = null, string partspec = null, string stepname = null, string groupcode = null, string username = null, string operdate = null)
+ {
+ string operopendate = ""; //鏀舵枡寮�濮嬫椂闂�
+ string operclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
+ if (operdate != "" && operdate != null)
+ {
+ operopendate = operdate.Split('~')[0].ToString();
+ operclosedate = operdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = ReportManagerBLL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ }
+}
diff --git a/VueWebApi/Controllers/SendController.cs b/VueWebApi/Controllers/SendController.cs
index e251966..21cc605 100644
--- a/VueWebApi/Controllers/SendController.cs
+++ b/VueWebApi/Controllers/SendController.cs
@@ -22,7 +22,7 @@
[HttpGet]
public async Task SendMsg(string msg)
{
- await webSocket.ConnectAsync(new Uri("ws://localhost:8001"), _cancellation);
+ await webSocket.ConnectAsync(new Uri("ws://localhost:8001"), CancellationToken.None);
var sendBytes = Encoding.UTF8.GetBytes(msg);//鍙戦�佺殑鏁版嵁
var bsend = new ArraySegment<byte>(sendBytes);
await webSocket.SendAsync(bsend, WebSocketMessageType.Binary, true, _cancellation);
diff --git a/VueWebApi/DLL/BLL/ReportManagerBLL.cs b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
new file mode 100644
index 0000000..90989d1
--- /dev/null
+++ b/VueWebApi/DLL/BLL/ReportManagerBLL.cs
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using VueWebApi.DLL.DAL;
+using VueWebApi.Tools;
+
+namespace VueWebApi.DLL.BLL
+{
+ public class ReportManagerBLL
+ {
+ #region[濮斿鎶ヨ〃璁板綍鏌ヨ]
+ public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ {
+ return ReportManagerDAL.OutSourceReportSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate, startNum, endNum, prop, order);
+ }
+ #endregion
+
+ #region[濮斿鎶ヨ〃璁板綍瀵煎嚭]
+ public static ToMessage OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ {
+ return ReportManagerDAL.OutSourceReportExcelSearch(wocode, partcode, partname, partspec, stepname, suppername, type, receivopendate, receivclosedate);
+ }
+ #endregion
+
+
+ #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
+ public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ {
+ return ReportManagerDAL.GroupSalaryReportSearch(wocode, partcode, partname, partspec, stepname, groupcode, username, operopendate, operclosedate, startNum, endNum, prop, order);
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index cd32133..244af37 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;
@@ -108,14 +109,16 @@
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(); //鑾峰彇鍗曞彿
+
}
if (json == null || json.children.Count <= 0)
{
@@ -281,7 +284,7 @@
try
{
list.Clear();
- mes = SeachEncode.EncodingSeach("1037"); //鐢熸垚鍗曞彿
+ mes = SeachEncode.EncodingSeach("1028"); //鐢熸垚鍗曞彿
if (mes.code == "300")
{
return mes;
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
new file mode 100644
index 0000000..e735e3d
--- /dev/null
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -0,0 +1,307 @@
+锘縰sing Dapper;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using VueWebApi.Tools;
+
+namespace VueWebApi.DLL.DAL
+{
+ public class ReportManagerDAL
+ {
+ public static DataTable dt; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static bool res; //瀹氫箟鍏ㄥ眬鍙橀噺dt
+ public static ToMessage mes = new ToMessage(); //瀹氫箟鍏ㄥ眬杩斿洖淇℃伅瀵硅薄
+ public static string strProcName = ""; //瀹氫箟鍏ㄥ眬sql鍙橀噺
+ public static List<SqlParameter> listStr = new List<SqlParameter>(); //瀹氫箟鍏ㄥ眬鍙傛暟闆嗗悎
+ public static SqlParameter[] parameters; //瀹氫箟鍏ㄥ眬SqlParameter鍙傛暟鏁扮粍
+
+
+ #region[濮斿鎶ヨ〃璁板綍鏌ヨ]
+ public static ToMessage OutSourceReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wocode != "" && wocode != null)
+ {
+ search += "and A.wo_code like '%'+@wocode+'%' ";
+ dynamicParams.Add("@wocode", wocode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and M.partcode like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and M.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and M.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (stepname != "" && stepname != null)
+ {
+ search += "and S.stepname like '%'+@stepname+'%' ";
+ dynamicParams.Add("@stepname", stepname);
+ }
+ if (suppername != "" && suppername != null)
+ {
+ search += "and C.name like '%'+@suppername+'%' ";
+ dynamicParams.Add("@suppername", suppername);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.style=@type ";
+ dynamicParams.Add("@type", type);
+ switch (type)
+ {
+ case "F": //鍙戞枡
+ if (receivopendate != "" && receivopendate != null)
+ {
+ search += "and B.out_time between @receivopendate and @receivclosedate ";
+ dynamicParams.Add("@receivopendate", receivopendate + " 00:00:00");
+ dynamicParams.Add("@receivclosedate", receivclosedate + " 23:59:59");
+ }
+ break;
+ case "S": //鏀舵枡
+ if (receivopendate != "" && receivopendate != null)
+ {
+ search += "and B.in_time between @receivopendate and @receivclosedate ";
+ dynamicParams.Add("@receivopendate", receivopendate + " 00:00:00");
+ dynamicParams.Add("@receivclosedate", receivclosedate + " 23:59:59");
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.wo_code,M.partcode,M.partname,M.partspec,S.stepcode,S.stepname,C.code,C.name,(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as style,
+ A.fqty,A.sqty,A.ng_qty,A.bad_qty,U.username as out_person,B.out_time,T.username as in_person,B.in_time
+ from TK_Wrk_OutRecord A
+ inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
+ left join TMateriel_Info M on A.materiel_code=M.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TCustomer C on A.wx_code=C.code
+ left join TUser U on B.out_person=U.usercode
+ left join TUser T on B.in_person=T.usercode
+ 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 OutSourceReportExcelSearch(string wocode, string partcode, string partname, string partspec, string stepname, string suppername, string type, string receivopendate, string receivclosedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wocode != "" && wocode != null)
+ {
+ search += "and A.wo_code like '%'+@wocode+'%' ";
+ dynamicParams.Add("@wocode", wocode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and M.partcode like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and M.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and M.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (stepname != "" && stepname != null)
+ {
+ search += "and S.stepname like '%'+@stepname+'%' ";
+ dynamicParams.Add("@stepname", stepname);
+ }
+ if (suppername != "" && suppername != null)
+ {
+ search += "and C.name like '%'+@suppername+'%' ";
+ dynamicParams.Add("@suppername", suppername);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.style=@type ";
+ dynamicParams.Add("@type", type);
+ switch (type)
+ {
+ case "F": //鍙戞枡
+ if (receivopendate != "" && receivopendate != null)
+ {
+ search += "and B.out_time between @receivopendate and @receivclosedate ";
+ dynamicParams.Add("@receivopendate", receivopendate + " 00:00:00");
+ dynamicParams.Add("@receivclosedate", receivclosedate + " 23:59:59");
+ }
+ break;
+ case "S": //鏀舵枡
+ if (receivopendate != "" && receivopendate != null)
+ {
+ search += "and B.in_time between @receivopendate and @receivclosedate ";
+ dynamicParams.Add("@receivopendate", receivopendate + " 00:00:00");
+ dynamicParams.Add("@receivclosedate", receivclosedate + " 23:59:59");
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.wo_code as '宸ュ崟缂栧彿',M.partcode as '浜у搧缂栫爜',M.partname as '浜у搧鍚嶇О',M.partspec as '浜у搧瑙勬牸',S.stepcode as '宸ュ簭缂栫爜',S.stepname as '宸ュ簭鍚嶇О',
+ C.code as '澶栧崗渚涙柟缂栫爜',C.name as '澶栧崗渚涙柟鍚嶇О',(case when A.style='F' then '鍙戞枡' when A.style='S' then '鏀舵枡' end) as '鎿嶄綔绫诲瀷',
+ A.fqty as '鍙戞枡鏁伴噺',A.sqty as '鏀舵枡鏁伴噺',A.ng_qty as '涓嶈壇鏁伴噺',A.bad_qty as '鎶ュ簾鏁伴噺',U.username as '鍙戞枡浜哄憳',B.out_time as '鍙戞枡鏃堕棿',
+ T.username as '鏀舵枡浜哄憳',B.in_time as '鏀舵枡鏃堕棿'
+ from TK_Wrk_OutRecord A
+ inner join TK_Wrk_OutRecordSub B on A.id=B.m_id
+ left join TMateriel_Info M on A.materiel_code=M.partcode
+ left join TStep S on A.step_code=S.stepcode
+ left join TCustomer C on A.wx_code=C.code
+ left join TUser U on B.out_person=U.usercode
+ left join TUser T on B.in_person=T.usercode
+ where " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "濮斿鎶ュ伐璁板綍");
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ]
+ public static ToMessage GroupSalaryReportSearch(string wocode, string partcode, string partname, string partspec, string stepname, string groupcode, string username, string operopendate, string operclosedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (wocode != "" && wocode != null)
+ {
+ search += "and A.wo_code like '%'+@wocode+'%' ";
+ dynamicParams.Add("@wocode", wocode);
+ }
+ if (partcode != "" && partcode != null)
+ {
+ search += "and M.partcode like '%'+@partcode+'%' ";
+ dynamicParams.Add("@partcode", partcode);
+ }
+ if (partname != "" && partname != null)
+ {
+ search += "and M.partname like '%'+@partname+'%' ";
+ dynamicParams.Add("@partname", partname);
+ }
+ if (partspec != "" && partspec != null)
+ {
+ search += "and M.partspec like '%'+@partspec+'%' ";
+ dynamicParams.Add("@partspec", partspec);
+ }
+ if (stepname != "" && stepname != null)
+ {
+ search += "and T.stepname like '%'+@stepname+'%' ";
+ dynamicParams.Add("@stepname", stepname);
+ }
+ if (groupcode != "" && groupcode != null)
+ {
+ search += "and G.group_code=@groupcode ";
+ dynamicParams.Add("@groupcode", groupcode);
+ }
+ if (username != "" && username != null)
+ {
+ search += "and U.username like '%'+@username+'%' ";
+ dynamicParams.Add("@username", username);
+ }
+ if (operopendate != "" && operopendate != null)
+ {
+ search += "and A.lm_date between @operopendate and @operclosedate ";
+ dynamicParams.Add("@operopendate", operopendate + " 00:00:00");
+ dynamicParams.Add("@operclosedate", operclosedate + " 23:59:59");
+ }
+
+ if (search == "")
+ {
+ search = "and 1=1 ";
+ }
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,A.task_qty,G.group_code,G.group_name,A.good_qty,isnull(S.unprice,0) as unprice,U.username as lm_user,A.lm_date
+ from TK_Wrk_Record A
+ inner join TK_Wrk_RecordSub B on A.id=B.m_id
+ inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code and P.isend='Y'
+ left join TK_Wrk_Man K on A.wo_code=K.wo_code
+ left join TGroup G on B.usergroup_code=G.group_code
+ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ left join TMateriel_Info M on A.materiel_code=M.partcode
+ left join TStep T on A.step_code=T.stepcode
+ left join TUser U on A.lm_user=U.usercode
+ 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
+ }
+}
\ No newline at end of file
diff --git a/VueWebApi/DLL/DAL/SystemSettingDAL.cs b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
index fcfc9c9..98c0291 100644
--- a/VueWebApi/DLL/DAL/SystemSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/SystemSettingDAL.cs
@@ -45,7 +45,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select A.right_code,A.right_name,B.prefix,B.filingdate,B.incbit from TRight A
left join T_CodeRules B on A.right_code=B.rightcode
- where A.Type='PC' and A.parent_id<>'0' and A.is_delete<>'1' " + search + "";
+ where A.parent_id<>'0' and A.is_delete<>'1' " + search + "";
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
diff --git a/VueWebApi/Logs/2022-09-11.TXT b/VueWebApi/Logs/2022-09-11.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-11.TXT
diff --git a/VueWebApi/Logs/2022-09-12.TXT b/VueWebApi/Logs/2022-09-12.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-12.TXT
diff --git a/VueWebApi/Logs/2022-09-13.TXT b/VueWebApi/Logs/2022-09-13.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-09-13.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index fe3e137..52fd5d8 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\XKDMesApi</_PublishTargetUrl>
- <History>True|2022-09-09T07:21:48.4251654Z;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
+ <History>True|2022-09-12T05:07:40.5119225Z;True|2022-09-09T15:21:48.4251654+08:00;True|2022-09-09T14:45:54.9315147+08:00;True|2022-09-09T11:01:18.2619729+08:00;True|2022-09-09T09:35:40.9779148+08:00;True|2022-09-09T09:26:51.9854326+08:00;True|2022-09-09T09:11:48.8023373+08:00;True|2022-09-09T09:05:45.5528883+08:00;True|2022-09-08T17:47:35.2628987+08:00;True|2022-09-08T17:43:32.6700813+08:00;True|2022-09-08T17:01:23.6259930+08:00;True|2022-09-08T16:55:57.2305777+08:00;True|2022-09-08T16:35:37.3631720+08:00;True|2022-09-08T16:19:13.9122228+08:00;True|2022-09-08T16:04:07.7348285+08:00;True|2022-09-08T16:00:49.9961701+08:00;True|2022-09-08T15:16:03.0110619+08:00;True|2022-09-08T10:19:46.2872822+08:00;True|2022-09-08T10:11:15.5386438+08:00;True|2022-09-08T08:19:02.5242539+08:00;True|2022-09-08T08:18:11.7308721+08:00;True|2022-09-07T11:39:27.2463573+08:00;True|2022-09-07T10:40:57.8877369+08:00;True|2022-09-07T10:37:10.1517098+08:00;True|2022-09-07T10:30:08.7782107+08:00;True|2022-09-07T10:23:52.8534200+08:00;True|2022-09-07T10:09:31.6994230+08:00;True|2022-09-07T10:01:16.2683112+08:00;True|2022-09-07T09:51:47.6282546+08:00;True|2022-09-06T19:11:45.1701913+08:00;True|2022-09-06T18:29:29.2671862+08:00;True|2022-09-06T16:41:04.2719822+08:00;True|2022-09-06T14:17:31.6896132+08:00;True|2022-09-06T13:14:39.9657702+08:00;True|2022-09-05T13:34:47.0627238+08:00;True|2022-09-05T11:07:59.2835592+08:00;True|2022-09-02T14:01:56.1233378+08:00;True|2022-08-31T23:40:49.5468281+08:00;True|2022-08-31T22:15:50.0388123+08:00;True|2022-08-31T19:20:24.7693742+08:00;True|2022-08-31T19:00:06.8271626+08:00;True|2022-08-31T18:45:08.6483670+08:00;True|2022-08-31T16:59:34.8244511+08:00;True|2022-08-31T15:39:51.0653019+08:00;True|2022-08-31T15:25:32.5277796+08:00;True|2022-08-31T13:31:48.5734692+08:00;True|2022-08-31T12:59:02.1022191+08:00;True|2022-08-31T10:06:03.2043884+08:00;True|2022-08-30T17:36:34.5932064+08:00;True|2022-08-30T17:18:12.4582841+08:00;True|2022-08-30T12:55:16.4084322+08:00;True|2022-08-30T10:12:08.0975252+08:00;True|2022-08-30T09:12:46.2845546+08:00;True|2022-08-30T08:58:47.8389468+08:00;True|2022-08-29T17:21:17.7779579+08:00;True|2022-08-29T17:17:49.5334583+08:00;True|2022-08-29T16:53:46.6019453+08:00;True|2022-08-29T16:46:50.8158231+08:00;True|2022-08-29T12:25:19.0140888+08:00;True|2022-08-26T17:02:52.4614637+08:00;True|2022-08-26T16:52:47.8585471+08:00;True|2022-08-26T16:47:02.5766798+08:00;True|2022-08-26T16:36:15.5793109+08:00;True|2022-08-26T16:15:55.1795297+08:00;True|2022-08-26T16:00:22.2697361+08:00;False|2022-08-26T15:58:16.7347649+08:00;True|2022-08-26T15:22:29.6367466+08:00;True|2022-08-25T20:02:24.4685508+08:00;True|2022-08-25T19:50:42.8601696+08:00;True|2022-08-25T15:56:20.3615518+08:00;True|2022-08-25T15:48:16.9923580+08:00;True|2022-08-25T15:27:07.9474640+08:00;True|2022-08-25T13:11:36.9626131+08:00;True|2022-08-24T14:10:58.2790665+08:00;True|2022-08-24T11:43:10.4463552+08:00;True|2022-08-24T08:02:17.9871411+08:00;True|2022-08-23T22:50:41.0238571+08:00;True|2022-08-23T22:16:20.9249814+08:00;True|2022-08-23T21:59:21.1909300+08:00;True|2022-08-23T21:50:40.8106496+08:00;True|2022-08-23T21:06:55.6611505+08:00;True|2022-08-23T19:49:07.0507418+08:00;True|2022-08-23T19:03:15.9808046+08:00;True|2022-08-23T18:58:57.1700899+08:00;True|2022-08-23T18:54:26.8058591+08:00;True|2022-08-23T18:45:39.1928602+08:00;True|2022-08-23T17:32:10.6125039+08:00;True|2022-08-23T15:58:34.9205174+08:00;True|2022-08-23T15:49:21.3383764+08:00;True|2022-08-23T15:14:21.0775398+08:00;True|2022-08-23T15:04:07.8829410+08:00;True|2022-08-23T14:59:17.5143895+08:00;True|2022-08-23T14:55:17.0069050+08:00;True|2022-08-23T14:41:41.0884731+08:00;True|2022-08-23T14:41:06.5045325+08:00;True|2022-08-23T14:28:54.7390570+08:00;True|2022-08-23T13:56:59.3670549+08:00;True|2022-08-23T13:56:38.8588174+08:00;True|2022-08-22T20:48:56.2180227+08:00;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -720,16 +720,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>09/09/2022 15:21:41</publishTime>
+ <publishTime>09/12/2022 13:07:28</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>09/09/2022 15:21:41</publishTime>
+ <publishTime>09/12/2022 13:07:28</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>09/09/2022 15:21:40</publishTime>
+ <publishTime>09/12/2022 13:07:27</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1518,7 +1518,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/09/2022 15:21:47</publishTime>
+ <publishTime>09/12/2022 13:07:39</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/SeachEncode.cs b/VueWebApi/Tools/SeachEncode.cs
index e58cab6..d7992ff 100644
--- a/VueWebApi/Tools/SeachEncode.cs
+++ b/VueWebApi/Tools/SeachEncode.cs
@@ -229,9 +229,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -276,9 +278,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
@@ -321,9 +325,11 @@
stf = DapperHelper.DoTransaction(list);
if (stf)
{
+ listdt.Add(Encode);
+ listdt.Add(cunm2);
mes.code = "200";
mes.Message = "鎴愬姛!";
- mes.data = Encode;
+ mes.data = listdt;
}
else
{
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 15154d6..f0c3a8c 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -308,7 +308,10 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Controllers\ReportManagerController.cs" />
<Compile Include="Controllers\SendController.cs" />
+ <Compile Include="DLL\BLL\ReportManagerBLL.cs" />
+ <Compile Include="DLL\DAL\ReportManagerDAL.cs" />
<Compile Include="Hubs\ChatHub.cs" />
<Compile Include="Controllers\AppDeviceManageController.cs" />
<Compile Include="Controllers\BasicSettingController.cs" />
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 4ad133a..9d23fde 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index b2389e9..3538dc0 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -506,6 +506,56 @@
</summary>
<param name="documentPath">The physical path to XML document.</param>
</member>
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 濮斿鎶ヨ〃璁板綍鏌ヨ
+ </summary>
+ <param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
+ <param name="stepname">宸ュ簭鍚嶇О</param>
+ <param name="suppername">渚涙柟鍚嶇О</param>
+ <param name="type">鎿嶄綔绫诲瀷</param>
+ <param name="receivdate">鏀舵枡鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ReportManagerController.OutSourceReportExcelSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 濮斿鎶ヨ〃璁板綍瀵煎嚭
+ </summary>
+ <param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
+ <param name="stepname">宸ュ簭鍚嶇О</param>
+ <param name="suppername">渚涙柟鍚嶇О</param>
+ <param name="type">鎿嶄綔绫诲瀷</param>
+ <param name="receivdate">鏀舵枡鏃堕棿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.ReportManagerController.GroupSalaryReportSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 鐝粍宸ヨ祫鎶ヨ〃璁板綍鏌ヨ
+ </summary>
+ <param name="wocode">宸ュ崟缂栧彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">瑙勬牸鍨嬪彿</param>
+ <param name="stepname">宸ュ簭鍚嶇О</param>
+ <param name="groupcode">鐢熶骇鐝粍</param>
+ <param name="username">鎿嶄綔浜哄憳</param>
+ <param name="operdate">鎿嶄綔鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.AppDeviceManageController.CheckScanDeviceQrCodeData(System.String)">
<summary>
鏃ュ父鐐规,鎵弿宸ヤ綅/璁惧浜岀淮鐮�
@@ -1102,7 +1152,7 @@
<param name="djwo">璁惧鐐规鍗曞彿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeOutExcel(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeOutExcel(System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
璁惧鐐规璁板綍瀵煎嚭
</summary>
@@ -1112,12 +1162,45 @@
<param name="stanedname">鏍囧噯鍚嶇О</param>
<param name="checkuser">鐐规浜哄憳</param>
<param name="checkdate">鐐规鏃堕棿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairTakeSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="repairuser">淇濆吇浜哄憳</param>
+ <param name="repairdate">淇濆吇鏃堕棿</param>
+ <param name="repairresult">淇濆吇缁撴灉</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairSubTakeSearch(System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ </summary>
+ <param name="bywo">璁惧淇濆吇鍗曞彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairTakeOutExcel(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍瀵煎嚭
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="repairuser">淇濆吇浜哄憳</param>
+ <param name="repairdate">淇濆吇鏃堕棿</param>
+ <param name="repairresult">淇濆吇缁撴灉</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
<summary>
鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 42e65c4..bf6a2dc 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index b2389e9..6ec9831 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -1102,7 +1102,7 @@
<param name="djwo">璁惧鐐规鍗曞彿</param>
<returns></returns>
</member>
- <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeOutExcel(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceCheckTakeOutExcel(System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
璁惧鐐规璁板綍瀵煎嚭
</summary>
@@ -1112,12 +1112,45 @@
<param name="stanedname">鏍囧噯鍚嶇О</param>
<param name="checkuser">鐐规浜哄憳</param>
<param name="checkdate">鐐规鏃堕棿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairTakeSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏌ヨ
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="repairuser">淇濆吇浜哄憳</param>
+ <param name="repairdate">淇濆吇鏃堕棿</param>
+ <param name="repairresult">淇濆吇缁撴灉</param>
<param name="page">椤电爜</param>
<param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
<param name="prop">鎺掑簭瀛楁</param>
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairSubTakeSearch(System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍鏄庣粏鏌ヨ
+ </summary>
+ <param name="bywo">璁惧淇濆吇鍗曞彿</param>
+ <returns></returns>
+ </member>
+ <member name="M:VueWebApi.Controllers.DeviceManagerController.DeviceRepairTakeOutExcel(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ 璁惧淇濆吇璁板綍瀵煎嚭
+ </summary>
+ <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ <param name="eqpcode">璁惧缂栧彿</param>
+ <param name="eqpname">璁惧鍚嶇О</param>
+ <param name="stanedname">鏍囧噯鍚嶇О</param>
+ <param name="repairuser">淇濆吇浜哄憳</param>
+ <param name="repairdate">淇濆吇鏃堕棿</param>
+ <param name="repairresult">淇濆吇缁撴灉</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ErpSyncMesController.SeaveSearchUnit">
<summary>
鍒堕�犳ā鍨嬶細鍗曚綅鍚屾
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.CoreCompileInputs.cache b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
index 0a5c1ec..99631d6 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-fcefa153b5fd93331a16d7f1527b6f7835134536
+b8cd0f8acb858c5d84c40903a64913c5cbad3758
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 8cfbe6a..2d4bf1d 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -281,6 +281,7 @@
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
+D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 4ad133a..9d23fde 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3