JTAPI.git - Gitblit

2023-01-05 342b165ea43f6b679fc4a794c47541abc61f5ad6

App个人计件工资接口修改

已添加2个文件

已修改6个文件

	.vs/VueWebApi/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/DLL/DAL/AppPersonalDAL.cs	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/Logs/2023-01-05.TXT	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/bin/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	VueWebApi/obj/Release/VueWebApi.pdb	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/DLL/DAL/AppPersonalDAL.cs

@@ -26,22 +26,10 @@
            string search = "";
            try
            {
                if (usercode != "" && usercode != null)
                {
                    search += "and B.report_person=@usercode ";
                    dynamicParams.Add("@usercode", usercode);
                }
                if (startopendate != "" && startopendate != null)
                {
                    search += "and B.report_date between @startopendate and @endclosedate ";
                    dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
                    dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                search = search.Substring(3);//æªåç´¢å¼2åé¢çåç¬¦
                dynamicParams.Add("@usercode", usercode);
                dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
                dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
                
                // --------------æ¥è¯¢æ¥å·¥æ°ãè¯åæ£é¤ãè®¡ç®å·¥èµæ¶å¥--------------
                var sql = @"select isnull(sum(BB.report_qty),0) as report_qty,(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as userngbadmoney,
                          isnull(sum(BB.usermoney),0)-(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as usermoney 
@@ -64,7 +52,7 @@
                          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 B.report_person=U.usercode
                          where "+search+") as AA) as BB ";
                          where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA) as BB ";
                var data0 = DapperHelper.selectdata(sql, dynamicParams);
                dList.Add("dt0", data0);
                // --------------æ¥è¯¢æ¥å·¥æç»(æç§å·¥åãäº§åãå·¥åºåç»)--------------
@@ -87,7 +75,7 @@
                             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 B.report_person=U.usercode
                             where "+search+") as AA  group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
                             where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA  group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
                var data1 = DapperHelper.selectdata(sql1, dynamicParams);
                dList.Add("dt1", data1);
                mes.code = "200";

 VueWebApi/Logs/2023-01-05.TXT

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,30 @@
 ãæ¶é´ã:2023-01-05 13:58:03,265
 ãçº§å«ã:ERROR
 ãç±»åã:æ¥å¿è®°å½
 ãçº¿ç¨IDã: 10 
 ãæä»¶å°åã:D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\Tools\LogHelper.cs ç¬¬25è¡
 ãæ¥å¿åå®¹ã:
