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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2024-11-27 15:21:28 +08:00
parent 22809fa59f 73a869c851
commit 7fb419f21c
30 changed files with 355 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs
+11 -2
View File
@@ -31,14 +31,23 @@ namespace FineUIPro.Web.CLGL
/// 绑定数据
/// </summary>
private void BindGrid()
{
{
var tb = BLL.TwArrivalStatisticsService.GetStatistics(this.CurrUser.LoginProjectId, txtMaterialCode.Text.Trim(), drpWarehouse.SelectedValue);
lbRate.Text="总体匹配率："+ Math.Round( tb.Sum(x=>x.MatchRate)*100/tb.Count() ,4) + "%";
if (tb.Count() > 0)
{
lbRate.Text = "总体匹配率：" + Math.Round(tb.Sum(x => x.MatchRate) * 100 / tb.Count(), 4) + "%";
}
else
{
lbRate.Text = "总体匹配率：0%";
}
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
}
#endregion
#region GV 数据操作
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx
+12 -5
View File
@@ -65,9 +65,9 @@
</f:Button>
<f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
<%-- <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</f:Button>--%>
</Items>
</f:Toolbar>
</Toolbars>
@@ -143,7 +143,14 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000" >
AllowPaging="true" IsDatabasePaging="true" PageSize="10000" EnableTextSelection="True" >
<Toolbars>
<f:Toolbar runat="server">
<Items>
<f:TextBox runat="server" ID="txtMaterialCode" Label="材料编码" AutoPostBack="True" OnTextChanged="txtMaterialCode_OnTextChanged" LabelWidth="100px" LabelAlign="Right" Width="200px"/>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
@@ -151,8 +158,8 @@
<asp:Label ID="Label1" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center" >
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MaterialName" DataField="MaterialName" SortField="MaterialName"
FieldType="String" HeaderText="材料名称" TextAlign="Left" HeaderTextAlign="Center">
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs
+8 -3
View File
@@ -80,6 +80,7 @@ namespace FineUIPro.Web.CLGL
{
Model.Tw_InOutDetailOutput table = new Model.Tw_InOutDetailOutput();
table.InOutPlanMasterId = inOutPlanMasterId;
table.MaterialCode = txtMaterialCode.Text;
var tb = BLL.TwInOutplandetailService.GetListData(table, Grid2);
Grid2.DataSource = tb;
Grid2.DataBind();
@@ -329,7 +330,6 @@ namespace FineUIPro.Web.CLGL
this.btnMenuEdit.Hidden = false;
this.btnGenInMaster.Hidden = false;
this.btnRevokeGenInMaster.Hidden = false;
this.btnPassMaster.Hidden = false;
}
if (buttonList.Contains(BLL.Const.BtnDelete))
{
@@ -438,8 +438,8 @@ namespace FineUIPro.Web.CLGL
AuditDate = string.Format("{0:yyyy-MM-dd}", result.AuditDate),
AuditManName2 = !string.IsNullOrEmpty(result.AuditMan2) ? BLL.Person_PersonsService.getSignatureUrl(result.AuditMan2) : "",
AuditDate2 = string.Format("{0:yyyy-MM-dd}", result.AuditDate2),
WarehouseManName = !string.IsNullOrEmpty(result.WarehouseMan) ? BLL.Person_PersonsService.getSignatureUrl(result.WarehouseMan) : "",
WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.WarehouseDate),
WarehouseManName = !string.IsNullOrEmpty(result.CreateManName) ? BLL.Person_PersonsService.getSignatureUrl(result.CreateMan) : "",
WarehouseManAuditDate = string.Format("{0:yyyy-MM-dd}", result.CreateDate),
};
tw_PrintMasters.Add(printMaster);
// orderApproveIn.ProjectManager = !string.IsNullOrEmpty(approveManModels.InputApproveMan.ProjectManager) ? BLL.Person_PersonsService.getSignatureUrl(approveManModels.InputApproveMan.ProjectManager) : "";
@@ -479,6 +479,7 @@ namespace FineUIPro.Web.CLGL
var tw_PrintDetail = ( from x in Funs.DB.Tw_InOutPlanDetail
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where x.InOutPlanMasterId==Id
orderby x.SortIndex
select new Model.Tw_PrintDetail
{
SortIndex =0,
@@ -518,5 +519,9 @@ namespace FineUIPro.Web.CLGL
}
}
protected void txtMaterialCode_OnTextChanged(object sender, EventArgs e)
{
BindDetailGrid(Grid1.SelectedRowID);
}
}
}
SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.designer.cs
Generated
+9 -9
View File
@@ -149,15 +149,6 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblNumber 控件。
/// </summary>
@@ -221,6 +212,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// txtMaterialCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// Label1 控件。
/// </summary>
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
+11 -6
View File
@@ -17,7 +17,7 @@
<form id="form1" runat="server">
<div>
<f:PageManager runat="server" AutoSizePanelID="Form2" />
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="出库单详情"
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" Title="入库单详情"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Toolbars>
<f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
@@ -54,12 +54,17 @@
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="true" Title="出库单列表"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
DataIDField="Id" EnableColumnLines="true" Height="400" EnableBigData="true"
EnableTextSelection="True">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="入库单列表" IsFluid="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="True"
DataIDField="Id" EnableCollapse="false" EnableBigData="true" Height="400"
EnableTextSelection="True" ClicksToEdit="1">
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderText="材料编码" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.CLGL
txtCreateDate.Text = string.Format("{0:yyyy-MM-dd}", model.CreateDate);
txtCreateMan.Text = Person_PersonsService.GetPersonsNameById(model.CreateMan);
txtReqUnitName.Text = UnitService.GetUnitNameByUnitId(model.ReqUnitId);
txtRemark.Text = model.Remark;
var queryModel = new Model.Tw_InOutDetailOutput()
{
SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.designer.cs
Generated
+9
View File
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.CLGL
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// tbActNum 控件。
/// </summary>
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx
+7 -3
View File
@@ -22,6 +22,10 @@
.f-grid-row.red {
background-color: darkgoldenrod;
}
.f-grid-row-summary .f-grid-cell-inner {
font-weight: bold;
color: red;
}
</style>
</head>
<body>
@@ -38,9 +42,9 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="出入库计划主表" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" EnableCheckBoxSelect="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" OnRowCommand="Grid1_RowCommand">
EnableRowDoubleClickEvent="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
@@ -128,7 +132,7 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" EnableColumnLines="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
AllowPaging="true" IsDatabasePaging="true" PageSize="10000" EnableSummary="true" SummaryPosition="Bottom">
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs
+37 -12
View File
@@ -1,4 +1,5 @@
using BLL;
using MiniExcelLibs;
using Model;
using System;
using System.Collections.Generic;
@@ -9,6 +10,7 @@ using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.CLGL
{
@@ -72,16 +74,27 @@ namespace FineUIPro.Web.CLGL
var tb = BLL.TwInputdetailService.GetListData(table, Grid2);
Grid2.DataSource = tb;
Grid2.DataBind();
var planNumTotal = 0m;
var actNumTotal = 0m;
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 );
if (model.ActNum != model.PlanNum)
{
Grid2.Rows[i].RowCssClass = "red";
}
}
}
JObject summary = new JObject();
//summary.Add("Major", "全部合计");
summary.Add("PlanNum", planNumTotal.ToString("F2"));
summary.Add("ActNum", actNumTotal.ToString("F2"));
Grid2.SummaryData = summary;
}
#endregion
#region GV 数据操作
@@ -243,15 +256,26 @@ namespace FineUIPro.Web.CLGL
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("出入库计划主表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;
this.BindGrid();
Response.Write(GetGridTableHtml(Grid1));
Response.End();
if (Grid1.SelectedRowIDArray.Length>0)
{
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");
MiniExcel.SaveAs(path, printModel);
string fileName = "入库明细表.xlsx";
FileInfo info = new FileInfo(path);
long fileSize = info.Length;
System.Web.HttpContext.Current.Response.Clear();
System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
System.Web.HttpContext.Current.Response.Flush();
System.Web.HttpContext.Current.Response.Close();
File.Delete(path);
}
}
/// <summary>
@@ -318,9 +342,9 @@ 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 = result.ReqUnitName,
ReqUnitName = UnitService.GetUnitNameByUnitId(Person_PersonsService.GetPerson_PersonsById(result.CreateMan).UnitId),
CusBillCode = result.CusBillCode,
CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
ProjectName = ProjectService.GetProjectNameByProjectId(result.ProjectId),
@@ -370,6 +394,7 @@ namespace FineUIPro.Web.CLGL
var tw_PrintDetail = (from x in Funs.DB.Tw_InputDetail
join y in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode
where x.InputMasterId == Id
orderby x.SortIndex
select new Model.Tw_PrintDetail
{
SortIndex = 0,
SGGL/FineUIPro.Web/CLGL/MaterialStock.aspx
+1 -1
View File
@@ -35,7 +35,7 @@
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" >
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx
+1 -1
View File
@@ -165,7 +165,7 @@
<f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="出库明细" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true"
SortDirection="DESC" EnableColumnLines="true" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
<Columns>
SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx
+1 -1
View File
@@ -158,7 +158,7 @@
<f:Grid ID="Grid2" ShowBorder="False" ShowHeader="False" Title="入库申请明细表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="MaterialCode"
SortDirection="DESC" EnableColumnLines="true"
SortDirection="DESC" EnableColumnLines="true" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000">
<Columns>
<%--<f:RenderField Width="150px" ColumnID="PipelineComponent" DataField="PipelineComponent" SortField="PipelineComponent"
SGGL/FineUIPro.Web/File/Fastreport/材料入库单.frx
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:15:13" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/14/2024 15:01:58" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREljhlknPe0ucx4RV8UxTdJ"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRE58amxPqMQ7WmKl5O5d2cK"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -154,7 +154,7 @@ namespace FastReport
<TableCell Name="Cell323" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell324" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell325" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell326" Border.Lines="All" Text="领料单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
<TableCell Name="Cell326" Border.Lines="All" Text="入库单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
<TableCell Name="Cell327" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell328" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell330" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
SGGL/FineUIPro.Web/File/Fastreport/材料入库计划单.frx
+4 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/07/2024 16:12:57" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="11/14/2024 14:57:38" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -84,7 +84,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREle+zCYpLB66N/WZ+YJ430"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGXnEOHTYOWgB9BnZw69mb2"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="BillName" DataType="System.String" PropName="CH_TrustCode"/>
<Column Name="ReqUnitName" DataType="System.String" PropName="CH_TrustUnit"/>
@@ -149,12 +149,12 @@ namespace FastReport
<TableCell Name="Cell320" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 9pt, style=Bold"/>
</TableRow>
<TableRow Name="Row38" Height="49.14">
<TableCell Name="Cell321" Border.Lines="All" Text="[Table1.BillName]:[Table1.CusBillCode]" VertAlign="Center" Font="宋体, 10pt" TextFill.Color="Red" ColSpan="4"/>
<TableCell Name="Cell321" Border.Lines="All" VertAlign="Center" Font="宋体, 10pt" TextFill.Color="Red" ColSpan="4"/>
<TableCell Name="Cell322" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell323" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell324" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt"/>
<TableCell Name="Cell325" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell326" Border.Lines="All" Text="领料单位：[Table1.ReqUnitName]" VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
<TableCell Name="Cell326" Border.Lines="All" Text="[Table1.BillName]:[Table1.CusBillCode] " VertAlign="Center" Font="宋体, 10pt, style=Bold" ColSpan="4"/>
<TableCell Name="Cell327" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell328" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
<TableCell Name="Cell330" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10pt, style=Bold"/>
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+4 -4
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/File/Word/PHTGL/施工招标实施计划审批表.docx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+3
View File
@@ -241,7 +241,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// 数据绑定
/// </summary>
private void BindGrid()
{
if (tvControlItem.SelectedNode==null) return;
string strSql = @" SELECT distinct com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,com.Remark,
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,com.IsPrint,
com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,pipe.FlowingSection,com.DrawingName,com.ReceiveDate,
@@ -255,6 +257,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2)
{
strSql += " and pipe.UnitWorkId =@UnitWorkId";
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs
+1 -1
View File
@@ -249,7 +249,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
});
foreach (var item in dt)
{
var pipeline = PipelineService.GetPipelineByPipelineCode(item.pipelinecode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""));
var pipeline = PipelineService.GetPipelineByPipelineCode(this.CurrUser.LoginProjectId,item.pipelinecode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""));
var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId);
if (hJGL_Pipeline_Component!=null)
{
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ActionPlanFormationEdit.aspx
+1 -1
View File
@@ -206,7 +206,7 @@
<f:FormRow>
<Items>
<f:Label ID="Label10" runat="server" CssClass="widthBlod" Text="七、 短名单资质标准确定"></f:Label>
<f:Label ID="Label10" runat="server" CssClass="widthBlod" Text="七、 分包商资质标准确定"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>