bug
lu
2025-07-14 aa64d5ff0554624339d504f926e955c0ce339b0b
bug
已添加3个文件
已修改6个文件
1149 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 469 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs 202 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -30,24 +30,25 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,10 +70,15 @@
            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_fOwnerIdHead = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_fPurchaserId = new Gs.DevApp.UserControl.UcLookStaff();
            this.txt_fPurchaseDeptId = new Gs.DevApp.UserControl.UcLookDepartment();
            this.txt_fRequireOrgId = new Gs.DevApp.UserControl.UcLookOrg();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_thOrgId = new Gs.DevApp.UserControl.UcLookOrg();
@@ -89,6 +95,7 @@
            this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
            this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -101,11 +108,16 @@
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -132,11 +144,11 @@
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -168,6 +180,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -180,11 +193,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -284,7 +302,8 @@
            this.gv_depotId,
            this.gv_suppId,
            this.gv_remark,
            this.gridColumn7});
            this.gridColumn7,
            this.gridColumn11});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -470,6 +489,16 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            // 
            // gridColumn11
            //
            this.gridColumn11.Caption = "源单";
            this.gridColumn11.FieldName = "fHasLinkTxt";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 13;
            this.gridColumn11.Width = 94;
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -507,11 +536,15 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 146;
            this.splitMx1.SplitterPosition = 172;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_fOwnerIdHead);
            this.layoutMx1.Controls.Add(this.txt_fPurchaserId);
            this.layoutMx1.Controls.Add(this.txt_fPurchaseDeptId);
            this.layoutMx1.Controls.Add(this.txt_fRequireOrgId);
            this.layoutMx1.Controls.Add(this.btnSelect);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_thOrgId);
@@ -528,6 +561,7 @@
            this.layoutMx1.Controls.Add(this.lastUpdateUser);
            this.layoutMx1.Controls.Add(this.lastUpdateTime);
            this.layoutMx1.Controls.Add(this.txt_guid);
            this.layoutMx1.Controls.Add(this.txt_fHasLinkRad);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
