lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
高飞 2025-09-28 17:11:39 +08:00
parent a88bacb0e1 923e398251
commit 459f4f6122
16 changed files with 2781 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SGGL/BLL/Common/Funs.cs
View File

@ -1,6 +1,7 @@
namespace BLL namespace BLL
{ {
using Model; using Model;
using Org.BouncyCastle.Utilities;
using Quartz; using Quartz;
using RestSharp; using RestSharp;
using System; using System;
@ -351,7 +352,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{decimalStr}", ex);
return false; return false;
} }
} }
@ -375,7 +376,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{integerStr}", ex);
return false; return false;
} }
} }
@ -518,7 +519,7 @@ namespace BLL
public static decimal? GetNewDecimal(string value) public static decimal? GetNewDecimal(string value)
{ {
decimal? revalue = null; decimal? revalue = null;
if (!String.IsNullOrEmpty(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
try try
{ {
@ -526,8 +527,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{value}", ex);
} }
} }
@ -540,7 +540,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static int? GetNewInt(string value) public static int? GetNewInt(string value)
{ {
if (!String.IsNullOrEmpty(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
try try
{ {
@ -548,7 +548,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{value}", ex);
return null; return null;
} }
} }
@ -564,7 +564,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static long? GetNewlong(string value) public static long? GetNewlong(string value)
{ {
if (!String.IsNullOrEmpty(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
try try
{ {
@ -572,7 +572,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{value}", ex);
return null; return null;
} }
} }
@ -589,7 +589,7 @@ namespace BLL
public static int GetNewIntOrZero(string value) public static int GetNewIntOrZero(string value)
{ {
int revalue = 0; int revalue = 0;
if (!String.IsNullOrEmpty(value)) if (!string.IsNullOrWhiteSpace(value))
{ {
try try
{ {
@ -597,8 +597,8 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{value}", ex);
return revalue;
} }
} }
@ -693,7 +693,7 @@ namespace BLL
{ {
try try
{ {
if (!String.IsNullOrEmpty(time)) if (!string.IsNullOrWhiteSpace(time))
{ {
DateTime dateTime = DateTime.Parse(time); DateTime dateTime = DateTime.Parse(time);
if (dateTime.Year > 1753 && dateTime.Year < 9999) if (dateTime.Year > 1753 && dateTime.Year < 9999)
@ -712,7 +712,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{time}", ex);
return null; return null;
} }
} }
@ -725,7 +725,7 @@ namespace BLL
{ {
try try
{ {
if (!String.IsNullOrEmpty(time)) if (!string.IsNullOrWhiteSpace(time))
{ {
DateTime dateTime = DateTime.Parse(time); DateTime dateTime = DateTime.Parse(time);
if (dateTime.Year > 1753 && dateTime.Year < 9999) if (dateTime.Year > 1753 && dateTime.Year < 9999)
@ -744,7 +744,7 @@ namespace BLL
} }
catch (Exception ex) catch (Exception ex)
{ {
ErrLogInfo.WriteLog(string.Empty, ex); ErrLogInfo.WriteLog($"错误数据：{time}", ex);
return System.DateTime.Now; return System.DateTime.Now;
} }
} }

2
SGGL/BLL/JDGL/Check/MonthPlanService.cs
View File

@ -10,7 +10,7 @@ namespace BLL
/// </summary> /// </summary>
public class MonthPlanService public class MonthPlanService
{ {
public static Model.SGGLDB db = Funs.DB; //public static Model.SGGLDB db = Funs.DB;
/// <summary> /// <summary>
/// 根据主键获取月度计划情况 /// 根据主键获取月度计划情况

9
SGGL/BLL/JDGL/Check/WeekItemService.cs
View File

@ -10,8 +10,6 @@ namespace BLL
/// </summary> /// </summary>
public class WeekItemService public class WeekItemService
{ {
public static Model.SGGLDB db = Funs.DB;
/// <summary> /// <summary>
/// 根据主键获取自定义周情况 /// 根据主键获取自定义周情况
/// </summary> /// </summary>
@ -19,6 +17,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static Model.JDGL_WeekItem GetWeekItemById(string WeekId) public static Model.JDGL_WeekItem GetWeekItemById(string WeekId)
{ {
Model.SGGLDB db = Funs.DB;
return db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekId); return db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekId);
} }
@ -30,6 +29,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static Model.JDGL_WeekItem GetWeekItemByProjectIdAndWeekNo(string ProjectId, int WeekNo) public static Model.JDGL_WeekItem GetWeekItemByProjectIdAndWeekNo(string ProjectId, int WeekNo)
{ {
Model.SGGLDB db = Funs.DB;
return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.WeekNo == WeekNo); return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.WeekNo == WeekNo);
} }
@ -40,6 +40,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static Model.JDGL_WeekItem GetWeekItemByDateNow(string ProjectId) public static Model.JDGL_WeekItem GetWeekItemByDateNow(string ProjectId)
{ {
Model.SGGLDB db = Funs.DB;
return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.StartDate < DateTime.Now && e.EndDate > DateTime.Now); return db.JDGL_WeekItem.FirstOrDefault(e => e.ProjectId == ProjectId && e.StartDate < DateTime.Now && e.EndDate > DateTime.Now);
} }
/// <summary> /// <summary>
@ -48,6 +49,7 @@ namespace BLL
/// <param name="WeekItem"></param> /// <param name="WeekItem"></param>
public static void AddWeekItem(Model.JDGL_WeekItem WeekItem) public static void AddWeekItem(Model.JDGL_WeekItem WeekItem)
{ {
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekItem newWeekItem = new Model.JDGL_WeekItem Model.JDGL_WeekItem newWeekItem = new Model.JDGL_WeekItem
{ {
WeekId = WeekItem.WeekId, WeekId = WeekItem.WeekId,
@ -68,6 +70,7 @@ namespace BLL
/// <param name="WeekItem"></param> /// <param name="WeekItem"></param>
public static void UpdateWeekItem(Model.JDGL_WeekItem WeekItem) public static void UpdateWeekItem(Model.JDGL_WeekItem WeekItem)
{ {
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekItem newWeekItem = db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekItem.WeekId); Model.JDGL_WeekItem newWeekItem = db.JDGL_WeekItem.FirstOrDefault(e => e.WeekId == WeekItem.WeekId);
if (newWeekItem != null) if (newWeekItem != null)
{ {
@ -86,6 +89,7 @@ namespace BLL
/// <param name="WeekId"></param> /// <param name="WeekId"></param>
public static void DeleteWeekItemById(string WeekId) public static void DeleteWeekItemById(string WeekId)
{ {
Model.SGGLDB db = Funs.DB;
var q = (from x in db.JDGL_WeekItem where x.WeekId == WeekId select x).FirstOrDefault(); var q = (from x in db.JDGL_WeekItem where x.WeekId == WeekId select x).FirstOrDefault();
if (q != null) if (q != null)
{ {
@ -102,6 +106,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static List<JDGL_WeekItem> GetWeekItemList(string ProjectId) public static List<JDGL_WeekItem> GetWeekItemList(string ProjectId)
{ {
Model.SGGLDB db = Funs.DB;
return (from x in db.JDGL_WeekItem where x.ProjectId == ProjectId orderby x.WeekNo descending select x).ToList(); return (from x in db.JDGL_WeekItem where x.ProjectId == ProjectId orderby x.WeekNo descending select x).ToList();
} }

5
SGGL/BLL/OpenService/MonitorService.cs
View File

@ -69,10 +69,10 @@ namespace BLL
{ {
string result2 = APIGetHttpService.Http("http://219.139.48.4:8098/api/transaction/list?startDate=" + date.ToString("yyyy-MM-dd HH:mm:ss") + "&endDate=" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "&pageNo=" + page + "&pageSize=100&access_token=DE2930A5E95BDECC6AC6C39A6A18FBAE17951BB668F50A35F28C883C324B8DF0", "GET", "application/json;charset=utf-8", null, null); string result2 = APIGetHttpService.Http("http://219.139.48.4:8098/api/transaction/list?startDate=" + date.ToString("yyyy-MM-dd HH:mm:ss") + "&endDate=" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "&pageNo=" + page + "&pageSize=100&access_token=DE2930A5E95BDECC6AC6C39A6A18FBAE17951BB668F50A35F28C883C324B8DF0", "GET", "application/json;charset=utf-8", null, null);
var j2 = JsonConvert.DeserializeObject<dynamic>(result2);
size = j2.data.Count;
try try
{ {
var j2 = JsonConvert.DeserializeObject<dynamic>(result2);
size = j2 != null ? j2.data.Count : 0;
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
{ {
@ -149,7 +149,6 @@ namespace BLL
APIPersonService.getPersonInOut(getPerson, isIn, changeTime); APIPersonService.getPersonInOut(getPerson, isIn, changeTime);
} }
} }
} }
catch (Exception ex) { ErrLogInfo.WriteLog("氟化工出入同步出错2!" + ex.StackTrace + "/n" + ex.Message); } catch (Exception ex) { ErrLogInfo.WriteLog("氟化工出入同步出错2!" + ex.StackTrace + "/n" + ex.Message); }

19
SGGL/BLL/WebService/CNCECHSSEGetWebService.cs
View File

@ -11,10 +11,8 @@ namespace BLL
public class CNCECHSSEGetWebService public class CNCECHSSEGetWebService
{ {
#region 督查检查整改上报 #region 督查检查整改上报
/// <summary> /// <summary>
/// 督查检查整改上报 /// 督查检查整改上报
/// </summary> /// </summary>
@ -23,6 +21,7 @@ namespace BLL
string code = "0"; string code = "0";
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
string filePath = Funs.SGGLUrl;
try try
{ {
var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
@ -50,7 +49,7 @@ namespace BLL
ToKeyId = x.ToKeyId2, ToKeyId = x.ToKeyId2,
AttachSource = x.AttachSource2, AttachSource = x.AttachSource2,
AttachUrl = x.AttachUrl2, AttachUrl = x.AttachUrl2,
FilePath = Funs.SGGLUrl FilePath = filePath
//////附件转为字节传送 //////附件转为字节传送
//FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
}; };
@ -62,9 +61,12 @@ namespace BLL
{ "token", ServerService.GetToken().Token } { "token", ServerService.GetToken().Token }
}; };
var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList()); var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
//ErrLogInfo.WriteLog($"【集团检查整改上报数据】：{pushContent}");
var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent); var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
if (!string.IsNullOrEmpty(strJosn)) if (!string.IsNullOrEmpty(strJosn))
{ {
//ErrLogInfo.WriteLog($"【集团检查整改上报数据结果】：{strJosn}");
JObject obj = JObject.Parse(strJosn); JObject obj = JObject.Parse(strJosn);
code = obj["code"].ToString(); code = obj["code"].ToString();
@ -78,8 +80,12 @@ namespace BLL
var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item); var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
if (newCheckRectify != null) if (newCheckRectify != null)
{ {
newCheckRectify.HandleState = BLL.Const.State_3; //已完成 var getNoUpdateItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyId == checkRectifyId && !x.RealEndDate.HasValue);
db.SubmitChanges(); if (getNoUpdateItem == null)
{//问题全部整改完成
newCheckRectify.HandleState = BLL.Const.State_3; //已完成
db.SubmitChanges();
}
} }
} }
} }
@ -95,10 +101,7 @@ namespace BLL
return code; return code;
} }
} }
#endregion #endregion
} }
} }

2
SGGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

2
SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx.cs
View File

@ -598,7 +598,7 @@ namespace FineUIPro.Web.CQMS.Check
{ {
string itemId = Grid1.DataKeys[e.RowIndex][0].ToString(); string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var detail = jointCheckDetails.FirstOrDefault(x => x.JointCheckDetailId == itemId); var detail = jointCheckDetails.FirstOrDefault(x => x.JointCheckDetailId == itemId);
if (detail.HandleMan == CurrUser.UserId) if (detail != null && detail.HandleMan == CurrUser.UserId)
{ {
if (e.CommandName == "ReAttachUrl") if (e.CommandName == "ReAttachUrl")
{ {

2
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit" Async="true" %>
<!DOCTYPE html> <!DOCTYPE html>

2770
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
View File

File diff suppressed because it is too large Load Diff

35
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
View File

@ -1562,20 +1562,31 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode // orderby y.UnitCode
// select new { x.UnitId, y.UnitName }; // select new { x.UnitId, y.UnitName };
var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList(); var unitLists = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail //var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin // join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty() // from u in unitJoin.DefaultIfEmpty()
select new // select new
{ // {
c.CheckDate, // c.CheckDate,
c.ProjectId, // c.ProjectId,
u.UnitId, // u.UnitId,
u.UnitName, // u.UnitName,
c.IsOnceQualified // c.IsOnceQualified
}; // };
var cqmsList = from c in db.ProcessControl_InspectionManagement
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
foreach (var item in unitLists) foreach (var item in unitLists)
{ {
var query = from x in cqmsDetail var query = from x in cqmsList
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new select new
{ {

8
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
View File

@ -61,8 +61,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
} }
if (!string.IsNullOrWhiteSpace(txtEndTime.Text)) if (!string.IsNullOrWhiteSpace(txtEndTime.Text))
{ {
sb.Append("AND P.InspectionDate <= @endTim "); var endTime = Funs.GetNewDateTime(txtEndTime.Text);
listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text))); if (endTime != null)
{
sb.Append("AND P.InspectionDate <= @endTim ");
listStr.Add(new SqlParameter("@endTime", endTime));
}
} }
sb.Append("ORDER BY P.NoticeCode DESC "); sb.Append("ORDER BY P.NoticeCode DESC ");
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();

1
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
View File

@ -95,6 +95,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
if (attachFile != null) if (attachFile != null)
{ {
CNCECPath = !string.IsNullOrWhiteSpace(CNCECPath) ? CNCECPath : "https://qhse.cncecoa.com/QHSE/";
url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl); url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl);
} }
} }

6
SGGL/FineUIPro.Web/DataShow/InspectionManagement.aspx.cs
View File

@ -165,7 +165,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null) if (projectId != null)
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue) if (datetime1.HasValue)
{ {
@ -187,7 +187,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null) if (projectId != null)
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true); var getT = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString() && x.IsOnceQualified == true);
if (datetime1.HasValue) if (datetime1.HasValue)
{ {
@ -209,7 +209,7 @@ namespace FineUIPro.Web.DataShow
if (projectId != null) if (projectId != null)
{ {
var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime1 = Funs.GetNewDateTime(this.txtStartTime.Text);
var datetime2 = Funs.GetNewDateTime(this.txtStartTime.Text); var datetime2 = Funs.GetNewDateTime(this.txtEndTime.Text);
var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString()); var getALL = Funs.DB.ProcessControl_InspectionManagement.Where(x => x.ProjectId == projectId.ToString());
if (datetime1.HasValue) if (datetime1.HasValue)

3
SGGL/FineUIPro.Web/HSSE/QualityAudit/SubUnitQualityEdit.aspx.cs
View File

@ -172,9 +172,10 @@ namespace FineUIPro.Web.HSSE.QualityAudit
if (!string.IsNullOrWhiteSpace(subUnitQuality.QualityId)) if (!string.IsNullOrWhiteSpace(subUnitQuality.QualityId))
{ {
this.drpUnitQualityBox.Value = subUnitQuality.QualityId; this.drpUnitQualityBox.Value = subUnitQuality.QualityId;
this.radUnitQuality.SelectedValueArray = subUnitQuality.QualityId.Split(',');
} }
this.txtBusinessLicense.Text = subUnitQuality.SubUnitQualityName; this.txtBusinessLicense.Text = subUnitQuality.BusinessLicense;
this.txtBL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.BL_EnableDate); this.txtBL_EnableDate.Text = string.Format("{0:yyyy-MM-dd}", subUnitQuality.BL_EnableDate);
this.BL_ScanUrl = subUnitQuality.BL_ScanUrl; this.BL_ScanUrl = subUnitQuality.BL_ScanUrl;
this.divBL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.BL_ScanUrl); this.divBL_ScanUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.BL_ScanUrl);

9
SGGL/FineUIPro.Web/JDGL/Check/WeekPlan.aspx
View File

@ -101,13 +101,8 @@
<f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" TitleToolTip="下周计划" <f:Tab ID="Tab2" Title="下周计划" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" TitleToolTip="下周计划"
runat="server"> runat="server">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="周进度计划" EnableCollapse="true" <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" Height="500px" PageSize="1000"
runat="server" BoxFlex="1" DataKeyNames="WeekPlanId" AllowCellEditing="true" ForceFit="true" Height="500px" DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1">
ClicksToEdit="1" DataIDField="WeekPlanId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" EnableColumnLines="true"
PageSize="1000"
AllowFilters="true" EnableTextSelection="True">
<Columns> <Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False"> EnableLock="true" Locked="False">

18
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl> <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-09-23T08:44:57.4175593Z||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;</History> <History>True|2025-09-23T08:56:39.6344263Z||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>09/23/2025 16:44:55</publishTime> <publishTime>09/23/2025 16:56:37</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>09/23/2025 16:44:55</publishTime> <publishTime>09/23/2025 16:56:37</publishTime>
</File> </File>
<File Include="bin/Aspose.Words.dll"> <File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime> <publishTime>12/06/2024 20:13:58</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>09/23/2025 16:44:21</publishTime> <publishTime>09/23/2025 16:56:26</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime> <publishTime>12/26/2024 09:46:52</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>09/23/2025 16:44:21</publishTime> <publishTime>09/23/2025 16:56:26</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime> <publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime> <publishTime>02/09/2013 00:42:28</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>09/23/2025 16:44:45</publishTime> <publishTime>09/23/2025 16:56:27</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>09/23/2025 16:44:45</publishTime> <publishTime>09/23/2025 16:56:27</publishTime>
</File> </File>
<File Include="bin/WebAPI.xml"> <File Include="bin/WebAPI.xml">
<publishTime>09/23/2025 16:44:45</publishTime> <publishTime>09/23/2025 16:56:27</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime> <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>09/23/2025 16:44:46</publishTime> <publishTime>09/23/2025 16:56:28</publishTime>
</File> </File>
<File Include="Scripts/bootstrap.js"> <File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>