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

提交代码

This commit is contained in:
高飞 2024-03-29 17:21:00 +08:00
parent 25041aacbe
commit 3ea9f6278c
4 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
SGGL/BLL/BLL.csproj
View File

@ -69,14 +69,6 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"> <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath> <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
@ -851,6 +843,33 @@
<WCFMetadataStorage Include="Service References\OAWebService\" /> <WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE"> <COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid> <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor> <VersionMajor>5</VersionMajor>

4
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
View File

@ -121,7 +121,7 @@ namespace BLL
} }
return PlanStartDate; return PlanStartDate;
} }
public static List<PackagingManageItem> GetPackagingManageList(string projectId, string PackagingCode) public static List<PackagingManageItem> GetPackagingManageList(string projectId, string PackagingCode, int pageIndex, int pageSize)
{ {
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
@ -147,7 +147,7 @@ namespace BLL
Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1), Code = x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).Substring(x.PackagingCode.Substring(0, x.PackagingCode.LastIndexOf("-")).LastIndexOf("-") + 1),
}).Distinct(); }).Distinct();
return q.OrderByDescending(x => x.Code).ToList(); return q.OrderByDescending(x => x.Code).Skip(pageIndex * pageSize).Take(pageSize).ToList();
} }
} }

26
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -107,14 +107,6 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath> <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
</Reference> </Reference>
@ -14453,6 +14445,24 @@
<WCFMetadata Include="Service References\" /> <WCFMetadata Include="Service References\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE"> <COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid> <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor> <VersionMajor>5</VersionMajor>

11
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
View File

@ -66,8 +66,9 @@ namespace FineUIPro.Web.HJGL.PreDesign
//var table = this.GetPagedDataTable(Grid1, tb); //var table = this.GetPagedDataTable(Grid1, tb);
//Grid1.DataSource = table; //Grid1.DataSource = table;
//Grid1.DataBind(); //Grid1.DataBind();
var list= BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim()); var list2 = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), 0, 10000);
Grid1.RecordCount = list.Count; var list = BLL.HJGL_PackagingmanageService.GetPackagingManageList(this.CurrUser.LoginProjectId, this.txtPackagingCode.Text.Trim(), this.Grid1.PageIndex, this.Grid1.PageSize);
Grid1.RecordCount = list2.Count;
Grid1.DataSource = list; Grid1.DataSource = list;
Grid1.DataBind(); Grid1.DataBind();
} }
@ -145,13 +146,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
#endregion #endregion
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{ {
if (e.CommandName == "cmd_detail" ) if (e.CommandName == "cmd_detail")
{ {
string id = Grid1.SelectedRowID; string id = Grid1.SelectedRowID;
string url = "PackagingManageView.aspx?PackagingManageId={0}"; string url = "PackagingManageView.aspx?PackagingManageId={0}";
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - "))); PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format(url, id, "操作 - ")));
} }
else if (e.CommandName== "cmd_print") else if (e.CommandName == "cmd_print")
{ {
string Id = this.Grid1.SelectedRowID; string Id = this.Grid1.SelectedRowID;
Pring(Id); Pring(Id);
@ -429,7 +430,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{ {
if (state != null) if (state != null)
{ {
string txt= HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text; string txt = HJGL_PackagingmanageService.GetState().FirstOrDefault(x => x.Value == state.ToString()).Text;
return txt; return txt;
} }