@@ -536,14 +570,46 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 146);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 172);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // txt_fOwnerIdHead
            //
            this.txt_fOwnerIdHead.IsReadly = false;
            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 135);
            this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
            this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24);
            this.txt_fOwnerIdHead.TabIndex = 537;
            //
            // txt_fPurchaserId
            //
            this.txt_fPurchaserId.IsReadly = false;
            this.txt_fPurchaserId.Location = new System.Drawing.Point(912, 135);
            this.txt_fPurchaserId.Name = "txt_fPurchaserId";
            this.txt_fPurchaserId.Size = new System.Drawing.Size(202, 24);
            this.txt_fPurchaserId.TabIndex = 536;
            //
            // txt_fPurchaseDeptId
            //
            this.txt_fPurchaseDeptId.IsReadly = false;
            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 135);
            this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
            this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24);
            this.txt_fPurchaseDeptId.TabIndex = 535;
            //
            // txt_fRequireOrgId
            //
            this.txt_fRequireOrgId.IsReadly = false;
            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 135);
            this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
            this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24);
            this.txt_fRequireOrgId.TabIndex = 534;
            // 
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 105);
            this.btnSelect.Location = new System.Drawing.Point(12, 99);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -562,15 +628,15 @@
            // txt_thOrgId
            // 
            this.txt_thOrgId.IsReadly = false;
            this.txt_thOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_thOrgId.Location = new System.Drawing.Point(84, 41);
            this.txt_thOrgId.Name = "txt_thOrgId";
            this.txt_thOrgId.Size = new System.Drawing.Size(170, 24);
            this.txt_thOrgId.Size = new System.Drawing.Size(200, 24);
            this.txt_thOrgId.TabIndex = 526;
            // 
            // txt_returnType
            // 
            this.txt_returnType.EditValue = "-请选择-";
            this.txt_returnType.Location = new System.Drawing.Point(390, 74);
            this.txt_returnType.Location = new System.Drawing.Point(360, 70);
            this.txt_returnType.Name = "txt_returnType";
            this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -582,16 +648,16 @@
            "供应商物品号错误",
            "采购料号变更"});
            this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_returnType.Size = new System.Drawing.Size(170, 24);
            this.txt_returnType.Size = new System.Drawing.Size(200, 24);
            this.txt_returnType.StyleController = this.layoutMx1;
            this.txt_returnType.TabIndex = 521;
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
            this.txt_billNo.Size = new System.Drawing.Size(200, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -599,7 +665,7 @@
            // txt_returnMethod
            // 
            this.txt_returnMethod.EditValue = "-请选择-";
            this.txt_returnMethod.Location = new System.Drawing.Point(390, 43);
            this.txt_returnMethod.Location = new System.Drawing.Point(360, 41);
            this.txt_returnMethod.Name = "txt_returnMethod";
            this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -608,35 +674,35 @@
            "退料补料",
            "退料并扣款"});
            this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_returnMethod.Size = new System.Drawing.Size(170, 24);
            this.txt_returnMethod.Size = new System.Drawing.Size(200, 24);
            this.txt_returnMethod.StyleController = this.layoutMx1;
            this.txt_returnMethod.TabIndex = 520;
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(942, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(912, 41);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 226;
            this.txt_checkDate.Tag = "readonly";
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(390, 105);
            this.txt_remark.Location = new System.Drawing.Point(636, 70);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(446, 24);
            this.txt_remark.Size = new System.Drawing.Size(200, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 252;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 222;
            this.txt_checkUser.Tag = "readonly";
@@ -644,10 +710,10 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(114, 74);
            this.txt_suppId.Location = new System.Drawing.Point(84, 70);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(170, 24);
            this.txt_suppId.Size = new System.Drawing.Size(200, 24);
            this.txt_suppId.TabIndex = 259;
            // 
            // txt_isOut
@@ -662,7 +728,7 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(840, 74);
            this.txt_status.Location = new System.Drawing.Point(840, 70);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(274, 24);
@@ -672,28 +738,28 @@
            // 
            // txt_isFinish
            // 
            this.txt_isFinish.Location = new System.Drawing.Point(564, 74);
            this.txt_isFinish.Location = new System.Drawing.Point(840, 99);
            this.txt_isFinish.Name = "txt_isFinish";
            this.txt_isFinish.Properties.Caption = "完结标识";
            this.txt_isFinish.Size = new System.Drawing.Size(272, 24);
            this.txt_isFinish.Size = new System.Drawing.Size(274, 24);
            this.txt_isFinish.StyleController = this.layoutMx1;
            this.txt_isFinish.TabIndex = 529;
            this.txt_isFinish.Tag = "readonly";
            // 
            // lastUpdateUser
            // 
            this.lastUpdateUser.Location = new System.Drawing.Point(666, 12);
            this.lastUpdateUser.Location = new System.Drawing.Point(636, 12);
            this.lastUpdateUser.Name = "lastUpdateUser";
            this.lastUpdateUser.Size = new System.Drawing.Size(170, 24);
            this.lastUpdateUser.Size = new System.Drawing.Size(200, 24);
            this.lastUpdateUser.StyleController = this.layoutMx1;
            this.lastUpdateUser.TabIndex = 530;
            this.lastUpdateUser.Tag = "readonly";
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(666, 43);
            this.lastUpdateTime.Location = new System.Drawing.Point(636, 41);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(170, 24);
            this.lastUpdateTime.Size = new System.Drawing.Size(200, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
            this.lastUpdateTime.TabIndex = 531;
            this.lastUpdateTime.Tag = "readonly";
@@ -705,6 +771,18 @@
            this.txt_guid.Size = new System.Drawing.Size(172, 24);
            this.txt_guid.StyleController = this.layoutMx1;
            this.txt_guid.TabIndex = 532;
            //
            // txt_fHasLinkRad
            //
            this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 99);
            this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
            this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有源单"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "无源单")});
            this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 32);
            this.txt_fHasLinkRad.StyleController = this.layoutMx1;
            this.txt_fHasLinkRad.TabIndex = 533;
            // 
            // layoutControlItem17
            // 
@@ -743,40 +821,48 @@
            this.layoutControlItem10,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem7,
            this.layoutControlItem11,
            this.layoutControlItem12,
            this.layoutControlItem4,
            this.layoutControlItem16});
            this.layoutControlItem16,
            this.layoutControlItem12,
            this.layoutControlItem7,
            this.layoutControlItem3,
            this.layItem1,
            this.layItem3,
            this.layItem2,
            this.layItem4});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 36D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1126, 146);
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1126, 172);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -784,41 +870,41 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_thOrgId;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_returnType;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 58);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem6.Text = "退料原因";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_returnMethod;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 29);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem5.Text = "退料方式";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
@@ -826,7 +912,7 @@
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem8.Text = "委外标识";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
@@ -838,101 +924,165 @@
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 29);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.CustomizationFormText = "最后更新";
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem14.Text = "更新人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 29);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 93);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 33);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem15.Text = "更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 58);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 62);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            //
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem4.Text = "选供应商";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 36);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 58);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layoutControlItem3.Control = this.txt_fHasLinkRad;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 87);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem3.Text = "源单类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem1
            //
            this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem1.Control = this.txt_fRequireOrgId;
            this.layItem1.Location = new System.Drawing.Point(0, 123);
            this.layItem1.Name = "layItem1";
            this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem1.Size = new System.Drawing.Size(276, 29);
            this.layItem1.Text = "需求组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem3
            //
            this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem3.Control = this.txt_fPurchaserId;
            this.layItem3.Location = new System.Drawing.Point(828, 123);
            this.layItem3.Name = "layItem3";
            this.layItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layItem3.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem3.Size = new System.Drawing.Size(278, 29);
            this.layItem3.Text = "员工编号";
            this.layItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem2
            //
            this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem2.Control = this.txt_fPurchaseDeptId;
            this.layItem2.Location = new System.Drawing.Point(552, 123);
            this.layItem2.Name = "layItem2";
            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem2.Size = new System.Drawing.Size(276, 29);
            this.layItem2.Text = "采购部门";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem4
            //
            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem4.Control = this.txt_fOwnerIdHead;
            this.layItem4.Location = new System.Drawing.Point(276, 123);
            this.layItem4.Name = "layItem4";
            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem4.Size = new System.Drawing.Size(276, 29);
            this.layItem4.Text = "货主";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -940,7 +1090,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 412);
            this.tabMx.Size = new System.Drawing.Size(1126, 386);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -949,7 +1099,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 380);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
