lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/AttachFile/EditOffice.aspx.cs
+9 -16
View File
@@ -1,26 +1,19 @@
using BLL;
using FineUIPro;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WordEdit
{
public partial class EditOffice : System.Web.UI.Page
{
public string url;
protected void Page_Load(object sender, EventArgs e)
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
if (!IsPostBack)
{
string cmd= Request.QueryString["cmd"];
string cmd = Request.QueryString["cmd"];
var a = cmd.Split('|');
if (a[1] == "CQMSMainPlan")
{
@@ -28,19 +21,19 @@ namespace WordEdit
string filepath = model.FilePath;
url = Funs.SGGLUrl + filepath;
}
else if (a[1]== "CQMSSubPlan")
else if (a[1] == "CQMSSubPlan")
{
var model = BLL.CQMS_SubPlanService.GetSubPlanBySubPlanId(a[0]);
string filepath = model.FilePath;
url = Funs.SGGLUrl + filepath;
}
else if (a[1]== "Companytemplate")
else if (a[1] == "Companytemplate")
{
var model = BLL.Base_CompanytemplateService.GetBase_CompanyTemplateById(a[0]);
string filepath = model.FilePath;
url = Funs.SGGLUrl + filepath;
}
else if (a[1]== "CQMS_Check_MaterialAcceptance")
else if (a[1] == "CQMS_Check_MaterialAcceptance")
{
var model = BLL.CheckMaterialacceptanceService.GetCheck_MaterialAcceptanceById(a[0]);
string filepath = model.FilePath;
@@ -52,6 +45,6 @@ namespace WordEdit
}
}
}
SGGL/FineUIPro.Web/AttachFile/IndexOffice.aspx.cs
-5
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WordEdit
{
SGGL/FineUIPro.Web/AttachFile/Look.aspx.cs
+6 -6
View File
@@ -14,21 +14,21 @@ namespace FineUIPro.Web.AttachFile
var url = Request.Params["fileUrl"];
var Baseurl = "https://view.officeapps.live.com/op/embed.aspx?src=";
// var Baseurl = "https://view.xdocin.com/view?src=";
// var Baseurl = "https://view.xdocin.com/view?src=";
var Fileurl = Funs.SGGLUrl + url.Replace(Funs.RootPath, "");
var newurl = "";
var FiletExtension = Path.GetExtension(url);
if (FiletExtension == ".docx" || FiletExtension == ".doc"|| FiletExtension == ".xls" || FiletExtension == ".xlsx")
if (FiletExtension == ".docx" || FiletExtension == ".doc" || FiletExtension == ".xls" || FiletExtension == ".xlsx")
{
newurl = Baseurl + Fileurl;
}
else if (FiletExtension == ".txt"|| FiletExtension== "pdf")
else if (FiletExtension == ".txt" || FiletExtension == "pdf")
{
newurl = Fileurl;
}
else
{
newurl = Fileurl;
else
{
newurl = Fileurl;
}
this.LookHtml.Src = newurl;
SGGL/FineUIPro.Web/AttachFile/LookPic.aspx.cs
-1
View File
@@ -1,6 +1,5 @@
using BLL;
using System;
using System.IO;
namespace FineUIPro.Web.AttachFile
{
SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx.cs
+2 -5
View File
@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
using BLL;
using System;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.AttachFile
{
SGGL/FineUIPro.Web/AttachFile/fileupload.ashx.cs
+2 -2
View File
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.AttachFile
// 文件名完整路径
string fileName = postedFile.FileName;
// 文件名保存的服务器路径
string savedFileName = GetSavedFileName(fileName,owner).Replace('#', '-'); ;
string savedFileName = GetSavedFileName(fileName, owner).Replace('#', '-'); ;
postedFile.SaveAs(context.Server.MapPath("~/" + attachPath + "/" + savedFileName));
string shortFileName = GetFileName(fileName);
@@ -123,7 +123,7 @@ namespace FineUIPro.Web.AttachFile
return shortFileName;
}
private string GetSavedFileName(string fileName,string owner)
private string GetSavedFileName(string fileName, string owner)
{
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
if (!owner.Contains("DocAttachUrl"))
SGGL/FineUIPro.Web/AttachFile/save.aspx.cs
+5 -11
View File
@@ -1,17 +1,11 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WordEdit
{
public partial class save : System.Web.UI.Page
{
//参数savetype定义要另存的文档格式office,html,pdf
//参数filetype定义要保存的文档的文件内型
public string savetype, filetype, fid, title, fother, fname, fname1;
@@ -43,7 +37,7 @@ namespace WordEdit
case "1":
saveoffice();
break;
default:
saveoffice();
break;
@@ -54,7 +48,7 @@ namespace WordEdit
public void saveoffice()
{
string uploadoffiepath = Server.MapPath("~/");//上传文件的路径
// string uploadoffiepath = filepath;//上传文件的路径
// string uploadoffiepath = filepath;//上传文件的路径
string attpath = Server.MapPath(attachpath);//上传附件文件路径
System.Web.HttpFileCollection uploadFiles = Request.Files;
@@ -72,11 +66,11 @@ namespace WordEdit
// theFile.SaveAs(uploadoffiepath + @"\" + fname);
var path = theFile.FileName.Replace(Funs.SGGLUrl, "");
theFile.SaveAs(uploadoffiepath + path);
}
}
}
}
SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
+2 -2
View File
@@ -538,7 +538,7 @@ namespace FineUIPro.Web.AttachFile
List<string> lists = Funs.GetStrListByStr(ToKeyId, ',');
sours = (from x in Funs.DB.AttachFile where lists.Contains(x.ToKeyId) select x).ToList();
string attachSource = string.Empty;
if (sours.Count>0)
if (sours.Count > 0)
{
foreach (var sour in sours)
{
@@ -562,7 +562,7 @@ namespace FineUIPro.Web.AttachFile
}
}
}
}
if (!string.IsNullOrEmpty(attachSource))
{
SGGL/FineUIPro.Web/BaseInfo/BaseFactory.aspx.cs
-5
View File
@@ -1,11 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs
+5 -10
View File
@@ -1,15 +1,10 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
{
public partial class BaseFactoryEdit: PageBase
public partial class BaseFactoryEdit : PageBase
{
#region
/// <summary>
@@ -32,7 +27,7 @@ namespace FineUIPro.Web.BaseInfo
{
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法
this.GetButtonPower();
this.FactoryId = Request.Params["FactoryId"];
@@ -68,7 +63,7 @@ namespace FineUIPro.Web.BaseInfo
table.FactoryCode = this.txtFactoryCode.Text;
table.FactoryName = this.txtFactoryName.Text;
table.Address = this.txtAddress.Text;
table.MapCoordinates=this.txtMapCoordinates.Text;
table.MapCoordinates = this.txtMapCoordinates.Text;
if (string.IsNullOrEmpty(this.FactoryId))
{
table.FactoryId = SQLHelper.GetNewID(typeof(Model.Base_Factory));
@@ -86,9 +81,9 @@ namespace FineUIPro.Web.BaseInfo
{
bool result = true;
var model = BLL.Base_FactoryService.GetBase_FactoryByCode(this.txtFactoryCode.Text);
if(model != null && model.FactoryId !=this.FactoryId)
if (model != null && model.FactoryId != this.FactoryId)
{
result=false;
result = false;
}
return result;
}
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
+5 -7
View File
@@ -1,10 +1,8 @@
using System;
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.BaseInfo
{
@@ -153,7 +151,7 @@ namespace FineUIPro.Web.BaseInfo
BindGrid();
PageContext.RegisterStartupScript("onNewButtonClick();");
}
}
}
#endregion
#region 编辑
@@ -266,7 +264,7 @@ namespace FineUIPro.Web.BaseInfo
var q = Funs.DB.Base_Certificate.FirstOrDefault(x => x.CertificateCode == this.txtCertificateCode.Text.Trim() && (x.CertificateId != hfFormID.Text || (hfFormID.Text == null && x.CertificateId != null)));
if (q != null)
{
isok = false;
isok = false;
ShowNotify("输入的证书编号已存在！", MessageBoxIcon.Warning);
}
@@ -327,7 +325,7 @@ namespace FineUIPro.Web.BaseInfo
if (doplist != null)
{
name = doplist.Text;
}
}
}
return name;
}
SGGL/FineUIPro.Web/BaseInfo/CheckTemplate.aspx.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using BLL;
using System;
using System.Text;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
{
@@ -25,8 +23,8 @@ namespace FineUIPro.Web.BaseInfo
/// 绑定数据
/// </summary>
private void BindGrid()
{
var tb = BLL.CheckTemplateService.getListData( Grid1);
{
var tb = BLL.CheckTemplateService.getListData(Grid1);
Grid1.RecordCount = CheckTemplateService.count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
SGGL/FineUIPro.Web/BaseInfo/CheckTemplateEdit.aspx.cs
+4 -4
View File
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.BaseInfo
{
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法
this.GetButtonPower();
this.CheckTemplateID = Request.Params["CheckTemplateID"];
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.BaseInfo
}
else
{
this.txtIndexs.Text= ((Funs.DB.ProjectSupervision_CheckTemplate.Max(x => x.Indexs) ?? 0) + 1).ToString();
this.txtIndexs.Text = ((Funs.DB.ProjectSupervision_CheckTemplate.Max(x => x.Indexs) ?? 0) + 1).ToString();
}
}
}
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.BaseInfo
Model.ProjectSupervision_CheckTemplate newCheckTemplate = new Model.ProjectSupervision_CheckTemplate
{
ID = this.CheckTemplateID,
SortIndex = Funs.GetNewInt( this.txtSortIndex.Text),
SortIndex = Funs.GetNewInt(this.txtSortIndex.Text),
CheckItem = this.txtCheckItem.Text.Trim(),
CheckStandard = this.txtCheckStandard.Text.Trim(),
CheckMethod = this.txtCheckMethod.Text.Trim(),
@@ -83,7 +83,7 @@ namespace FineUIPro.Web.BaseInfo
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
SGGL/FineUIPro.Web/BaseInfo/CompanyModel.aspx.cs
-2
View File
@@ -1,8 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
SGGL/FineUIPro.Web/BaseInfo/CompanyModelEdit.aspx.cs
+2 -5
View File
@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
using BLL;
using System;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.BaseInfo
{
SGGL/FineUIPro.Web/BaseInfo/CompanyModelKind.aspx.cs
-2
View File
@@ -1,8 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
SGGL/FineUIPro.Web/BaseInfo/CompanyModelKindEdit.aspx.cs
+2 -8
View File
@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using BLL;
using System;
namespace FineUIPro.Web.BaseInfo
{
SGGL/FineUIPro.Web/BaseInfo/Companytemplate.aspx.cs
+1 -5
View File
@@ -1,11 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using AspNet=System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
{
SGGL/FineUIPro.Web/BaseInfo/CompanytemplateEdit.aspx.cs
+2 -6
View File
@@ -1,11 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.BaseInfo
{
@@ -66,7 +62,7 @@ namespace FineUIPro.Web.BaseInfo
private bool Save()
{
bool result=true;
bool result = true;
var q = BLL.Base_CompanytemplateService.GetBase_CompanyTemplateByCode(this.txtCode.Text);
if (q != null && q.TemplateId != this.TemplateId)
{
@@ -110,7 +106,7 @@ namespace FineUIPro.Web.BaseInfo
return result;
}
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.cs
+3 -3
View File
@@ -59,12 +59,12 @@ namespace FineUIPro.Web.BaseInfo
{
DataRow row = table.NewRow();
row[0] = item.CostTypeId;
row[1] ="-1";
row[1] = "-1";
row[2] = item.CostTypeCode;
row[3] = item.CostTypeCode+ item.CostTypeName;
row[3] = item.CostTypeCode + item.CostTypeName;
row[4] = item.Remark;
table.Rows.Add(row);
var getU = Funs.DB.Base_CostTypeItem.Where(x => x.CostTypeId == item.CostTypeId).OrderBy(x=>x.SortIndex);
var getU = Funs.DB.Base_CostTypeItem.Where(x => x.CostTypeId == item.CostTypeId).OrderBy(x => x.SortIndex);
foreach (var itemU in getU)
{
DataRow rowC = table.NewRow();
SGGL/FineUIPro.Web/BaseInfo/CostTypeEdit.aspx.cs
+1 -1
View File
@@ -73,7 +73,7 @@ namespace FineUIPro.Web.BaseInfo
Model.Base_CostType title = new Model.Base_CostType();
title.CostTypeCode = Funs.GetNewIntOrZero(this.txtCostTypeCode.Text.Trim());
title.CostTypeName = this.txtCostTypeName.Text.Trim();
title.Remark = this.txtRemark.Text.Trim();
title.Remark = this.txtRemark.Text.Trim();
if (string.IsNullOrEmpty(this.CostTypeId))
{
this.CostTypeId = SQLHelper.GetNewID(typeof(Model.Base_CostType));
SGGL/FineUIPro.Web/BaseInfo/CostTypeItemEdit.aspx.cs
+1 -2
View File
@@ -1,6 +1,5 @@
using BLL;
using System;
using System.Linq;
namespace FineUIPro.Web.BaseInfo
{
@@ -49,7 +48,7 @@ namespace FineUIPro.Web.BaseInfo
}
else
{
}
}
}
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
-3
View File
@@ -1,11 +1,8 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
-3
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.HSSE.EduTrain;
using Model;
using System;
using System.Collections.Generic;
@@ -7,8 +6,6 @@ using System.Data;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.cs
+3 -7
View File
@@ -1,13 +1,9 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
@@ -68,7 +64,7 @@ namespace FineUIPro.Web.CLGL
var fileName = rootPath + initPath + hdFileName.Text;
ResponeData responeData;
responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName,fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
responeData = TwInOutplanmasterService.ImportData(fuAttachUrl.FileName, fileName, this.CurrUser.LoginProjectId, this.CurrUser.PersonId);
if (responeData.code == 1)
@@ -81,8 +77,8 @@ namespace FineUIPro.Web.CLGL
Alert alert = new Alert();
alert.Message = responeData.message;
alert.MessageBoxIcon = MessageBoxIcon.Error;
alert.Show();
}
alert.Show();
}
}
#endregion
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
+1 -3
View File
@@ -3,8 +3,6 @@ using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
@@ -93,7 +91,7 @@ namespace FineUIPro.Web.CLGL
model.WarehouseMan = this.CurrUser.PersonId;
model.WarehouseDate = DateTime.Now;
TwInOutplanmasterService.Update(model);
TwInputmasterService.GenInMasterByPlanId(Id, SaveDetail(Id),txtRemark.Text);
TwInputmasterService.GenInMasterByPlanId(Id, SaveDetail(Id), txtRemark.Text);
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
+11 -13
View File
@@ -1,16 +1,14 @@
using BLL;
using MiniExcelLibs;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.CLGL
{
@@ -54,7 +52,7 @@ namespace FineUIPro.Web.CLGL
if (drpTypeInt.SelectedValue != Const._Null)
{
table.TypeInt = Convert.ToInt32(drpTypeInt.SelectedValue);
}
}
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
@@ -79,12 +77,12 @@ namespace FineUIPro.Web.CLGL
for (int i = 0; i < Grid2.Rows.Count; i++)
{
var model = Grid2.Rows[i].DataItem as Model.Tw_InOutDetailOutput;
planNumTotal += (model.PlanNum ??0m );
actNumTotal += (model.ActNum ??0m );
planNumTotal += (model.PlanNum ?? 0m);
actNumTotal += (model.ActNum ?? 0m);
if (model.ActNum != model.PlanNum)
{
Grid2.Rows[i].RowCssClass = "red";
}
}
}
JObject summary = new JObject();
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.CLGL
Grid2.SummaryData = summary;
}
}
#endregion
#region GV 数据操作
@@ -208,7 +206,7 @@ namespace FineUIPro.Web.CLGL
BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
}
#endregion
#region 关闭弹出窗
@@ -256,9 +254,9 @@ namespace FineUIPro.Web.CLGL
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIDArray.Length>0)
if (Grid1.SelectedRowIDArray.Length > 0)
{
var printModel= TwInputdetailService.GePrintListByInputMasterIds(Grid1.SelectedRowIDArray.ToList());
var printModel = TwInputdetailService.GePrintListByInputMasterIds(Grid1.SelectedRowIDArray.ToList());
string path = Funs.RootPath + @"File\Excel\Temp\InputDetail.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
@@ -275,7 +273,7 @@ namespace FineUIPro.Web.CLGL
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Close();
File.Delete(path);
}
}
}
/// <summary>
@@ -342,7 +340,7 @@ namespace FineUIPro.Web.CLGL
List<Model.Tw_PrintMaster> tw_PrintMasters = new List<Model.Tw_PrintMaster>();
List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
{
ReqUnitName = UnitService.GetUnitNameByUnitId(Person_PersonsService.GetPerson_PersonsById(result.CreateMan).UnitId),
CusBillCode = result.CusBillCode,
SGGL/FineUIPro.Web/CLGL/InputMasterEdit.aspx.cs
-5
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx.cs
+3 -8
View File
@@ -1,11 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
@@ -35,10 +30,10 @@ namespace FineUIPro.Web.CLGL
{
Model.Tw_MaterialStockOutput table = new Model.Tw_MaterialStockOutput();
table.PipeLineMatCode = txtMatCode.Text.Trim();
if (drpWarehouse.SelectedValue!= Const._Null)
if (drpWarehouse.SelectedValue != Const._Null)
{
table.WarehouseCode = drpWarehouse.SelectedValue;
}
}
table.ProjectId = this.CurrUser.LoginProjectId;
var tb = BLL.TwMaterialstockService.GetListData(table, Grid1);
Grid1.RecordCount = TwMaterialstockService.Count;
@@ -172,7 +167,7 @@ namespace FineUIPro.Web.CLGL
}
#endregion
#region 导出按钮
/// 导出按钮
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs
+21 -31
View File
@@ -1,21 +1,11 @@
using Apache.NMS.ActiveMQ.Threads;
using BLL;
using FineUIPro.Web.HSSE.EduTrain;
using FineUIPro.Web.ProjectData;
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
namespace FineUIPro.Web.CLGL
{
@@ -37,7 +27,7 @@ namespace FineUIPro.Web.CLGL
private void InitDrpList()
{
{
drpWarehouse.DataTextField = "Text";
drpWarehouse.DataValueField = "Value";
drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
@@ -116,7 +106,7 @@ namespace FineUIPro.Web.CLGL
if (inOutPlanMasterModel != null)
{
if (inOutPlanMasterModel.State== (int)TwConst.State.已完成|| inOutPlanMasterModel.State == (int)TwConst.State.已审核)
if (inOutPlanMasterModel.State == (int)TwConst.State.已完成 || inOutPlanMasterModel.State == (int)TwConst.State.已审核)
{
TabStrip2.Hidden = true;
TabStrip3.Hidden = false;
@@ -143,9 +133,9 @@ namespace FineUIPro.Web.CLGL
}
}
}
#endregion
@@ -213,11 +203,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork1)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName ;
tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
@@ -227,11 +217,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork2)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName ;
tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
@@ -330,7 +320,7 @@ namespace FineUIPro.Web.CLGL
MaterialDef = y.MaterialDef,
MaterialSpec = y.MaterialSpec,
MaterialUnit = y.MaterialUnit,
PlanNum = (x.Number ??0).ToString(),
PlanNum = (x.Number ?? 0).ToString(),
UnitWorkName = m.UnitWorkName,
}).ToList();
var UnitWorkName = tw_PrintDetailRelation.FirstOrDefault()?.UnitWorkName;
@@ -441,7 +431,7 @@ namespace FineUIPro.Web.CLGL
else
{
BLL.TwInOutplanmasterService.DeleteById(rowID);
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
@@ -455,7 +445,7 @@ namespace FineUIPro.Web.CLGL
}
protected void btnGenInOutMaster_Click(object sender, EventArgs e)
{
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
@@ -485,7 +475,7 @@ namespace FineUIPro.Web.CLGL
}
string planId = Grid1.SelectedRowID;
string message = TwOutputmasterService.RevokeGenOutMasterByPlanId(planId);
if (string .IsNullOrEmpty(message))
if (string.IsNullOrEmpty(message))
{
ShowNotify("撤销出库成功!", MessageBoxIcon.Success);
BindGrid();
@@ -495,7 +485,7 @@ namespace FineUIPro.Web.CLGL
Alert.ShowInTop(message, MessageBoxIcon.Warning);
return;
}
}
}
@@ -506,9 +496,9 @@ namespace FineUIPro.Web.CLGL
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string planId = Grid1.SelectedRowID;
string planId = Grid1.SelectedRowID;
var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
if (planMaster.State == (int)TwConst.State.待提交 &&( planMaster.TypeInt == (int)TwConst.TypeInt.散件出库 || planMaster.TypeInt == (int)TwConst.TypeInt.其他出库))
if (planMaster.State == (int)TwConst.State.待提交 && (planMaster.TypeInt == (int)TwConst.TypeInt.散件出库 || planMaster.TypeInt == (int)TwConst.TypeInt.其他出库))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?UnitWorkId={0}&Id={1} ", tvControlItem.SelectedNodeID, planId, "新增 - ")));
@@ -517,7 +507,7 @@ namespace FineUIPro.Web.CLGL
{
Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
return;
return;
}
}
@@ -559,7 +549,7 @@ namespace FineUIPro.Web.CLGL
{
Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
return;
}
}
else
{
if (string.IsNullOrEmpty(planMaster.AuditMan))
@@ -609,12 +599,12 @@ namespace FineUIPro.Web.CLGL
{
if (this.TabStrip1.ActiveTabIndex == 0)
{
}
else if (this.TabStrip1.ActiveTabIndex == 1)
{
}
}
@@ -700,6 +690,6 @@ namespace FineUIPro.Web.CLGL
#endregion
}
}
SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs
+44 -44
View File
@@ -7,7 +7,7 @@ using System.Linq;
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterEdit :PageBase
public partial class OutPlanMasterEdit : PageBase
{
/// <summary>
/// 单位工程主键
@@ -44,12 +44,12 @@ namespace FineUIPro.Web.CLGL
if (!string.IsNullOrEmpty(Id))
{
var queryModel = new Model.Tw_InOutMasterOutput()
{
Id=Id,
};
{
Id = Id,
};
var result = BLL.TwInOutplanmasterService.GetListData(queryModel).FirstOrDefault();
if (!string .IsNullOrEmpty(result.WeldTaskId) && result.WeldTaskId.Contains("|"))
if (!string.IsNullOrEmpty(result.WeldTaskId) && result.WeldTaskId.Contains("|"))
{
UnitWorkId = result.WeldTaskId.Split('|')[0];
@@ -59,9 +59,9 @@ namespace FineUIPro.Web.CLGL
UnitWorkId = result.WeldTaskId;
}
txtCreateMan.Text = result.CreateManName;
txtCreateDate.Text =result.CreateDate.Value.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = result.ReqUnitId;
drpTypeInt.SelectedValue = result.TypeInt.ToString();
txtCreateDate.Text = result.CreateDate.Value.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = result.ReqUnitId;
drpTypeInt.SelectedValue = result.TypeInt.ToString();
drpWarehouse.SelectedValue = result.WarehouseCode;
drpCategory.SelectedValue = result.Category.ToString();
txtRemark.Text = result.Remark;
@@ -75,7 +75,7 @@ namespace FineUIPro.Web.CLGL
txtCreateMan.Text = this.CurrUser.PersonName;
txtCreateDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
drpReqUnit.SelectedValue = this.CurrUser.UnitId;
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(drpReqUnit.SelectedValue)?.UnitCode, UnitWorkService.getUnitWorkByUnitWorkId(UnitWorkId)?.UnitWorkCode,drpTypeInt.SelectedText, drpCategory.SelectedText);
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(drpReqUnit.SelectedValue)?.UnitCode, UnitWorkService.getUnitWorkByUnitWorkId(UnitWorkId)?.UnitWorkCode, drpTypeInt.SelectedText, drpCategory.SelectedText);
}
drpTypeInt_SelectedIndexChanged(null, null);
@@ -88,13 +88,13 @@ namespace FineUIPro.Web.CLGL
drpWarehouse.DataTextField = "Text";
drpWarehouse.DataValueField = "Value";
drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
drpWarehouse.DataBind();
drpWarehouse.DataBind();
string[] typeIntArr = { TwConst.TypeInt.散件出库.ToString(), TwConst.TypeInt.其他出库.ToString() };
drpTypeInt.DataTextField = "Key";
drpTypeInt.DataValueField = "Value";
drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => typeIntArr.Contains(x.Key));
drpTypeInt.DataBind();
drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => typeIntArr.Contains(x.Key));
drpTypeInt.DataBind();
UnitService.InitUnitDropDownList(drpReqUnit, this.CurrUser.LoginProjectId, true);
drpCategory.DataTextField = "Key";
@@ -111,7 +111,7 @@ namespace FineUIPro.Web.CLGL
queryRelationModel.InOutPlanMasterId = Id;
var tb = TwInoutplandetailRelationService.GetListData(queryRelationModel, Grid1);
Grid1.DataSource = tb;
Grid1.DataBind();
Grid1.DataBind();
}
else
{
@@ -119,9 +119,9 @@ namespace FineUIPro.Web.CLGL
queryRelationModel.InOutPlanMasterId = Id;
var tb = TwInOutplandetailService.GetListData(queryRelationModel, Grid1);
Grid2.DataSource = tb;
Grid2.DataBind();
Grid2.DataBind();
}
}
#region 选择按钮
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.CLGL
protected void btnSelect_Click(object sender, EventArgs e)
{
Save(Const.BtnSave);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterSelect.aspx?UnitWorkId={0}&Id={1}",UnitWorkId,Id, "选择- ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterSelect.aspx?UnitWorkId={0}&Id={1}", UnitWorkId, Id, "选择- ")));
}
protected void btnSelectStock_Click(object sender, EventArgs e)
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.CLGL
protected void btnSubmit_Click(object sender, EventArgs e)
{
Save(Const.BtnSubmit);
Save(Const.BtnSubmit);
ShowNotify("提交成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.CLGL
switch (type)
{
case Const.BtnSave:
state=(int)TwConst.State.待提交;
state = (int)TwConst.State.待提交;
break;
case Const.BtnSubmit:
state = (int)TwConst.State.待审核;
@@ -176,32 +176,32 @@ namespace FineUIPro.Web.CLGL
var model = new Tw_InOutPlanMaster()
{
Id = Id,
ProjectId=this.CurrUser.LoginProjectId,
CusBillCode=txtCusBillCode.Text,
WarehouseCode = drpWarehouse.SelectedValue,
WeldTaskId=UnitWorkId,
Source=1,
ProjectId = this.CurrUser.LoginProjectId,
CusBillCode = txtCusBillCode.Text,
WarehouseCode = drpWarehouse.SelectedValue,
WeldTaskId = UnitWorkId,
Source = 1,
CreateDate = DateTime.Now,
CreateMan = this.CurrUser.PersonId,
ReqUnitId = drpReqUnit.SelectedValue,
TypeInt = int.Parse( drpTypeInt.SelectedValue),
Remark = txtRemark.Text,
InOutType=(int)TwConst.InOutType.出库,
Category= int.Parse(drpCategory.SelectedValue),
State=state
ReqUnitId = drpReqUnit.SelectedValue,
TypeInt = int.Parse(drpTypeInt.SelectedValue),
Remark = txtRemark.Text,
InOutType = (int)TwConst.InOutType.出库,
Category = int.Parse(drpCategory.SelectedValue),
State = state
};
TwInOutplanmasterService.Add(model);
}
else
{
var model = TwInOutplanmasterService.GetById(Id);
var model = TwInOutplanmasterService.GetById(Id);
model.CusBillCode = txtCusBillCode.Text;
model.WarehouseCode = drpWarehouse.SelectedValue;
// model.WeldTaskId = UnitWorkId;
// model.WeldTaskId = UnitWorkId;
model.Source = 1;
model.CreateDate = DateTime.Now;
model.CreateMan = this.CurrUser.PersonId;
model.ReqUnitId = drpReqUnit.SelectedValue;
model.CreateMan = this.CurrUser.PersonId;
model.ReqUnitId = drpReqUnit.SelectedValue;
model.TypeInt = int.Parse(drpTypeInt.SelectedValue);
model.Remark = txtRemark.Text;
model.InOutType = (int)TwConst.InOutType.出库;
@@ -225,7 +225,7 @@ namespace FineUIPro.Web.CLGL
/// </summary>
private void SaveDetail_Relation()
{
//根据列表中的明细项添加
List<Model.Tw_InOutPlanDetail_Relation> detailLists = new List<Model.Tw_InOutPlanDetail_Relation>();
JArray teamGroupData = Grid1.GetMergedData();
@@ -233,14 +233,14 @@ namespace FineUIPro.Web.CLGL
{
JObject values = teamGroupRow.Value<JObject>("values");
int rowIndex = teamGroupRow.Value<int>("index");
string id = teamGroupRow.Value<string>("id");
string id = teamGroupRow.Value<string>("id");
var mdoel=TwInoutplandetailRelationService.GetById(id);
var mdoel = TwInoutplandetailRelationService.GetById(id);
if (mdoel != null)
{
mdoel.Number= values.Value<decimal>("Number");
mdoel.Number = values.Value<decimal>("Number");
}
TwInoutplandetailRelationService.Update(mdoel);
TwInoutplandetailRelationService.Update(mdoel);
}
TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id);
@@ -263,12 +263,12 @@ namespace FineUIPro.Web.CLGL
mdoel.PlanNum = values.Value<decimal>("PlanNum");
}
TwInOutplandetailService.Update(mdoel);
}
}
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "delete" )
if (e.CommandName == "delete")
{
string id = e.RowID;
TwInoutplandetailRelationService.DeleteById(id);
@@ -296,10 +296,10 @@ namespace FineUIPro.Web.CLGL
{
txtCusBillCode.Text = TwInOutplanmasterService.GetDataInCusBillCode(this.CurrUser.LoginProjectId, UnitService.GetUnitByUnitId(drpReqUnit.SelectedValue)?.UnitCode, drpTypeInt.SelectedText, UnitWorkService.getUnitWorkByUnitWorkId(UnitWorkId)?.UnitWorkCode, drpCategory.SelectedText);
}
if (drpTypeInt.SelectedValue ==((int)TwConst.TypeInt.散件出库).ToString())
if (drpTypeInt.SelectedValue == ((int)TwConst.TypeInt.散件出库).ToString())
{
Grid1.Hidden=false;
Grid2.Hidden=true;
Grid1.Hidden = false;
Grid2.Hidden = true;
}
else
SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs
+19 -23
View File
@@ -1,13 +1,9 @@
using System;
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using FineUIPro.Web.HSSE.EduTrain;
using Model;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.CLGL
{
@@ -43,18 +39,18 @@ namespace FineUIPro.Web.CLGL
txtWeldTaskCode.Text = model.WeldTaskCode;
var queryModel = new Model.Tw_InOutDetailOutput()
{
InOutPlanMasterId = Id
{
InOutPlanMasterId = Id
};
var detailList= TwInOutplandetailService.GetByModle(queryModel).ToList();
foreach (var item in detailList)
{
item.ActNum=item.PlanNum;
}
Grid1.DataSource=detailList;
Grid1.DataBind();
};
var detailList = TwInOutplandetailService.GetByModle(queryModel).ToList();
foreach (var item in detailList)
{
item.ActNum = item.PlanNum;
}
Grid1.DataSource = detailList;
Grid1.DataBind();
}
}
@@ -62,9 +58,9 @@ namespace FineUIPro.Web.CLGL
/// <summary>
/// 保存明细项
/// </summary>
private List<Model.Tw_OutputDetail> SaveDetail(string InOutPlanMasterId)
private List<Model.Tw_OutputDetail> SaveDetail(string InOutPlanMasterId)
{
//根据列表中的明细项添加
List<Model.Tw_OutputDetail> detailLists = new List<Model.Tw_OutputDetail>();
JArray teamGroupData = Grid1.GetMergedData();
@@ -79,11 +75,11 @@ namespace FineUIPro.Web.CLGL
//ProNoticeCId= values.Value<string>("ProNoticeCId"),
MaterialCode = values.Value<string>("MaterialCode"),
PlanNum = values.Value<decimal>("PlanNum"),
ActNum = values.Value<decimal>("ActNum"),
ActNum = values.Value<decimal>("ActNum"),
};
detailLists.Add(newDetail);
}
}
return detailLists;
}
protected void btnEditProcess_Click(object sender, EventArgs e)
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs
+12 -15
View File
@@ -1,9 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
@@ -52,7 +49,7 @@ namespace FineUIPro.Web.CLGL
{
if (!IsPostBack)
{
UnitWorkId=Request.QueryString["UnitWorkId"];
UnitWorkId = Request.QueryString["UnitWorkId"];
Id = Request.QueryString["Id"];
this.InitTreeMenu();//加载树
InitDropList();
@@ -124,7 +121,7 @@ namespace FineUIPro.Web.CLGL
foreach (var item in pipeline)
{
TreeNode newNode = new TreeNode();
//bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId);
//if (istrue)
//{
@@ -214,10 +211,10 @@ namespace FineUIPro.Web.CLGL
// 确保 SelectedNodeID 不为空
if (this.tvControlItem.SelectedNodeID == null)
{
return; // 或者显示一个提示
}
int Category=(int)TwInOutplanmasterService.GetById(Id).Category;
int Category = (int)TwInOutplanmasterService.GetById(Id).Category;
var tb = (from x in Funs.DB.HJGL_PipeLineMat
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
join z in Funs.DB.Tw_MaterialStock on x.MaterialCode equals z.PipeLineMatCode into zz
@@ -227,9 +224,9 @@ namespace FineUIPro.Web.CLGL
&& z.ProjectId == this.CurrUser.LoginProjectId
&& y.UnitWorkId == this.UnitWorkId
&& y.PipelineId == this.tvControlItem.SelectedNodeID
&& (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="")
&& (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
select new
{
@@ -240,12 +237,12 @@ namespace FineUIPro.Web.CLGL
lib.MaterialSpec,
lib.MaterialUnit,
PlanNum = x.Number,
StockNum=z.StockNum??0,
StockNum = z.StockNum ?? 0,
x.IsLooseParts,
}).ToList();
if (Category == (int)TwConst.Category.管段)
{
tb=tb.Where(x=>x.MaterialUnit.Contains("米")).ToList();
tb = tb.Where(x => x.MaterialUnit.Contains("米")).ToList();
}
else
{
@@ -253,8 +250,8 @@ namespace FineUIPro.Web.CLGL
}
var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation
//where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
//where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID
where x.PipelineId == this.tvControlItem.SelectedNodeID
&& (x.PrefabricatedComponents == null || x.PrefabricatedComponents == "")
select x).ToList();
@@ -262,7 +259,7 @@ namespace FineUIPro.Web.CLGL
tb = (from x in tb
join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy
from y in yy.DefaultIfEmpty()
where y == null
where y == null
select x).ToList();
@@ -353,7 +350,7 @@ namespace FineUIPro.Web.CLGL
}
}
}
}
TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id);
}
SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelectStock.aspx.cs
+6 -12
View File
@@ -1,17 +1,11 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
public partial class OutPlanMasterSelectStock : PageBase
{
{
public string Id
{
get
@@ -26,7 +20,7 @@ namespace FineUIPro.Web.CLGL
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
{
Id = Request.QueryString["Id"];
// 绑定表格
this.BindGrid();
@@ -39,7 +33,7 @@ namespace FineUIPro.Web.CLGL
/// </summary>
private void BindGrid()
{
var inoutplanmaster = TwInOutplanmasterService.GetById(Id);
if (inoutplanmaster == null)
{
@@ -58,9 +52,9 @@ namespace FineUIPro.Web.CLGL
else if (inoutplanmaster.Category == (int)TwConst.Category.管件)
{
table.MaterialUnit = "个";
}
var tb = BLL.TwMaterialstockService.GetListData(table, Grid1);
Grid1.RecordCount = TwMaterialstockService.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
@@ -109,7 +103,7 @@ namespace FineUIPro.Web.CLGL
PlanNum = 0,
};
TwInOutplandetailService.Add(tw_InOutPlanDetail);
}
}
}
}
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx.cs
+18 -20
View File
@@ -1,4 +1,5 @@
using BLL;
using MiniExcelLibs;
using Model;
using System;
using System.Collections.Generic;
@@ -8,10 +9,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using MiniExcelLibs;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.CLGL
{
@@ -82,9 +80,9 @@ namespace FineUIPro.Web.CLGL
table.WarehouseCode = drpWarehouse.SelectedValue;
}
if (!string .IsNullOrEmpty(tvControlItem.SelectedNodeID))
if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
{
table.UnitWorkId=tvControlItem.SelectedNodeID;
table.UnitWorkId = tvControlItem.SelectedNodeID;
}
var tb = BLL.TwOutputmasterService.GetListData(table, Grid1);
Grid1.RecordCount = TwOutputmasterService.Count;
@@ -105,14 +103,14 @@ namespace FineUIPro.Web.CLGL
for (int i = 0; i < Grid2.Rows.Count; i++)
{
var model = Grid2.Rows[i].DataItem as Model.Tw_InOutDetailOutput;
if (model.ActNum> model.PlanNum)
if (model.ActNum > model.PlanNum)
{
Grid2.Rows[i].RowCssClass = "yellow";
}
else if (model.ActNum < model.PlanNum)
{
Grid2.Rows[i].RowCssClass = "red";
}
}
}
@@ -183,11 +181,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork1)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn1 = new TreeNode();
tn1.NodeID = q.UnitWorkId;
tn1.Text = q.UnitWorkName ;
tn1.Text = q.UnitWorkName;
tn1.ToolTip = "施工单位：" + unitNamesUnitIds;
tn1.EnableClickEvent = true;
rootNode1.Nodes.Add(tn1);
@@ -197,11 +195,11 @@ namespace FineUIPro.Web.CLGL
{
foreach (var q in unitWork2)
{
var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
TreeNode tn2 = new TreeNode();
tn2.NodeID = q.UnitWorkId;
tn2.Text = q.UnitWorkName ;
tn2.Text = q.UnitWorkName;
tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2);
@@ -226,7 +224,7 @@ namespace FineUIPro.Web.CLGL
/// <param name="e"></param>
protected void btnTreeFind_Click(object sender, EventArgs e)
{
this.InitTreeMenu();
this.InitTreeMenu();
}
#endregion
@@ -237,7 +235,7 @@ namespace FineUIPro.Web.CLGL
if (e.RowIndex >= 0)
{
string ID = Grid1.DataKeys[e.RowIndex][0].ToString();
BindDetailGrid(ID);
BindDetailGrid(ID);
}
}
@@ -319,8 +317,8 @@ namespace FineUIPro.Web.CLGL
return;
}
string message= TwInOutplanmasterService.GenPlanMasterByOutputMasterId(Grid1.SelectedRowID, TwConst.TypeInt.退料入库);
if (string .IsNullOrEmpty(message))
string message = TwInOutplanmasterService.GenPlanMasterByOutputMasterId(Grid1.SelectedRowID, TwConst.TypeInt.退料入库);
if (string.IsNullOrEmpty(message))
{
ShowNotify("生成通知单成功！", MessageBoxIcon.Success);
}
@@ -537,11 +535,11 @@ namespace FineUIPro.Web.CLGL
if (buttonList.Count > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
{
}
if (buttonList.Contains(BLL.Const.BtnModify))
{
// this.btnPrint.Hidden = false;
{
// this.btnPrint.Hidden = false;
//this.btnMenuInOutPlanMasterEdit.Hidden = false;
this.btnGenInPlanMaster.Hidden = false;
this.btnGenOutPlanMaster.Hidden = false;
@@ -578,7 +576,7 @@ namespace FineUIPro.Web.CLGL
List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
{
ReqUnitName = result.ReqUnitName,
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
@@ -679,7 +677,7 @@ namespace FineUIPro.Web.CLGL
{
["出库明细"] = TwOutputdetailService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList()),
["管线材料明细"] = TwInoutplandetailRelationService.GetPrintListByOutputMasterIds(Grid1.SelectedRowIDArray.ToList())
};
};
string path = Funs.RootPath + @"File\Excel\Temp\OutputDetail.xlsx";
path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
SGGL/FineUIPro.Web/CLGL/OutputMasterEdit.aspx.cs
-5
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CLGL
{
SGGL/FineUIPro.Web/CQMS/Check/MaterialAcceptance.aspx.cs
-3
View File
@@ -5,9 +5,6 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Check
{
SGGL/FineUIPro.Web/CQMS/Check/MaterialAcceptanceEdit.aspx.cs
+3 -8
View File
@@ -1,11 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Check
{
@@ -126,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Check
{
MaterialAcceptance.MaterialAcceptanceId = MaterialAcceptanceId;
CheckMaterialacceptanceService.UpdateCheck_MaterialAcceptance(MaterialAcceptance);
}
else
{
@@ -144,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Check
MaterialAcceptance.CompileMan = this.CurrUser.PersonId;
MaterialAcceptance.CompileDate = DateTime.Now;
CheckMaterialacceptanceService.AddCheck_MaterialAcceptance(MaterialAcceptance);
}
LogService.AddSys_Log(CurrUser, MaterialAcceptance.PlanCode, MaterialAcceptance.MaterialAcceptanceId, Const.CheckMaterialacceptanceMenuId, "修改总包施工质量计划");
if (saveType == "submit")
@@ -179,7 +174,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (validate())
{
SaveMainPlan("submit");
}
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.cs
-3
View File
@@ -5,9 +5,6 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
+4 -6
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
@@ -213,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "交底负责单位" + "," + "[" + row3 + "]不存在！" + "|";
}
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
@@ -240,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
}
string row8 = pds.Rows[i][8].ToString();
if (string.IsNullOrEmpty(row8))
{
@@ -412,7 +410,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string row0 = pds.Rows[i][0].ToString().Trim();
string row3 = pds.Rows[i][3].ToString().Trim();
var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault();
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][8].ToString().Trim())
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][8].ToString().Trim())
).FirstOrDefault();
if (oldViewInfo == null)
{
@@ -421,7 +419,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
des.ProjectId = this.CurrUser.LoginProjectId;
des.CNProfessionalId = cn.CNProfessionalId;
des.DisclosureCode = pds.Rows[i][1].ToString().Trim();
des.DisclosureName= pds.Rows[i][2].ToString().Trim();
des.DisclosureName = pds.Rows[i][2].ToString().Trim();
des.UnitId = units.Where(x => x.UnitName == row3.Trim()).FirstOrDefault().UnitId;
des.DisclosureMan = pds.Rows[i][4].ToString().Trim();
des.DisclosureDate = Funs.GetNewDateTime(pds.Rows[i][5].ToString().Trim());
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNew.aspx.cs
+1 -1
View File
@@ -421,7 +421,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
Ins.UnitWorkId = unitIds;
}
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
{
Ins.AttendMan = tempData.Value8.Trim();
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataInNewEdit.aspx.cs
-4
View File
@@ -1,10 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs
+1 -5
View File
@@ -1,10 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
@@ -124,7 +120,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newCon.AttendMan = this.txtAttendMan.Text.Trim();
newCon.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim());
if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId))
{
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAssurance.aspx.cs
-3
View File
@@ -4,9 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAssuranceEdit.aspx.cs
+4 -8
View File
@@ -1,10 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
@@ -118,12 +114,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
//类别
this.drpType.DataValueField = "Value";
this.drpType.DataTextField= "Text";
this.drpType.DataSource= BLL.DropListService.drpQualityAssuranceTypeList();
this.drpType.DataTextField = "Text";
this.drpType.DataSource = BLL.DropListService.drpQualityAssuranceTypeList();
this.drpType.DataBind();
Funs.FineUIPleaseSelect(this.drpType);
Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId,string.Empty, true);
Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId, string.Empty, true);
this.drpCompileMan.SelectedValue = this.CurrUser.PersonId;
}
@@ -135,7 +131,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpType.SelectedValue==BLL.Const._Null)
if (this.drpType.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择类别", MessageBoxIcon.Warning);
return;
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
strSql += " AND C.DraCode='" + txtDraCode.Text.Trim() + "'";
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
-2
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataInNew.aspx.cs
+1 -6
View File
@@ -1,7 +1,5 @@
using BLL;
using FineUIPro.Web.ProjectData;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@@ -9,9 +7,6 @@ using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
@@ -421,7 +416,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
}
Ins.ReceiveUnits = unitIds;
}
}
if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
{
Ins.Remarks = tempData.Value6.Trim();
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataInNewEdit.aspx.cs
-4
View File
@@ -1,10 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Comprehensive
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
+5 -5
View File
@@ -58,9 +58,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.drpUnitWorkIds.SelectedValueArray = model.UnitWorkId.Split(',');
}
this.txtDraCode.Text = model.DraCode;
this.txtReviewDate.Text = model.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReviewDate) : "";
if (!string.IsNullOrEmpty(model.ReceiveUnits))
{
this.drpUnitIds.SelectedValueArray = model.ReceiveUnits.Split(',');
@@ -99,8 +99,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
//else
//{
//this.btnSave.Hidden = false;
//this.btnSubmit.Hidden = false;
//this.btnSave.Hidden = false;
//this.btnSubmit.Hidden = false;
//}
}
}
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
//}
//else
//{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
//}
}
#endregion
SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReport.aspx.cs
-3
View File
@@ -4,9 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.ManageReport
{
SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs
+2 -2
View File
@@ -181,8 +181,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
else
{
Model.InformationProject_QualityWorkSummaryReport oldReport = (from x in Funs.DB.InformationProject_QualityWorkSummaryReport
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
select x).FirstOrDefault();
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
select x).FirstOrDefault();
if (oldReport == null)
{
this.QualityWorkSummaryReportId = SQLHelper.GetNewID(typeof(Model.InformationProject_QualityWorkSummaryReport));
SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
namespace FineUIPro.Web.CQMS.ManageReport
@@ -263,7 +261,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{
if (!string.IsNullOrEmpty(this.txtQuarterTotal.Text.Trim()) && !string.IsNullOrEmpty(txtQuarterFirstPassNum.Text.Trim()))
{
txtQuarterFirstPassRate.Text = (Funs.GetNewDecimalOrZero(txtQuarterFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtQuarterTotal.Text.Trim())*100).ToString();
txtQuarterFirstPassRate.Text = (Funs.GetNewDecimalOrZero(txtQuarterFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtQuarterTotal.Text.Trim()) * 100).ToString();
}
else
{
@@ -280,7 +278,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
{
if (!string.IsNullOrEmpty(this.txtYearTotal.Text.Trim()) && !string.IsNullOrEmpty(this.txtYearFirstPassNum.Text.Trim()))
{
this.txtYearFirstPassRate.Text = (Funs.GetNewDecimalOrZero(this.txtYearFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtYearTotal.Text.Trim())*100).ToString();
this.txtYearFirstPassRate.Text = (Funs.GetNewDecimalOrZero(this.txtYearFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtYearTotal.Text.Trim()) * 100).ToString();
}
}
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
+1 -3
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
@@ -199,7 +197,7 @@ namespace FineUIPro.Web.CQMS.Material
//else
//{
if (!string.IsNullOrEmpty(row2))
{
{
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
if (mainItem == null)
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentStatistics.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
+1 -3
View File
@@ -1,6 +1,4 @@
using BLL;
using System;
using System.Linq;
using System;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
+1 -1
View File
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.CQMS.Material
}
else
{
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId== Material.UnitId && x.ArrivalDate == Material.ArrivalDate
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == Material.UnitId && x.ArrivalDate == Material.ArrivalDate
&& x.MaterialName == Material.MaterialName && x.SpecificationAndModel == Material.SpecificationAndModel);
if (oldView == null)
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialIn.aspx.cs
+2 -4
View File
@@ -5,8 +5,6 @@ using System.Data;
using System.Data.OleDb;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
@@ -161,13 +159,13 @@ namespace FineUIPro.Web.CQMS.Material
var oldViewInfos = from x in Funs.DB.Material_Material
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId
select new { x.ProjectId,y.UnitName,x.MaterialName,x.SpecificationAndModel,x.ArrivalDate};
select new { x.ProjectId, y.UnitName, x.MaterialName, x.SpecificationAndModel, x.ArrivalDate };
var units = from x in Funs.DB.Base_Unit
select x;
var mainItems = from x in Funs.DB.ProjectData_MainItem where x.ProjectId == this.CurrUser.LoginProjectId select x;
for (int i = 0; i < ir; i++)
{
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName== pds.Rows[i][1].ToString()
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName == pds.Rows[i][1].ToString()
&& x.MaterialName == pds.Rows[i][3].ToString() && x.SpecificationAndModel == pds.Rows[i][4].ToString() && x.ArrivalDate == Funs.GetNewDateTime(pds.Rows[i][10].ToString()));
if (oldViewInfo == null)
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
-1
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialStatistics.aspx.cs
+1 -2
View File
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.CQMS.Material
{
@@ -86,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Material
{
BindGrid();
}
/// <summary>
/// 搜索
/// </summary>
SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
+1 -1
View File
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.CQMS.Material
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
//this.btnMenuDel.Hidden = false;
//this.btnMenuDel.Hidden = false;
}
}
}
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
+2 -6
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
@@ -214,7 +210,7 @@ namespace FineUIPro.Web.CQMS.Material
materialTest.CompileDate = DateTime.Now;
CQMS_MaterialTestService.UpdateMaterialTest(materialTest);
Model.Material_Inspection inspection = BLL.CQMS_InspectionService.GetInspectionByInspectionId(materialTest.InspectionId);
if (inspection != null)
if (inspection != null)
{
if (inspection.State == BLL.Const.Inspection_SpotCheck) //若状态为正在抽检，则更新报验单状态为总包工程师审核
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using System;
using System;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
+1 -5
View File
@@ -1,12 +1,8 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Material
{
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeeting.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs
+8 -13
View File
@@ -1,12 +1,7 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Meeting
{
@@ -391,14 +386,14 @@ namespace FineUIPro.Web.CQMS.Meeting
if (this.drpHandleType.SelectedValue == Const.CQMSMeeting_Complete) //审批完成
{
var getSitePerson = (from x in Funs.DB.SitePerson_Person
join z in Funs.DB.Project_ProjectUnit on x.UnitId equals z.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.ProjectPersonStates_1 && x.RoleIds != null
&& z.UnitType == Const.ProjectUnitType_2
select new
{
x.PersonId,
RoleNames = BLL.RoleService.getRoleNamesRoleIds(x.RoleIds)
}).AsEnumerable();
join z in Funs.DB.Project_ProjectUnit on x.UnitId equals z.UnitId
where x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.ProjectPersonStates_1 && x.RoleIds != null
&& z.UnitType == Const.ProjectUnitType_2
select new
{
x.PersonId,
RoleNames = BLL.RoleService.getRoleNamesRoleIds(x.RoleIds)
}).AsEnumerable();
var list = getSitePerson.Where(x => !x.RoleNames.Contains("安全"));
foreach (var item in list)
{
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingFile.aspx.cs
+3 -4
View File
@@ -1,12 +1,11 @@
using BLL;
using Aspose.Words;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
using Aspose.Words;
using System.IO;
using System.Linq;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeeting.aspx.cs
-1
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs
-5
View File
@@ -1,12 +1,7 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingFile.aspx.cs
+3 -4
View File
@@ -1,12 +1,11 @@
using BLL;
using Aspose.Words;
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
using Aspose.Words;
using System.IO;
using System.Linq;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Meeting
{
SGGL/FineUIPro.Web/CQMS/Models/QualityModelEdit.aspx.cs
+2 -6
View File
@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using BLL;
using System;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.CQMS.Models
{
SGGL/FineUIPro.Web/CQMS/PersonManage/CheckerItemView.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using System;
using System;
namespace FineUIPro.Web.CQMS.PersonManage
{
SGGL/FineUIPro.Web/CQMS/PersonManage/TestPlanEdit.aspx.cs
+1 -3
View File
@@ -1,12 +1,10 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.PersonManage
{
SGGL/FineUIPro.Web/CQMS/PersonManage/TestPlanView.aspx.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.PersonManage
{
SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordEdit.aspx.cs
+1 -4
View File
@@ -1,13 +1,10 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
using Model;
namespace FineUIPro.Web.CQMS.PersonManage
{
SGGL/FineUIPro.Web/CQMS/PersonManage/TestRecordView.aspx.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.PersonManage
{
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemView.aspx.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using BLL;
using System;
using System;
using System.Linq;
namespace FineUIPro.Web.CQMS.PersonManage
SGGL/FineUIPro.Web/CQMS/Plan/MainPlan.aspx.cs
+4 -6
View File
@@ -1,12 +1,10 @@
using BLL;
using FineUIPro.Web.ZHGL.Plan;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.Plan
{
@@ -242,7 +240,7 @@ namespace FineUIPro.Web.CQMS.Plan
}
string id = Grid1.SelectedRowID;
var ins = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(id);
if (File.Exists(Funs.RootPath+ins.FilePath))
if (File.Exists(Funs.RootPath + ins.FilePath))
{
File.Delete(Funs.RootPath + ins.FilePath);
@@ -397,9 +395,9 @@ namespace FineUIPro.Web.CQMS.Plan
{
var ins = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(Grid1.SelectedRowID);
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/OnlineEditing.aspx?UserId={0}&PCUrl={1}", this.CurrUser.PersonId, ins.FilePath,"查看 -")));
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", Grid1.SelectedRowID, "查看 -")));
// PageContext.RegisterStartupScript(Window1.GetHideReference());
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/OnlineEditing.aspx?UserId={0}&PCUrl={1}", this.CurrUser.PersonId, ins.FilePath, "查看 -")));
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", Grid1.SelectedRowID, "查看 -")));
// PageContext.RegisterStartupScript(Window1.GetHideReference());
}
else
SGGL/FineUIPro.Web/CQMS/Plan/MainPlanEdit.aspx.cs
+16 -19
View File
@@ -1,13 +1,10 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
using System.IO;
namespace FineUIPro.Web.CQMS.Plan
{
@@ -66,7 +63,7 @@ namespace FineUIPro.Web.CQMS.Plan
hdId.Text = this.MainPlanId;
txtPlanCode.Text = MainPlan.PlanCode;
txtFileName.Text = MainPlan.FileName;
List<string> list = BLL.CQMS_MainPlanApproveService.GetAudit3PersonIds(MainPlanId);
if (list.Count > 0)
{
@@ -112,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Plan
this.btnSubmit.Visible = false;
this.next.Hidden = true;
}
drpHandleType_SelectedIndexChanged(null, null);
}
else
@@ -120,7 +117,7 @@ namespace FineUIPro.Web.CQMS.Plan
string prefix = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId) + "-ZBJH-";
txtPlanCode.Text = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Plan_MainPlan", "PlanCode", this.CurrUser.LoginProjectId, prefix);
txtFileName.Text = "总包施工质量计划";
drpHandleType.DataSource = BLL.CQMS_MainPlanService.GetDHandleTypeByState(BLL.Const.MainPlan_Compile,string.Empty);
drpHandleType.DataSource = BLL.CQMS_MainPlanService.GetDHandleTypeByState(BLL.Const.MainPlan_Compile, string.Empty);
drpHandleType.DataBind();
drpHandleType_SelectedIndexChanged(null, null);
}
@@ -416,7 +413,7 @@ namespace FineUIPro.Web.CQMS.Plan
}
}
LogService.AddSys_Log(CurrUser, MainPlan.PlanCode, MainPlan.MainPlanId, Const.MainPlanMenuId, "修改总包施工质量计划");
if (saveType== "submit")
if (saveType == "submit")
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -487,13 +484,13 @@ namespace FineUIPro.Web.CQMS.Plan
{
Directory.CreateDirectory(newPath);
}
if (drpCompanyTemplate.SelectedValue!=Const._Null)
if (drpCompanyTemplate.SelectedValue != Const._Null)
{
var template = BLL.Base_CompanytemplateService.GetBase_CompanyTemplateById(drpCompanyTemplate.SelectedValue);
File.Copy(rootPath + template.FilePath, path);
}
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", MainPlanId, "查看 -")));
PageContext.RegisterStartupScript(WindowAtt.GetHideReference());
}
@@ -531,9 +528,9 @@ namespace FineUIPro.Web.CQMS.Plan
if (!File.Exists(Funs.RootPath + MainPlan.FilePath))
{
drpCompanyTemplate.Hidden= false;
drpCompanyTemplate.Hidden = false;
}
}
else
{
@@ -544,18 +541,18 @@ namespace FineUIPro.Web.CQMS.Plan
}
protected void btnEditWord_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(MainPlanId))
{
Model.Plan_MainPlan MainPlan = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(MainPlanId);
if (!File.Exists(Funs.RootPath + MainPlan.FilePath))
{
GetCompanyTemplate();
//PageContext.RegisterStartupScript(Confirm.GetShowReference("是否使用公司模板?",
// String.Empty,
// MessageBoxIcon.Question,
// PageManager1.GetCustomEventReference("Yes"), // 第一个参数 false 用来指定当前不是AJAX请求
// PageManager1.GetCustomEventReference("No")));
//PageContext.RegisterStartupScript(Confirm.GetShowReference("是否使用公司模板?",
// String.Empty,
// MessageBoxIcon.Question,
// PageManager1.GetCustomEventReference("Yes"), // 第一个参数 false 用来指定当前不是AJAX请求
// PageManager1.GetCustomEventReference("No")));
}
else
{
SGGL/FineUIPro.Web/CQMS/Plan/MainPlanView.aspx.cs
+1 -4
View File
@@ -1,12 +1,9 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Plan
{
SGGL/FineUIPro.Web/CQMS/Plan/SubPlan.aspx.cs
-1
View File
@@ -5,7 +5,6 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Net;
namespace FineUIPro.Web.CQMS.Plan
{
SGGL/FineUIPro.Web/CQMS/Plan/SubPlanEdit.aspx.cs
+2 -3
View File
@@ -1,5 +1,4 @@
using BLL;
using FineUIPro.Web.ZHGL.Plan;
using System;
using System.Collections.Generic;
using System.IO;
@@ -78,7 +77,7 @@ namespace FineUIPro.Web.CQMS.Plan
HFSubPlanId.Text = SubPlanId;
Model.Plan_SubPlan SubPlan = CQMS_SubPlanService.GetSubPlanBySubPlanId(SubPlanId);
txtCode.Text = SubPlan.Code;
if (!string.IsNullOrEmpty(SubPlan.UnitId))
{
drpUnit.SelectedValue = SubPlan.UnitId;
@@ -535,7 +534,7 @@ namespace FineUIPro.Web.CQMS.Plan
CQMS_SubPlanService.AddSubPlan(SubPlan);
}
if (saveType == "submit")
{
Model.Plan_SubPlanApprove approve1 = new Model.Plan_SubPlanApprove();
SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewEdit.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Plan
{
SGGL/FineUIPro.Web/CQMS/Plan/TechnicalProposalReviewView.aspx.cs
-7
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.Plan
{
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistration.aspx.cs
+6 -6
View File
@@ -37,9 +37,9 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
this.ucTree.ProjectId = this.ProjectId;
// if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) )
// {
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
// }
btnNew.OnClientClick = Window1.GetShowReference("QCGroupRegistrationEdit.aspx") + "return false;";
BindGrid();
@@ -166,8 +166,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var QCGroupRegistration = BLL.QCManage_QCGroupRegistrationService.GetQCGroupRegistrationByQCGroupRegistrationId(rowID);
var QCGroupRegistration = BLL.QCManage_QCGroupRegistrationService.GetQCGroupRegistrationByQCGroupRegistrationId(rowID);
if (QCGroupRegistration != null)
{
if (QCGroupRegistration.IsUpdate == true)
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
BLL.QCManage_QCGroupRegistrationService.DeleteQCGroupRegistrationById(rowID);
}
}
}
BindGrid();
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationEdit.aspx.cs
+13 -16
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
@@ -59,13 +52,15 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
{
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
if (QCGroupRegistration.AwardType == "1") {
if (QCGroupRegistration.AwardType == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (QCGroupRegistration.AwardType == "2") {
else if (QCGroupRegistration.AwardType == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@@ -159,20 +154,22 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
}
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
protected void Change_AwardType(object sender, EventArgs eventArgs)
{
drpAwardLevel.Items.Clear();
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
if (drpAwardType.SelectedValue == "1") {
if (drpAwardType.SelectedValue == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (drpAwardType.SelectedValue == "2") {
else if (drpAwardType.SelectedValue == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@@ -182,8 +179,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
drpAwardLevel.SelectedIndex = 0;
}
}
}
}
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCGroupRegistrationView.aspx.cs
+12 -15
View File
@@ -1,12 +1,5 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
@@ -58,13 +51,15 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
{
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
if (QCGroupRegistration.AwardType == "1") {
if (QCGroupRegistration.AwardType == "1")
{
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
}
else if (QCGroupRegistration.AwardType == "2") {
else if (QCGroupRegistration.AwardType == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
@@ -102,19 +97,21 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
}
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/QCGroupRegistration&menuId={1}", hdId.Text, BLL.Const.ProjectQCGroupRegistrationListMenuId)));
}
protected void Change_AwardType(object sender, EventArgs eventArgs)
{
drpAwardLevel.Items.Clear();
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
if (drpAwardType.SelectedValue == "1") {
if (drpAwardType.SelectedValue == "1")
{
drpAwardLevel.Items.Add(new ListItem("国家级", "1"));
drpAwardLevel.Items.Add(new ListItem("省部级", "2"));
drpAwardLevel.Items.Add(new ListItem("市级", "3"));
}
else if (drpAwardType.SelectedValue == "2") {
else if (drpAwardType.SelectedValue == "2")
{
drpAwardLevel.Items.Add(new ListItem("省部级", "4"));
drpAwardLevel.Items.Add(new ListItem("集团级", "5"));
drpAwardLevel.Items.Add(new ListItem("企业级", "6"));
@@ -124,7 +121,7 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
drpAwardLevel.SelectedIndex = 0;
}
}
}
}
SGGL/FineUIPro.Web/CQMS/QualityActivity/QCManage/QCStatics.aspx.cs
+7 -11
View File
@@ -3,10 +3,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
{
@@ -67,11 +63,11 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
/// <param name="e"></param>
//protected void changeTree(object sender, EventArgs e)
//{
//this.ProjectId = this.ucTree.ProjectId;
//this.GetButtonPower();
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
//}
//this.ProjectId = this.ucTree.ProjectId;
//this.GetButtonPower();
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
//{
//}
// this.BindGrid();
//}
/// <summary>
@@ -156,8 +152,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
}
/// <summary>
/// 统计按钮
/// </summary>
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs
+1 -2
View File
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Threading.Tasks;
namespace FineUIPro.Web.CQMS.RewardAndPunish
{
@@ -66,7 +65,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
strSql += " AND ins.UnitId=@UnitId";
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
}
if (this.rblType.SelectedValue != "0")
if (this.rblType.SelectedValue != "0")
{
strSql += " AND ins.Type=@Type";
listStr.Add(new SqlParameter("@Type", rblType.SelectedValue));
SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs
-5
View File
@@ -1,12 +1,7 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Data.SqlClient;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.RewardAndPunish
{

Some files were not shown because too many files have changed in this diff Show More