æ¶æ¯ç±»åï¼SqlException
æ¶æ¯åå®¹ï¼æ æ³ç»å®ç±å¤ä¸ªé¨åç»æçæ è¯ç¬¦ "A.wo_code"ã
æ æ³ç»å®ç±å¤ä¸ªé¨åç»æçæ è¯ç¬¦ "A.wo_code"ã
å¼åå¼å¸¸è·¯å¾ï¼/api/AppPersonal/PieceRateWage
å¼åå¼å¸¸çæ¹æ³ï¼OnError
å¼åå¼å¸¸æºï¼.Net SqlClient Data Provider   å¨ System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
   å¨ System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
   å¨ System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
   å¨ System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
   å¨ System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
   å¨ System.Data.SqlClient.SqlDataReader.get_MetaData()
   å¨ System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
   å¨ System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
   å¨ System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
   å¨ System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
   å¨ System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
   å¨ System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
   å¨ System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
   å¨ Dapper.SqlMapper.ExecuteReaderWithFlagsFallback(IDbCommand cmd, Boolean wasClosed, CommandBehavior behavior)
   å¨ Dapper.SqlMapper.QueryMultipleImpl(IDbConnection cnn, CommandDefinition& command)
   å¨ Dapper.SqlMapper.QueryMultiple(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
   å¨ VueWebApi.Tools.DapperHelper.GetPageList[T](String sql, Object parm, String orderBy, String sort, Int32 pageIndex, Int32 pageSize, Int32& total) ä½ç½® D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\Tools\DapperHelper.cs:è¡å· 160
 ãæ¥è®°è¯¦ç»ãï¼ 
---------------------------------------------------------------------------------------------------------------

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -568,3 +568,4 @@
D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ

			@@ -26,22 +26,10 @@
			string search = "";
			try
			{
			if (usercode != "" && usercode != null)
			{
			search += "and B.report_person=@usercode ";
			dynamicParams.Add("@usercode", usercode);
			}
			if (startopendate != "" && startopendate != null)
			{
			search += "and B.report_date between @startopendate and @endclosedate ";
			dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
			dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");
			}
			if (search == "")
			{
			search = "and 1=1 ";
			}
			search = search.Substring(3);//æªåç´¢å¼2åé¢çåç¬¦
			dynamicParams.Add("@usercode", usercode);
			dynamicParams.Add("@startopendate", startopendate + " 00:00:00");
			dynamicParams.Add("@endclosedate", endclosedate + " 23:59:59");

			// --------------æ¥è¯¢æ¥å·¥æ°ãè¯åæ£é¤ãè®¡ç®å·¥èµæ¶å¥--------------
			var sql = @"select isnull(sum(BB.report_qty),0) as report_qty,(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as userngbadmoney,
			isnull(sum(BB.usermoney),0)-(isnull(sum(BB.userngmoney),0)+isnull(sum(BB.userbadmoney),0)) as usermoney
			@@ -64,7 +52,7 @@
			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 B.report_person=U.usercode
			where "+search+") as AA) as BB ";
			where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA) as BB ";
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			dList.Add("dt0", data0);
			// --------------æ¥è¯¢æ¥å·¥æç»(æç§å·¥åãäº§åãå·¥åºåç»)--------------
			@@ -87,7 +75,7 @@
			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 B.report_person=U.usercode
			where "+search+") as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
			where B.report_person=@usercode and B.report_date between @startopendate and @endclosedate) as AA group by AA.wo_code,AA.partcode,AA.partname,AA.stepcode,AA.stepname,AA.task_qty,AA.group_code,AA.group_name,AA.unprice,AA.report_person,AA.username,colum";
			var data1 = DapperHelper.selectdata(sql1, dynamicParams);
			dList.Add("dt1", data1);
			mes.code = "200";

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,30 @@
			ãæ¶é´ã:2023-01-05 13:58:03,265
			ãçº§å«ã:ERROR
			ãç±»åã:æ¥å¿è®°å½
			ãçº¿ç¨IDã: 10
			ãæä»¶å°åã:D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\Tools\LogHelper.cs ç¬¬25è¡
			ãæ¥å¿åå®¹ã:
			æ¶æ¯ç±»åï¼SqlException
			æ¶æ¯åå®¹ï¼æ æ³ç»å®ç±å¤ä¸ªé¨åç»æçæ è¯ç¬¦ "A.wo_code"ã
			æ æ³ç»å®ç±å¤ä¸ªé¨åç»æçæ è¯ç¬¦ "A.wo_code"ã
			å¼åå¼å¸¸è·¯å¾ï¼/api/AppPersonal/PieceRateWage
			å¼åå¼å¸¸çæ¹æ³ï¼OnError
			å¼åå¼å¸¸æºï¼.Net SqlClient Data Provider å¨ System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
			å¨ System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
			å¨ System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
			å¨ System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
			å¨ System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
			å¨ System.Data.SqlClient.SqlDataReader.get_MetaData()
			å¨ System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
			å¨ System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
			å¨ System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
			å¨ System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
			å¨ System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
			å¨ System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
			å¨ System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
			å¨ Dapper.SqlMapper.ExecuteReaderWithFlagsFallback(IDbCommand cmd, Boolean wasClosed, CommandBehavior behavior)
			å¨ Dapper.SqlMapper.QueryMultipleImpl(IDbConnection cnn, CommandDefinition& command)
			å¨ Dapper.SqlMapper.QueryMultiple(IDbConnection cnn, String sql, Object param, IDbTransaction transaction, Nullable`1 commandTimeout, Nullable`1 commandType)
			å¨ VueWebApi.Tools.DapperHelper.GetPageList[T](String sql, Object parm, String orderBy, String sort, Int32 pageIndex, Int32 pageSize, Int32& total) ä½ç½® D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\Tools\DapperHelper.cs:è¡å· 160
			ãæ¥è®°è¯¦ç»ãï¼
			---------------------------------------------------------------------------------------------------------------

			@@ -568,3 +568,4 @@
			D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
			D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
			D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.pdb
			D:\æ°å¯è¿ªMES\MESäº§å\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache