1

lu

2024-11-25 848d30993c117bbca2c3e62fdb287421fa6941b4

1

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -435,6 +435,12 @@
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcode.cs" />
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem.cs" />
    <Compile Include="DevFrm\Warehouse\Models\VArrivalBarcodeItem3.cs" />
    <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.Designer.cs">
      <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WOM\Frm_Womcaa.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -551,6 +557,18 @@
    </Compile>
    <Compile Include="UserControl\UcLookSupplier.Designer.cs">
      <DependentUpon>UcLookSupplier.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookWorkline.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookWorkline.Designer.cs">
      <DependentUpon>UcLookWorkline.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcLookWorkshop.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UcLookWorkshop.Designer.cs">
      <DependentUpon>UcLookWorkshop.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcPageBar.cs">
      <SubType>UserControl</SubType>
@@ -700,6 +718,9 @@
    <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesRohIn.resx">
      <DependentUpon>Frm_MesRohIn.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_MesWomdaahb.resx">
      <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WOM\Frm_Womcaa.resx">
      <DependentUpon>Frm_Womcaa.cs</DependentUpon>
    </EmbeddedResource>
@@ -757,6 +778,12 @@
    <EmbeddedResource Include="UserControl\UcLookSupplier.resx">
      <DependentUpon>UcLookSupplier.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookWorkline.resx">
      <DependentUpon>UcLookWorkline.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcLookWorkshop.resx">
      <DependentUpon>UcLookWorkshop.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcPageBar.resx">
      <DependentUpon>UcPageBar.cs</DependentUpon>
    </EmbeddedResource>

 DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs

@@ -129,7 +129,7 @@
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                    getPageList(1);
                }
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }

 DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs

@@ -78,9 +78,12 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
           gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
 gridView1.ActiveFilter.Clear();
 gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
 var frm = new ShowFilter(gridView1.Columns, _filterList);
 frm.UpdateParent += Frm_UpdateParent;
 frm.ShowDialog();
        }
        /// <summary>
        /// 查询回调
@@ -89,12 +92,9 @@
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
           gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
 gridView1.ActiveFilter.Clear();
 gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
 var frm = new ShowFilter(gridView1.Columns, _filterList);
 frm.UpdateParent += Frm_UpdateParent;
 frm.ShowDialog();
           
            _filterList = e.FilterList;
            getPageList(1);
        }

        /// <summary>
@@ -133,7 +133,7 @@
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                     getPageList(1);
                }
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }