JLApi.git - Gitblit

			@@ -67,7 +67,7 @@
			where A.is_delete<>'1' " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -75,7 +75,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -97,7 +97,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "操作失败,编码重复!";
			mes.message = "操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -116,14 +116,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -143,14 +143,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -159,7 +159,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -182,7 +182,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "外协供方已关联外协工序,不允许删除!";
			mes.message = "外协供方已关联外协工序,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -194,14 +194,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除成功!";
			mes.message = "删除成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.message = "删除失败!";
			mes.data = null;
			}
			}
			@@ -209,7 +209,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -247,14 +247,14 @@
			where parent.is_delete<>'1' " + search;
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -273,7 +273,7 @@
			where is_delete<>'1' ";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data;
			}
			@@ -281,7 +281,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -318,14 +318,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "操作成功!";
			mes.message = "操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "操作失败!";
			mes.message = "操作失败!";
			mes.data = null;
			}
			}
			@@ -333,7 +333,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -357,7 +357,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前呼叫类型已关联呼叫配置,不允许删除!";
			mes.message = "当前呼叫类型已关联呼叫配置,不允许删除!";
			mes.data = null;
			}
			else
			@@ -369,14 +369,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除成功!";
			mes.message = "删除成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.message = "删除失败!";
			mes.data = null;
			}
			}
			@@ -385,7 +385,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -409,7 +409,7 @@

			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;

			}
			@@ -417,7 +417,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -446,14 +446,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "暂无响应人员!";
			mes.message = "暂无响应人员!";
			mes.data = null;
			}
			}
			@@ -461,7 +461,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -522,14 +522,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "操作成功!";
			mes.message = "操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "操作失败!";
			mes.message = "操作失败!";
			mes.data = null;
			}
			}
			@@ -537,7 +537,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -571,14 +571,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "操作成功!";
			mes.message = "操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.message = "删除失败!";
			mes.data = null;
			}
			}
			@@ -586,7 +586,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -626,14 +626,14 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除成功!";
			mes.message = "删除成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.message = "删除失败!";
			mes.data = null;
			}
			}
			@@ -641,7 +641,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -662,14 +662,14 @@
			dynamicParams.Add("@wkshpcode", wkshpcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -703,7 +703,7 @@
			where 1=1" + search + " order by T.lm_date desc";
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = data.Rows.Count;
			mes.data = data;
			}
			@@ -711,7 +711,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -735,7 +735,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败,编码重复!";
			mes.message = "新增操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -765,14 +765,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了组织:" + OrganCode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -789,7 +789,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新选择的所属组织已使用不允许修改!";
			mes.message = "新选择的所属组织已使用不允许修改!";
			mes.data = null;
			return mes;
			}
			@@ -812,7 +812,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前原有组织或子级被使用不允许修改!";
			mes.message = "当前原有组织或子级被使用不允许修改!";
			mes.data = null;
			return mes;
			}
			@@ -863,14 +863,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了组织:" + OrganCode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -879,7 +879,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -900,7 +900,7 @@
			if (data0.Rows.Count > 0)
			{
			mes.code = "300";
			mes.Message = "当前组织有下级关联,请先删除下级组织!";
			mes.message = "当前组织有下级关联,请先删除下级组织!";
			return mes;
			}
			sql = @"select * from TUser where storg_code=@orgcode";
			@@ -910,7 +910,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该组织下有关联的用户,不允许删除!";
			mes.message = "该组织下有关联的用户,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -923,14 +923,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "删除了组织:" + orgcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}

			@@ -939,7 +939,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -973,7 +973,7 @@
			where 1=1 " + search + "";
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -981,7 +981,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1005,7 +1005,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败,编码重复!";
			mes.message = "新增操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -1033,14 +1033,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了岗位:" + postcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -1056,7 +1056,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该岗位有关联的用户,不允许停用!";
			mes.message = "该岗位有关联的用户,不允许停用!";
			mes.data = null;
			return mes;
			}
			@@ -1084,14 +1084,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了岗位:" + postcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -1100,7 +1100,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1122,7 +1122,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该岗位有关联的用户,不允许删除!";
			mes.message = "该岗位有关联的用户,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -1135,14 +1135,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了岗位:" + postcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}

			@@ -1151,7 +1151,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1211,7 +1211,7 @@
			left join TUser S on U.lm_user=S.usercode " + search + "";
			var data = DapperHelper.GetPagedDataWith<object>(withsql, sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -1219,7 +1219,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1292,7 +1292,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败,编码重复!";
			mes.message = "新增操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -1326,14 +1326,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了用户:" + usercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -1370,14 +1370,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了用户:" + usercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -1386,7 +1386,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1412,14 +1412,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了用户:" + usercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除用户成功!";
			mes.message = "删除用户成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除用户失败!";
			mes.message = "删除用户失败!";
			mes.data = null;
			}
			}
			@@ -1427,7 +1427,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1461,7 +1461,7 @@
			where 1=1 " + search + "";
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -1469,7 +1469,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1493,7 +1493,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败,编码重复!";
			mes.message = "新增操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -1521,14 +1521,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了班组:" + groupcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -1544,7 +1544,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该班组有关联的用户,不允许停用!";
			mes.message = "该班组有关联的用户,不允许停用!";
			mes.data = null;
			return mes;
			}
			@@ -1572,14 +1572,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了班组:" + groupcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -1588,7 +1588,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1610,7 +1610,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该班组有关联的用户,不允许删除!";
			mes.message = "该班组有关联的用户,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -1623,14 +1623,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了班组:" + groupcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}

			@@ -1639,7 +1639,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1679,7 +1679,7 @@
			where 1=1 " + search + "";
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -1687,7 +1687,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1719,7 +1719,7 @@
			if (data.Rows.Count > 0)
			{
			mes.code = "300";
			mes.Message = "同名角色已存在!";
			mes.message = "同名角色已存在!";
			mes.data = null;
			return mes;
			}
			@@ -1751,14 +1751,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了角色:" + ((List<string>)mes.data)[0].ToString(), us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}
			}
			@@ -1774,7 +1774,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该角色有关联的用户,不允许停用!";
			mes.message = "该角色有关联的用户,不允许停用!";
			mes.data = null;
			return mes;
			}
			@@ -1840,14 +1840,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了角色名称:" + rolecode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}
			}
			@@ -1856,7 +1856,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1880,7 +1880,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "该角色有关联的用户,不允许删除!";
			mes.message = "该角色有关联的用户,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -1897,14 +1897,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了角色:" + rolecode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}
			}
			@@ -1912,7 +1912,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -1995,7 +1995,7 @@
			where 1=1 and U.status='Y' and U.role_code<>'' " + search + "";
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -2003,7 +2003,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2045,14 +2045,14 @@
			LogHelper.DbOperateLog(us.usercode, "取消", "取消了角色关联的用户:" + string.Join(",", user), us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}

			@@ -2062,7 +2062,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2100,14 +2100,14 @@
			LogHelper.DbOperateLog(us.usercode, "添加", "添加了角色关联的用户:" + string.Join(",", user), us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}

			@@ -2117,7 +2117,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2143,14 +2143,14 @@
			{
			mes.code = "200";
			mes.count = list.Count;
			mes.Message = "查询角色成功！";
			mes.message = "查询角色成功！";
			mes.data = list;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "暂无角色！";
			mes.message = "暂无角色！";
			mes.data = null;
			}
			}
			@@ -2158,7 +2158,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2182,7 +2182,7 @@
			{
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功！";
			mes.message = "查询成功！";
			mes.data = data;
			return mes;
			}
			@@ -2190,7 +2190,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "暂无菜单！";
			mes.message = "暂无菜单！";
			mes.data = null;
			return mes;
			}
			@@ -2199,7 +2199,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2220,7 +2220,7 @@
			var data = DapperHelper.selectdata(sql, dynamicParams);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "查询成功！";
			mes.message = "查询成功！";
			mes.data = data;
			return mes;
			}
			@@ -2228,7 +2228,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2257,14 +2257,14 @@
			LogHelper.DbOperateLog(us.usercode, "分配", "分配了角色权限:" + "-->角色:" + rolecode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "成功!";
			mes.message = "成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "失败!";
			mes.message = "失败!";
			mes.data = null;
			}
			}
			@@ -2272,7 +2272,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2291,14 +2291,14 @@
			sql = @"select code,name,idparent,data_sources from TCustomerType ";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2322,7 +2322,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位分类上级不能是已有往来单位的分类，请重新输入！";
			mes.message = "往来单位分类上级不能是已有往来单位的分类，请重新输入！";
			mes.data = null;
			return mes;
			}
			@@ -2337,7 +2337,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位分类编码已存在,请重新输入!";
			mes.message = "往来单位分类编码已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2349,7 +2349,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位分类名称已存在,请重新输入!";
			mes.message = "往来单位分类名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2376,14 +2376,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了往来单位分类:" + customerclasscode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -2398,7 +2398,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位分类名称已存在,请重新输入!";
			mes.message = "往来单位分类名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2424,14 +2424,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了往来单位分类:" + customerclasscode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -2440,7 +2440,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2464,7 +2464,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前往来单位分类或下级被引用不允许删除！";
			mes.message = "当前往来单位分类或下级被引用不允许删除！";
			mes.data = null;
			return mes;
			}
			@@ -2485,14 +2485,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了往来单位分类:" + string.Join(",", classcode), us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -2500,7 +2500,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2541,7 +2541,7 @@
			var total = 0; //总条数
			data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -2549,7 +2549,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2574,7 +2574,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位编码已存在,请重新输入!";
			mes.message = "往来单位编码已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2586,7 +2586,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位名称已存在,请重新输入!";
			mes.message = "往来单位名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2617,14 +2617,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了往来单位:" + customercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -2639,7 +2639,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "往来单位名称已存在,请重新输入!";
			mes.message = "往来单位名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2669,14 +2669,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了往来单位:" + customercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -2685,7 +2685,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2720,14 +2720,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了往来单位:" + customercode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}
			}
			@@ -2736,7 +2736,7 @@

			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2780,7 +2780,7 @@
			var total = 0; //总条数
			data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -2788,7 +2788,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2813,7 +2813,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓库编码已存在,请重新输入!";
			mes.message = "仓库编码已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2825,7 +2825,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓库名称已存在,请重新输入!";
			mes.message = "仓库名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2854,14 +2854,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了仓库:" + stckcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -2876,7 +2876,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓库名称已存在,请重新输入!";
			mes.message = "仓库名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -2919,14 +2919,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了仓库:" + stckcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -2935,7 +2935,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -2958,7 +2958,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓库已启用货位,不允许删除!";
			mes.message = "仓库已启用货位,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -2980,14 +2980,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了仓库:" + stckcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}
			}
			@@ -2996,7 +2996,7 @@

			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3011,20 +3011,20 @@
			try
			{
			//获取开启仓位管控的仓库信息
			sql = @"select S.code,S.name,'-1' as idparent from TSecStck S where S.ishasPosition='1'
			union all
			select L.code,L.name,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent
			from TSecLoca L ";
			sql = @"select code,name,'-1' as idparent,'' as warhouse,'0' as depth from TSecStck where ishasPosition='1'
			union all
			select code,name,case when L.idparent is NULL or L.idparent='' then '-1' else L.idparent end as idparent,idwarehouse,depth
			from TSecLoca L ";
			var data = DapperHelper.selecttable(sql);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.data = data;
			}
			catch (Exception e)
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3032,44 +3032,51 @@
			#endregion

			#region[仓位信息列表]
			public static ToMessage TSecLocaData(string stckcode, string locacode, string locaname, int startNum, int endNum, string prop, string order)
			public static ToMessage TSecLocaData(string flag, string stckcode, string locacode, string locaname, int startNum, int endNum, string prop, string order)
			{
			var dynamicParams = new DynamicParameters();
			string search = "", sql = "";
			IEnumerable<object> data;
			try
			{
			if (stckcode != "" && stckcode != null)
			string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			switch (flag)
			{
			string[] classcode = Array.ConvertAll<string, string>(stckcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
			search += "and C.idparent in @classcode ";
			dynamicParams.Add("@classcode", classcode);
			case "-1": //全部
			search += " and L.idparent is null or L.idparent='' and L.idwarehouse in @idwarehouse ";
			dynamicParams.Add("@idwarehouse", classcode);
			break;
			case "0": //仓库
			search += " and L.depth='1' and L.idwarehouse in @idwarehouse ";
			dynamicParams.Add("@idwarehouse", classcode);
			break;
			default: //仓位
			search += " and L.idparent in @idparent";
			dynamicParams.Add("@idparent", classcode);
			break;
			}
			if (locacode != "" && locacode != null)
			{
			search += "and C.code like '%'+@locacode+'%' ";
			search += "and L.code like '%'+@locacode+'%' ";
			dynamicParams.Add("@locacode", locacode);
			}
			if (locaname != "" && locaname != null)
			{
			search += "and C.name like '%'+@locaname+'%' ";
			search += "and L.name like '%'+@locaname+'%' ";
			dynamicParams.Add("@locaname", locaname);
			}
			sql = @"select C.code,C.name,C.status,C.description,C.idwarehouse as stckcode,T.name as stckname,C.idparent as parentcode,L.name as parentname,
			C.lm_user as usercode,U.username,C.lm_date,C.data_sources
			from (
			select L.code,L.name,L.idwarehouse,L.status,L.description,L.lm_user,L.lm_date,L.data_sources,case when L.idparent is NULL or L.idparent='' then L.idwarehouse else L.idparent end as idparent
			sql = @"select L.code,L.name,L.status,L.description,L.idwarehouse as stckcode,T.name as stckname,
			L.idparent as parentcode,S.name as parentname,L.data_sources,L.lm_user as usercode,U.username,L.lm_date
			from TSecLoca L
			) as C
			left join TSecStck T on C.idwarehouse=T.code
			left join TSecLoca L on C.idparent=L.code
			left join TUser U on C.lm_user=U.usercode
			where 1=1 " + search;
			left join TSecStck T on L.idwarehouse=T.code
			left join TSecLoca S on L.idparent=S.code
			left join TUser U on L.lm_user=U.usercode
			where 1=1 " + search;
			// --------------查询指定数据--------------
			var total = 0; //总条数
			data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -3077,7 +3084,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3085,7 +3092,7 @@
			#endregion

			#region[仓位信息新增/编辑保存]
			public static ToMessage TSecStckAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode, string status, string description, string OperType, User us)
			public static ToMessage TSecLocaAddUpdate(string data_sources, string locacode, string locaname, string stckcode, string parentlocacode,string depth, string status, string description, string OperType, User us)
			{
			string sql = "";
			List<object> list = new List<object>();
			@@ -3102,7 +3109,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓位编码已存在,请重新输入!";
			mes.message = "仓位编码已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			@@ -3114,13 +3121,17 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓位已存在,请重新输入!";
			mes.message = "仓位已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			//写入往来单位
			sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources)
			values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources)";
			if (depth == "1") //层级为1时,置空上级编码
			{
			parentlocacode = "";
			}
			//写入仓位
			sql = @"insert into TSecLoca(code,name,idwarehouse,idparent,status,description,lm_user,lm_date,data_sources,depth)
			values(@code,@name,@idwarehouse,@idparent,@status,@description,@lm_user,@lm_date,@data_sources,@depth)";
			list.Add(new
			{
			str = sql,
			@@ -3134,7 +3145,8 @@
			description = description,
			lm_user = us.usercode,
			lm_date = DateTime.Now.ToString(),
			data_sources = data_sources
			data_sources = data_sources,
			depth= depth
			}
			});
			bool aa = DapperHelper.DoTransaction(list);
			@@ -3144,19 +3156,28 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了仓位:" + locacode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			if (OperType == "Update")
			{
			//判断上级货位编码是否等于货位编码
			if (locacode == parentlocacode)
			{
			mes.code = "300";
			mes.count = 0;
			mes.message = "上级货位不能是库位本身！";
			mes.data = null;
			return mes;
			}
			//判断往来单位名称是否重复
			sql = @"select * from TSecLoca where code<>@code and name=@name";
			dynamicParams.Add("@code", locacode);
			@@ -3166,12 +3187,16 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "仓位名称已存在,请重新输入!";
			mes.message = "仓位名称已存在,请重新输入!";
			mes.data = null;
			return mes;
			}
			if (depth == "1") //层级为1时,置空上级编码
			{
			parentlocacode = "";
			}
			//更新存货分类
			sql = @"update TSecLoca set name=@name,idwarehouse=@idwarehouse,idparent=@idparent,status=@status,description=@description,lm_user=@lm_user,lm_date=@lm_date
			sql = @"update TSecLoca set name=@name,idwarehouse=@idwarehouse,idparent=@idparent,depth=@depth,status=@status,description=@description,lm_user=@lm_user,lm_date=@lm_date
			where code=@code";
			list.Add(new
			{
			@@ -3182,6 +3207,7 @@
			name = locaname,
			idwarehouse = stckcode,
			idparent = parentlocacode,
			depth= depth,
			status = status,
			description = description,
			lm_user = us.usercode,
			@@ -3209,14 +3235,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了仓位:" + locacode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -3225,7 +3251,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3248,7 +3274,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "当前仓位下存在子项,不允许删除!";
			mes.message = "当前仓位下存在子项,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -3270,14 +3296,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了仓位:" + locacode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除操作成功!";
			mes.message = "删除操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除操作失败!";
			mes.message = "删除操作失败!";
			mes.data = null;
			}
			}
			@@ -3286,7 +3312,7 @@

			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3333,7 +3359,7 @@
			where A.is_delete<>'1' " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			mes.message = "查询成功!";
			mes.count = total;
			mes.data = data.ToList();
			}
			@@ -3341,7 +3367,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3365,7 +3391,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "操作失败,编码重复!";
			mes.message = "操作失败,编码重复!";
			mes.data = null;
			return mes;
			}
			@@ -3385,14 +3411,14 @@
			LogHelper.DbOperateLog(us.usercode, "新增", "新增了工序:" + stepcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "新增操作成功!";
			mes.message = "新增操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "新增操作失败!";
			mes.message = "新增操作失败!";
			mes.data = null;
			}
			}
			@@ -3409,7 +3435,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "工序有关联工单,不允许修改!";
			mes.message = "工序有关联工单,不允许修改!";
			mes.data = null;
			return mes;
			}
			@@ -3424,14 +3450,14 @@
			LogHelper.DbOperateLog(us.usercode, "修改", "修改了工序:" + stepcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "修改操作成功!";
			mes.message = "修改操作成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "修改操作失败!";
			mes.message = "修改操作失败!";
			mes.data = null;
			}
			}
			@@ -3440,7 +3466,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			@@ -3464,7 +3490,7 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "工序有关联工单,不允许删除!";
			mes.message = "工序有关联工单,不允许删除!";
			mes.data = null;
			return mes;
			}
			@@ -3478,14 +3504,14 @@
			LogHelper.DbOperateLog(us.usercode, "删除", "删除了工序:" + stepcode, us.usertype);
			mes.code = "200";
			mes.count = 0;
			mes.Message = "删除成功!";
			mes.message = "删除成功!";
			mes.data = null;
			}
			else
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = "删除失败!";
			mes.message = "删除失败!";
			mes.data = null;
			}
			}
			@@ -3493,11 +3519,12 @@
			{
			mes.code = "300";
			mes.count = 0;
			mes.Message = e.Message;
			mes.message = e.Message;
			mes.data = null;
			}
			return mes;
			}
			#endregion

			}
			}