@@ -961,7 +1111,7 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.rptCk});
            this.gcMx1.Size = new System.Drawing.Size(1124, 380);
            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1209,10 +1359,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1237,6 +1387,14 @@
            this.gridColumn8.VisibleIndex = 12;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn10
            //
            this.gridColumn10.Caption = "仓库ID";
            this.gridColumn10.FieldName = "depotId";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Width = 94;
            //
            // gridColumn9
            // 
            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1255,9 +1413,9 @@
            // rptCk
            // 
            this.rptCk.AutoHeight = false;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptCk.Name = "rptCk";
            this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
            // 
@@ -1271,16 +1429,6 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "仓库ID";
            this.gridColumn10.FieldName = "depotId";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 14;
            this.gridColumn10.Width = 94;
            // 
            // Frm_MesCgthSq
            // 
@@ -1323,6 +1471,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1335,11 +1484,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1428,9 +1582,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.TextEdit txt_guid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
@@ -1441,5 +1593,18 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private UserControl.UcLookStaff txt_fPurchaserId;
        private UserControl.UcLookDepartment txt_fPurchaseDeptId;
        private UserControl.UcLookOrg txt_fRequireOrgId;
        private DevExpress.XtraLayout.LayoutControlItem layItem1;
        private DevExpress.XtraLayout.LayoutControlItem layItem3;
        private DevExpress.XtraLayout.LayoutControlItem layItem2;
        private UserControl.UcLookOrg txt_fOwnerIdHead;
        private DevExpress.XtraLayout.LayoutControlItem layItem4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -16,6 +16,7 @@
        string _webServiceName = "MesCgthSqManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        string _ucGys = "";//供应商
        string _ucBm = "";//部门
        public Frm_MesCgthSq()
        {
            InitializeComponent();
@@ -51,6 +52,8 @@
                if (string.IsNullOrEmpty(orgId))
                    return;
                txt_suppId.getSuppler(orgId, _ucGys);
                txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
                // txt_fPurchaserId.getSuppler();
            };
            //选择需要的明细
            btnSelect.Click += (s, e) =>
