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

fix:材料匹配取消隐藏已出库过的管线

Browse Source
This commit is contained in:
李鹏飞
2026-08-21 15:30:13 +08:00
parent d038c516ea
commit 6dd2c91289
4 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+2 -2
View File
@@ -8276,7 +8276,7 @@
</Compile> </Compile>
<Compile Include="CLGL\InPlanMaster.aspx.cs"> <Compile Include="CLGL\InPlanMaster.aspx.cs">
<DependentUpon>InPlanMaster.aspx</DependentUpon> <DependentUpon>InPlanMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="CLGL\InPlanMaster.aspx.designer.cs"> <Compile Include="CLGL\InPlanMaster.aspx.designer.cs">
<DependentUpon>InPlanMaster.aspx</DependentUpon> <DependentUpon>InPlanMaster.aspx</DependentUpon>
@@ -17350,4 +17350,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+3 -13
View File
@@ -1,6 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldMatMatch.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.WeldMatMatch" %> <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldMatMatch.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingManage.WeldMatMatch" %>
<%@ Register Src="~/Controls/_3DLook.ascx" TagName="_3DLook" TagPrefix="uc1" %>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
@@ -135,11 +134,7 @@
</f:Panel> </f:Panel>
<f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
<Items> <Items>
<f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" ShowBorder="true" RegionPercent="30%" IsFluid="true" Hidden="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" AutoScroll="true" IFrameUrl="../../CLGL/ArrivalStatistics.aspx" EnableIFrame="true">
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="30%" <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" RegionPercent="30%"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型" Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="三维模型"
TitleToolTip="三维模型显示" AutoScroll="true"> TitleToolTip="三维模型显示" AutoScroll="true">
@@ -262,12 +257,7 @@
IsModal="false" AutoScroll="true" BodyPadding="10px"> IsModal="false" AutoScroll="true" BodyPadding="10px">
</f:Window> </f:Window>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
var panelTopRegionCD = '<%= panelTopRegion.ClientID %>';
function getiframWidth() {
return F(panelTopRegionCD).getWidth();
}
function reloadGrid() { function reloadGrid() {
__doPostBack(null, 'reloadGrid'); __doPostBack(null, 'reloadGrid');
} }
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+6 -9
View File
@@ -328,17 +328,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <returns>符合材料匹配入口条件的管线列表。</returns> /// <returns>符合材料匹配入口条件的管线列表。</returns>
private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId) private List<Model.HJGL_Pipeline> GetTestPackagePipelineList(string ptpId)
{ {
var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation //var completeInOutPlanDetailRelationList = from x in Funs.DB.Tw_InOutPlanDetail_Relation
join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id // join y in Funs.DB.Tw_InOutPlanMaster on x.InOutPlanMasterId equals y.Id
where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue // where y.State == (int)TwConst.State.已完成 && y.WarehouseId == drpWarehouse.SelectedValue
select x; // select x;
var pipeline = (from x in Funs.DB.HJGL_Pipeline var pipeline = (from x in Funs.DB.HJGL_Pipeline
join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId join p in Funs.DB.PTP_PipelineList on x.PipelineId equals p.PipelineId
join y in completeInOutPlanDetailRelationList on x.PipelineId equals y.PipelineId into temp where p.PTP_ID == ptpId
from y in temp.DefaultIfEmpty()
where y == null
&& p.PTP_ID == ptpId
&& x.ProjectId == this.CurrUser.LoginProjectId && x.ProjectId == this.CurrUser.LoginProjectId
&& x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
&& x.WarehouseId == WarehouseId && x.WarehouseId == WarehouseId
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
Generated
-9
View File
@@ -212,15 +212,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel Panel2; protected global::FineUIPro.Panel Panel2;
/// <summary>
/// panelTopRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelTopRegion;
/// <summary> /// <summary>
/// panelCenterRegion 控件。 /// panelCenterRegion 控件。
/// </summary> /// </summary>