@@ -60,38 +63,61 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商!");
                    return;
                }
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                if (txt_fHasLinkRad.SelectedIndex == 0)
                {
                    try
                    var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
                    //赋值给明细表
                    frm.UpdateParent += (ss, ee) =>
                    {
                        var lst = new List<string>();
                        lst = ee.StringList;
                        var _obj = lst;
                        var strReturn = UtilityHelper.HttpPost("",
                            _webServiceName + "SelectFormTo",
                            JsonConvert.SerializeObject(_obj));
                        var dt = UtilityHelper.ReturnToList(strReturn);
                        DataTable _newTable = dt.rtnData;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        try
                        {
                            _oldTable.ImportRow(sourceRows[i]);
                            var lst = new List<string>();
                            lst = ee.StringList;
                            var _obj = lst;
                            var strReturn = UtilityHelper.HttpPost("",
                                _webServiceName + "SelectFormTo",
                                JsonConvert.SerializeObject(_obj));
                            var dt = UtilityHelper.ReturnToList(strReturn);
                            DataTable _newTable = dt.rtnData;
                            DataTable _oldTable = (DataTable)gcMx1.DataSource;
                            DataRow[] sourceRows = _newTable.Select();
                            for (int i = 0; i < sourceRows.Length; i++)
                            {
                                _oldTable.ImportRow(sourceRows[i]);
                            }
                            gcMx1.BindingContext = new BindingContext();
                            gcMx1.DataSource = _oldTable;
                            gcMx1.ForceInitialize();
                            gvMx1.BestFitColumns();
                            Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _oldTable;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    catch (Exception ex)
                        catch (Exception ex)
                        {
                            MessageBox.Show(ex.Message);
                        }
                    };
                    frm.ShowDialog();
                    return;
                }
                if (txt_fHasLinkRad.SelectedIndex == 1)
                {
                    var frm2 = new SelectMesCgthSqLink(this.txt_thOrgId.GetId());
                    frm2.UpdateParent += (ss, ee) =>
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
                    };
                    frm2.ShowDialog();
                    return;
                }
            };
            //源单事件
            txt_fHasLinkRad.SelectedIndex = 0;
            layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
            {
                setSrm();
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -271,6 +297,15 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            setSrm();
            txt_thOrgId.IsReadly = true;
            txt_suppId.IsReadly = true;
            txt_fHasLinkRad.ReadOnly = true;
            txt_fRequireOrgId.IsReadly = true;
            txt_fOwnerIdHead.IsReadly = true;
            txt_fPurchaseDeptId.IsReadly = true;
            txt_fPurchaserId.IsReadly = true;
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -287,7 +322,9 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时,默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_thOrgId);
            string deftXqOrg = UtilityHelper.GetFirstOrg(txt_fRequireOrgId);
            string deftHzOrg = UtilityHelper.GetFirstOrg(txt_fOwnerIdHead);
            setSrm();
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -298,30 +335,62 @@
        {
            toolBarMenu1.isSetBtn = false;
            var _gysId = txt_suppId.GetId(); //供应商编号
            string _orgId = txt_thOrgId.GetId();
            string _orgId = txt_thOrgId.GetId();//退货组织
            string _xqzz = txt_fRequireOrgId.GetId();//需求组织
            string _hz = txt_fOwnerIdHead.GetId();//货主
            string _bm = txt_fPurchaseDeptId.GetId();//部门
            string _ygbh = txt_fPurchaserId.GetId();//员工
            if (string.IsNullOrEmpty(_orgId))
            {
                MsgHelper.Warning("请选择组织!");
                MsgHelper.ShowError("请选择组织!");
                txt_thOrgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_gysId))
            {
                MsgHelper.Warning("请选择供应商!");
                MsgHelper.ShowError("请选择供应商!");
                txt_suppId.Focus();
                return;
            }
            if (txt_returnMethod.SelectedIndex <= 0)
            {
                MsgHelper.Warning("请选择退料方式!");
                MsgHelper.ShowError("请选择退料方式!");
                txt_returnMethod.Focus();
                return;
            }
            if (txt_returnType.SelectedIndex <= 0)
            {
                MsgHelper.Warning("请选择退料原因!");
                MsgHelper.ShowError("请选择退料原因!");
                txt_returnType.Focus();
                return;
            }
            //无源单要加上条件
            if (txt_fHasLinkRad.SelectedIndex == 1)
            {
                if (string.IsNullOrEmpty(_xqzz))
                {
                    MsgHelper.ShowError("请选择需求组织!");
                    txt_fRequireOrgId.Focus();
                    return;
                }
                if (string.IsNullOrEmpty(_hz))
                {
                    MsgHelper.ShowError("请选择货主!");
                    txt_fOwnerIdHead.Focus();
                    return;
                }
                if (string.IsNullOrEmpty(_bm))
                {
                    MsgHelper.ShowError("请选择部门!");
                    txt_fPurchaseDeptId.Focus();
                    return;
                }
                if (string.IsNullOrEmpty(_ygbh))
                {
                    MsgHelper.ShowError("请选择员工!");
                    txt_fPurchaserId.Focus();
                    return;
                }
            }
            var _obj = new
            {
@@ -331,6 +400,12 @@
                FType = txt_isOut.Checked == true ? 1 : 0,  //0=采购,1=委外
                Fmrmode = txt_returnMethod.Text,//退料方式
                Reason = txt_returnType.Text,//退料原因
                thOrgId = _orgId,
                fHasLink = txt_fHasLinkRad.SelectedIndex,
                fRequireOrgId = _xqzz,
                fPurchaseDeptId = _bm,
                fPurchaserId = _ygbh,
                fOwnerIdHead = _hz,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -375,9 +450,9 @@
                    _webServiceName + "EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_billNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -387,10 +462,12 @@
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -447,7 +524,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -462,11 +539,13 @@
                {
                    dynamic dy = _rtn.rtnData;
                    _ucGys = dy.suppId;
                    _ucBm = dy.fPurchaseDeptId;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                    _ucGys = "";
                    _ucBm = "";
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -486,13 +565,14 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    setSrm();
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -510,13 +590,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -532,9 +613,9 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -543,10 +624,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -587,13 +670,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                        getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    }
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
@@ -608,13 +693,13 @@
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            //var dr = gvMx1.GetDataRow(rowhandle);
            var strOrgGuid = txt_thOrgId.GetId();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.Warning("提示:请先选择调出组织!");
                MsgHelper.ShowError("提示:请先选择调出组织!");
                return;
            };
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            frm.UpdateParent += (ss, ee) =>
            {
@@ -625,5 +710,26 @@
            };
            frm.ShowDialog();
        }
        private void setSrm()
        {
            int ddd = txt_fHasLinkRad.SelectedIndex;
            if (ddd == 0)
            {
                layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }
            else
            {
                layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -37,6 +37,7 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //打印事件
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
@@ -61,15 +62,17 @@
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                this.ucBtnPrint1.rptParameter = "rpt_Arrival{" + lbMxGuid.Text.Trim()
                this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
                       + lbMxGuid.Text.Trim()//关联主键
                       + "," + ""
                        + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//余数
                       + "," + txt_iCount_1.Text.Trim()//张数
                       + "," + txt_psnQty_1.Text.Trim()//每张条码数量
                       + "}";
                txt_iCount_1.Text = "";
                txt_psnQty_1.Text = "";
            };
            //打印批量操作事件
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
@@ -85,7 +88,7 @@
                try
                {
                    string rptParameter = "rpt_Arrival{"
                    + "100"
                    + "100"//重打都是传100,
                    + "," + ""
                    + "," + ""
                    + "," + ""
@@ -104,7 +107,7 @@
                }
            };
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            //自动计算打印量
            //打印自动计算
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1049,6 +1049,12 @@
    <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectMesCgthSqLink.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectMesCgthSqLink.Designer.cs">
      <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectSrm.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1826,6 +1832,9 @@
    <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectMesCgthSqLink.resx">
      <DependentUpon>SelectMesCgthSqLink.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectSrm.resx">
      <DependentUpon>SelectSrm.cs</DependentUpon>
    </EmbeddedResource>
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -453,6 +453,15 @@
                            txt.Enabled = !isEdt;
                            continue;
                        }
                        //多选
                        if (colType is RadioGroup)
                        {
                            var txt = colType as RadioGroup;
                            if (txt != null)
                                txt.SelectedIndex =int.Parse( strVal);
                            txt.ReadOnly = isEdt;
                            continue;
                        }
                        //时间
                        if (colType is DateTimePicker)
                        {
@@ -747,6 +756,15 @@
                        txt.ReadOnly = isEdt;
                    continue;
                }
                //多选
                if (ctrl is RadioGroup)
                {
                    var txt = ctrl as RadioGroup;
                    if (txt != null)
                        txt.SelectedIndex = 0;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //时间
                if (ctrl is DateTimePicker)
                {
@@ -1007,6 +1025,13 @@
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //多选
                if (ctrl is RadioGroup)
                {
                    var txt = ctrl as RadioGroup;
                    txt.ReadOnly = isEdt;
                    continue;
                }
                //日期
                if (ctrl is DateTimePicker)
                {
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,208 @@
namespace Gs.DevApp.UserControl
{
    partial class SelectMesCgthSqLink
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
            this.panelControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.SuspendLayout();
            //
            // panelControl2
            //
            this.panelControl2.Controls.Add(this.gcMain);
            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.panelControl2.Location = new System.Drawing.Point(0, 0);
            this.panelControl2.Name = "panelControl2";
            this.panelControl2.Size = new System.Drawing.Size(855, 691);
            this.panelControl2.TabIndex = 4;
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(2, 2);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMain.Size = new System.Drawing.Size(851, 687);
            this.gcMain.TabIndex = 6;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 60;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_depotCode,
            this.gv_depotName,
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn4,
            this.gv_Btn});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_depotCode
            //
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "物料ID";
            this.gv_depotCode.FieldName = "itemId";
            this.gv_depotCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_depotCode.MinWidth = 50;
            this.gv_depotCode.Name = "gv_depotCode";
            this.gv_depotCode.OptionsColumn.AllowEdit = false;
            this.gv_depotCode.Tag = "query_a.depot_code";
            this.gv_depotCode.Width = 100;
            //
            // gv_depotName
            //
            this.gv_depotName.AppearanceCell.Options.UseFont = true;
            this.gv_depotName.Caption = "物料编码";
            this.gv_depotName.FieldName = "itemNo";
            this.gv_depotName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_depotName.MinWidth = 50;
            this.gv_depotName.Name = "gv_depotName";
            this.gv_depotName.OptionsColumn.AllowEdit = false;
            this.gv_depotName.Tag = "query_a.depot_name";
            this.gv_depotName.Visible = true;
            this.gv_depotName.VisibleIndex = 0;
            this.gv_depotName.Width = 150;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "fSubsidiary2";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "org.FNumber";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 3;
            this.gridColumn1.Width = 250;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "itemName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "规格型号";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 94;
            //
            // gv_Btn
            //
            this.gv_Btn.Caption = "选择";
            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gv_Btn.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 4;
            this.gv_Btn.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "选择", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // SelectMesCgthSqLink
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(855, 691);
            this.Controls.Add(this.panelControl2);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "SelectMesCgthSqLink";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择物料无源单";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
            this.panelControl2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraEditors.PanelControl panelControl2;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
    public partial class SelectMesCgthSqLink : DevExpress.XtraEditors.XtraForm
    {
        public readonly string _webServiceName = "MesItemsManager/";
        public string orgId = "";
        /// <summary>
        ///
        /// </summary>
        /// <param name="_suppId">供应商</param>
        /// <param name="_receiveOrgId">收料组织</param>
        /// <param name="_isWw">是否委外</param>
        public SelectMesCgthSqLink(string _orgId)
        {
            InitializeComponent();
            this.orgId = _orgId;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
        }
        /// <summary>
        ///     é€‰æ‹©åŽçš„回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = " and a.FSubsidiary=" + orgId;
            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.staff_no", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage2", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// é€‰æ‹©ç‰©æ–™
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gridView1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gridView1.GetDataRow(rowhandle);
                var itemId = dr["itemId"].ToString();
                if (string.IsNullOrEmpty(itemId))
                {
                    return;
                }
                var list = new List<dynamic>();
                list.Add(new
                {
                    itemId = itemId,
                });
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
               Close();
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -153,6 +153,7 @@
                }
                catch (Exception)
                {
                }
                return;
            }