dev前台代码
上一版本: 5c3fe6cf | 补丁 | 提交 | 显示空白
lu
2025-03-27 ca4c6a573fa25869ea93bd3bcb0345a06f29d0ef 
受托
已修改4个文件
353 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs


@@ -42,7 +42,7 @@


            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();


            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();


            this.gcMain = new DevExpress.XtraGrid.GridControl();


            this.gcMain1 = new DevExpress.XtraGrid.GridControl();


            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();


@@ -158,7 +158,7 @@


            this.split1.Panel1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();


            this.split1.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();


            this.xtraTabPage2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();


@@ -274,7 +274,7 @@


            // 


            // split1.Panel1


            // 


            this.split1.Panel1.Controls.Add(this.gcMain);


            this.split1.Panel1.Controls.Add(this.gcMain1);


            this.split1.Panel1.Controls.Add(this.pageBar1);


            this.split1.Panel1.Text = "Panel1";


            // 


@@ -285,16 +285,16 @@


            this.split1.SplitterPosition = 528;


            this.split1.TabIndex = 0;


            // 


            // gcMain


            // gcMain1


            // 


            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gcMain.Location = new System.Drawing.Point(0, 0);


            this.gcMain.MainView = this.gridView1;


            this.gcMain.Name = "gcMain";


            this.gcMain.Size = new System.Drawing.Size(1126, 489);


            this.gcMain.TabIndex = 2;


            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gcMain1.Location = new System.Drawing.Point(0, 0);


            this.gcMain1.MainView = this.gridView1;


            this.gcMain1.Name = "gcMain1";


            this.gcMain1.Size = new System.Drawing.Size(1126, 489);


            this.gcMain1.TabIndex = 2;


            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gridView1});


            // 


            // gridView1


@@ -324,7 +324,7 @@


            this.gridColumn34,


            this.gridColumn35,


            this.gridColumn36});


            this.gridView1.GridControl = this.gcMain;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


            this.gridView1.OptionsFind.ShowSearchNavButtons = false;


@@ -390,8 +390,6 @@


            this.gridColumn1.Caption = "移出仓库ID";


            this.gridColumn1.FieldName = "fromDepotsId";


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 4;


            this.gridColumn1.Width = 94;


            // 


            // gv_depotCode


@@ -403,8 +401,6 @@


            this.gv_depotCode.Name = "gv_depotCode";


            this.gv_depotCode.OptionsColumn.AllowEdit = false;


            this.gv_depotCode.Tag = "query_a.depot_code";


            this.gv_depotCode.Visible = true;


            this.gv_depotCode.VisibleIndex = 5;


            this.gv_depotCode.Width = 94;


            // 


            // gridColumn3


@@ -413,7 +409,7 @@


            this.gridColumn3.FieldName = "createBy";


            this.gridColumn3.Name = "gridColumn3";


            this.gridColumn3.Visible = true;


            this.gridColumn3.VisibleIndex = 6;


            this.gridColumn3.VisibleIndex = 4;


            this.gridColumn3.Width = 94;


            // 


            // gv_createDate


@@ -426,16 +422,16 @@


            this.gv_createDate.OptionsColumn.AllowEdit = false;


            this.gv_createDate.Tag = "query_a.create_date";


            this.gv_createDate.Visible = true;


            this.gv_createDate.VisibleIndex = 7;


            this.gv_createDate.VisibleIndex = 5;


            this.gv_createDate.Width = 180;


            // 


            // gridColumn4


            // 


            this.gridColumn4.Caption = "审核人";


            this.gridColumn4.FieldName = "checkUser";


            this.gridColumn4.FieldName = "checkuser";


            this.gridColumn4.Name = "gridColumn4";


            this.gridColumn4.Visible = true;


            this.gridColumn4.VisibleIndex = 8;


            this.gridColumn4.VisibleIndex = 6;


            this.gridColumn4.Width = 94;


            // 


            // gv_checkDate


@@ -443,12 +439,12 @@


            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_checkDate.AppearanceCell.Options.UseFont = true;


            this.gv_checkDate.Caption = "审核日期 ";


            this.gv_checkDate.FieldName = "checkDate";


            this.gv_checkDate.FieldName = "checkdate";


            this.gv_checkDate.Name = "gv_checkDate";


            this.gv_checkDate.OptionsColumn.AllowEdit = false;


            this.gv_checkDate.Tag = "query_a.check_date";


            this.gv_checkDate.Visible = true;


            this.gv_checkDate.VisibleIndex = 9;


            this.gv_checkDate.VisibleIndex = 7;


            this.gv_checkDate.Width = 180;


            // 


            // gridColumn7


@@ -458,7 +454,7 @@


            this.gridColumn7.MinWidth = 25;


            this.gridColumn7.Name = "gridColumn7";


            this.gridColumn7.Visible = true;


            this.gridColumn7.VisibleIndex = 10;


            this.gridColumn7.VisibleIndex = 8;


            this.gridColumn7.Width = 94;


            // 


            // gridColumn11


@@ -468,7 +464,7 @@


            this.gridColumn11.MinWidth = 25;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 11;


            this.gridColumn11.VisibleIndex = 9;


            this.gridColumn11.Width = 94;


            // 


            // gridColumn12


@@ -478,7 +474,7 @@


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 12;


            this.gridColumn12.VisibleIndex = 10;


            this.gridColumn12.Width = 94;


            // 


            // gridColumn31


@@ -488,7 +484,7 @@


            this.gridColumn31.MinWidth = 25;


            this.gridColumn31.Name = "gridColumn31";


            this.gridColumn31.Visible = true;


            this.gridColumn31.VisibleIndex = 13;


            this.gridColumn31.VisibleIndex = 11;


            this.gridColumn31.Width = 94;


            // 


            // gridColumn32


@@ -498,7 +494,7 @@


            this.gridColumn32.MinWidth = 25;


            this.gridColumn32.Name = "gridColumn32";


            this.gridColumn32.Visible = true;


            this.gridColumn32.VisibleIndex = 14;


            this.gridColumn32.VisibleIndex = 12;


            this.gridColumn32.Width = 94;


            // 


            // gridColumn33


@@ -508,7 +504,7 @@


            this.gridColumn33.MinWidth = 25;


            this.gridColumn33.Name = "gridColumn33";


            this.gridColumn33.Visible = true;


            this.gridColumn33.VisibleIndex = 15;


            this.gridColumn33.VisibleIndex = 13;


            this.gridColumn33.Width = 94;


            // 


            // gridColumn34


@@ -518,7 +514,7 @@


            this.gridColumn34.MinWidth = 25;


            this.gridColumn34.Name = "gridColumn34";


            this.gridColumn34.Visible = true;


            this.gridColumn34.VisibleIndex = 16;


            this.gridColumn34.VisibleIndex = 14;


            this.gridColumn34.Width = 94;


            // 


            // gridColumn35


@@ -528,7 +524,7 @@


            this.gridColumn35.MinWidth = 25;


            this.gridColumn35.Name = "gridColumn35";


            this.gridColumn35.Visible = true;


            this.gridColumn35.VisibleIndex = 17;


            this.gridColumn35.VisibleIndex = 15;


            this.gridColumn35.Width = 94;


            // 


            // gridColumn36


@@ -538,7 +534,7 @@


            this.gridColumn36.MinWidth = 25;


            this.gridColumn36.Name = "gridColumn36";


            this.gridColumn36.Visible = true;


            this.gridColumn36.VisibleIndex = 18;


            this.gridColumn36.VisibleIndex = 16;


            this.gridColumn36.Width = 94;


            // 


            // pageBar1


@@ -628,22 +624,22 @@


            // 


            // txt_fOwnerTypeInIdHead


            // 


            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(385, 108);


            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 108);


            this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";


            this.txt_fOwnerTypeInIdHead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fOwnerTypeInIdHead.Properties.Appearance.Options.UseFont = true;


            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(165, 28);


            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(170, 28);


            this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;


            this.txt_fOwnerTypeInIdHead.TabIndex = 432;


            this.txt_fOwnerTypeInIdHead.Tag = "readonly";


            // 


            // txt_ckName


            // 


            this.txt_ckName.Location = new System.Drawing.Point(927, 140);


            this.txt_ckName.Location = new System.Drawing.Point(942, 140);


            this.txt_ckName.Name = "txt_ckName";


            this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_ckName.Properties.Appearance.Options.UseFont = true;


            this.txt_ckName.Size = new System.Drawing.Size(166, 28);


            this.txt_ckName.Size = new System.Drawing.Size(172, 28);


            this.txt_ckName.StyleController = this.layoutMx1;


            this.txt_ckName.TabIndex = 422;


            this.txt_ckName.Tag = "readonly";


@@ -654,18 +650,18 @@


            this.txt_fTransferDirect.Name = "txt_fTransferDirect";


            this.txt_fTransferDirect.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fTransferDirect.Properties.Appearance.Options.UseFont = true;


            this.txt_fTransferDirect.Size = new System.Drawing.Size(165, 28);


            this.txt_fTransferDirect.Size = new System.Drawing.Size(170, 28);


            this.txt_fTransferDirect.StyleController = this.layoutMx1;


            this.txt_fTransferDirect.TabIndex = 434;


            this.txt_fTransferDirect.Tag = "readonly";


            // 


            // txt_rkName


            // 


            this.txt_rkName.Location = new System.Drawing.Point(656, 140);


            this.txt_rkName.Location = new System.Drawing.Point(666, 140);


            this.txt_rkName.Name = "txt_rkName";


            this.txt_rkName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_rkName.Properties.Appearance.Options.UseFont = true;


            this.txt_rkName.Size = new System.Drawing.Size(165, 28);


            this.txt_rkName.Size = new System.Drawing.Size(170, 28);


            this.txt_rkName.StyleController = this.layoutMx1;


            this.txt_rkName.TabIndex = 420;


            this.txt_rkName.Tag = "readonly";


@@ -676,18 +672,18 @@


            this.txt_fBusinessType.Name = "txt_fBusinessType";


            this.txt_fBusinessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fBusinessType.Properties.Appearance.Options.UseFont = true;


            this.txt_fBusinessType.Size = new System.Drawing.Size(165, 28);


            this.txt_fBusinessType.Size = new System.Drawing.Size(170, 28);


            this.txt_fBusinessType.StyleController = this.layoutMx1;


            this.txt_fBusinessType.TabIndex = 433;


            this.txt_fBusinessType.Tag = "readonly";


            // 


            // txt_fOwnerTypeOutIdHead


            // 


            this.txt_fOwnerTypeOutIdHead.Location = new System.Drawing.Point(385, 76);


            this.txt_fOwnerTypeOutIdHead.Location = new System.Drawing.Point(390, 76);


            this.txt_fOwnerTypeOutIdHead.Name = "txt_fOwnerTypeOutIdHead";


            this.txt_fOwnerTypeOutIdHead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fOwnerTypeOutIdHead.Properties.Appearance.Options.UseFont = true;


            this.txt_fOwnerTypeOutIdHead.Size = new System.Drawing.Size(165, 28);


            this.txt_fOwnerTypeOutIdHead.Size = new System.Drawing.Size(170, 28);


            this.txt_fOwnerTypeOutIdHead.StyleController = this.layoutMx1;


            this.txt_fOwnerTypeOutIdHead.TabIndex = 431;


            this.txt_fOwnerTypeOutIdHead.Tag = "readonly";


@@ -698,39 +694,39 @@


            this.txt_fRemarks.Name = "txt_fRemarks";


            this.txt_fRemarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;


            this.txt_fRemarks.Size = new System.Drawing.Size(165, 28);


            this.txt_fRemarks.Size = new System.Drawing.Size(170, 28);


            this.txt_fRemarks.StyleController = this.layoutMx1;


            this.txt_fRemarks.TabIndex = 402;


            // 


            // txt_taskNo


            // 


            this.txt_taskNo.Location = new System.Drawing.Point(385, 140);


            this.txt_taskNo.Location = new System.Drawing.Point(390, 140);


            this.txt_taskNo.Name = "txt_taskNo";


            this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_taskNo.Properties.Appearance.Options.UseFont = true;


            this.txt_taskNo.Size = new System.Drawing.Size(165, 28);


            this.txt_taskNo.Size = new System.Drawing.Size(170, 28);


            this.txt_taskNo.StyleController = this.layoutMx1;


            this.txt_taskNo.TabIndex = 395;


            this.txt_taskNo.Tag = "readonly";


            // 


            // txt_ftranstype


            // 


            this.txt_ftranstype.Location = new System.Drawing.Point(385, 44);


            this.txt_ftranstype.Location = new System.Drawing.Point(390, 44);


            this.txt_ftranstype.Name = "txt_ftranstype";


            this.txt_ftranstype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_ftranstype.Properties.Appearance.Options.UseFont = true;


            this.txt_ftranstype.Size = new System.Drawing.Size(165, 28);


            this.txt_ftranstype.Size = new System.Drawing.Size(170, 28);


            this.txt_ftranstype.StyleController = this.layoutMx1;


            this.txt_ftranstype.TabIndex = 430;


            this.txt_ftranstype.Tag = "readonly";


            // 


            // txt_createDate


            // 


            this.txt_createDate.Location = new System.Drawing.Point(927, 44);


            this.txt_createDate.Location = new System.Drawing.Point(942, 44);


            this.txt_createDate.Name = "txt_createDate";


            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_createDate.Properties.Appearance.Options.UseFont = true;


            this.txt_createDate.Size = new System.Drawing.Size(166, 28);


            this.txt_createDate.Size = new System.Drawing.Size(172, 28);


            this.txt_createDate.StyleController = this.layoutMx1;


            this.txt_createDate.TabIndex = 427;


            this.txt_createDate.Tag = "readonly";


@@ -741,7 +737,7 @@


            this.txt_billNo.Name = "txt_billNo";


            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_billNo.Properties.Appearance.Options.UseFont = true;


            this.txt_billNo.Size = new System.Drawing.Size(165, 28);


            this.txt_billNo.Size = new System.Drawing.Size(170, 28);


            this.txt_billNo.StyleController = this.layoutMx1;


            this.txt_billNo.TabIndex = 418;


            this.txt_billNo.Tag = "readonly";


@@ -752,110 +748,110 @@


            this.txt_fBillTypeID.Name = "txt_fBillTypeID";


            this.txt_fBillTypeID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fBillTypeID.Properties.Appearance.Options.UseFont = true;


            this.txt_fBillTypeID.Size = new System.Drawing.Size(165, 28);


            this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 28);


            this.txt_fBillTypeID.StyleController = this.layoutMx1;


            this.txt_fBillTypeID.TabIndex = 429;


            this.txt_fBillTypeID.Tag = "readonly";


            // 


            // txt_fapporgName


            // 


            this.txt_fapporgName.Location = new System.Drawing.Point(385, 12);


            this.txt_fapporgName.Location = new System.Drawing.Point(390, 12);


            this.txt_fapporgName.Name = "txt_fapporgName";


            this.txt_fapporgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fapporgName.Properties.Appearance.Options.UseFont = true;


            this.txt_fapporgName.Size = new System.Drawing.Size(165, 28);


            this.txt_fapporgName.Size = new System.Drawing.Size(170, 28);


            this.txt_fapporgName.StyleController = this.layoutMx1;


            this.txt_fapporgName.TabIndex = 428;


            this.txt_fapporgName.Tag = "readonly";


            // 


            // txt_fCreatorId


            // 


            this.txt_fCreatorId.Location = new System.Drawing.Point(656, 12);


            this.txt_fCreatorId.Location = new System.Drawing.Point(666, 12);


            this.txt_fCreatorId.Name = "txt_fCreatorId";


            this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;


            this.txt_fCreatorId.Size = new System.Drawing.Size(165, 28);


            this.txt_fCreatorId.Size = new System.Drawing.Size(170, 28);


            this.txt_fCreatorId.StyleController = this.layoutMx1;


            this.txt_fCreatorId.TabIndex = 415;


            this.txt_fCreatorId.Tag = "readonly";


            // 


            // txt_djcheckdate


            // 


            this.txt_djcheckdate.Location = new System.Drawing.Point(656, 108);


            this.txt_djcheckdate.Location = new System.Drawing.Point(666, 108);


            this.txt_djcheckdate.Name = "txt_djcheckdate";


            this.txt_djcheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_djcheckdate.Properties.Appearance.Options.UseFont = true;


            this.txt_djcheckdate.Size = new System.Drawing.Size(165, 28);


            this.txt_djcheckdate.Size = new System.Drawing.Size(170, 28);


            this.txt_djcheckdate.StyleController = this.layoutMx1;


            this.txt_djcheckdate.TabIndex = 392;


            this.txt_djcheckdate.Tag = "readonly";


            // 


            // txt_createBy


            // 


            this.txt_createBy.Location = new System.Drawing.Point(927, 12);


            this.txt_createBy.Location = new System.Drawing.Point(942, 12);


            this.txt_createBy.Name = "txt_createBy";


            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_createBy.Properties.Appearance.Options.UseFont = true;


            this.txt_createBy.Size = new System.Drawing.Size(166, 28);


            this.txt_createBy.Size = new System.Drawing.Size(172, 28);


            this.txt_createBy.StyleController = this.layoutMx1;


            this.txt_createBy.TabIndex = 425;


            this.txt_createBy.Tag = "readonly";


            // 


            // txt_fCreateDate


            // 


            this.txt_fCreateDate.Location = new System.Drawing.Point(656, 44);


            this.txt_fCreateDate.Location = new System.Drawing.Point(666, 44);


            this.txt_fCreateDate.Name = "txt_fCreateDate";


            this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;


            this.txt_fCreateDate.Size = new System.Drawing.Size(165, 28);


            this.txt_fCreateDate.Size = new System.Drawing.Size(170, 28);


            this.txt_fCreateDate.StyleController = this.layoutMx1;


            this.txt_fCreateDate.TabIndex = 417;


            this.txt_fCreateDate.Tag = "readonly";


            // 


            // txt_djcheckuser


            // 


            this.txt_djcheckuser.Location = new System.Drawing.Point(656, 76);


            this.txt_djcheckuser.Location = new System.Drawing.Point(666, 76);


            this.txt_djcheckuser.Name = "txt_djcheckuser";


            this.txt_djcheckuser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_djcheckuser.Properties.Appearance.Options.UseFont = true;


            this.txt_djcheckuser.Size = new System.Drawing.Size(165, 28);


            this.txt_djcheckuser.Size = new System.Drawing.Size(170, 28);


            this.txt_djcheckuser.StyleController = this.layoutMx1;


            this.txt_djcheckuser.TabIndex = 390;


            this.txt_djcheckuser.Tag = "readonly";


            // 


            // txt_statusChk


            // 


            this.txt_statusChk.Location = new System.Drawing.Point(825, 76);


            this.txt_statusChk.Location = new System.Drawing.Point(840, 76);


            this.txt_statusChk.Name = "txt_statusChk";


            this.txt_statusChk.Properties.Caption = "审核状态";


            this.txt_statusChk.Size = new System.Drawing.Size(268, 24);


            this.txt_statusChk.Size = new System.Drawing.Size(274, 24);


            this.txt_statusChk.StyleController = this.layoutMx1;


            this.txt_statusChk.TabIndex = 435;


            this.txt_statusChk.Tag = "readonly";


            // 


            // txt_wjChk


            // 


            this.txt_wjChk.Location = new System.Drawing.Point(825, 108);


            this.txt_wjChk.Location = new System.Drawing.Point(840, 108);


            this.txt_wjChk.Name = "txt_wjChk";


            this.txt_wjChk.Properties.Caption = "完结标识";


            this.txt_wjChk.Size = new System.Drawing.Size(268, 24);


            this.txt_wjChk.Size = new System.Drawing.Size(274, 24);


            this.txt_wjChk.StyleController = this.layoutMx1;


            this.txt_wjChk.TabIndex = 436;


            this.txt_wjChk.Tag = "readonly";


            // 


            // txt_drHz


            // 


            this.txt_drHz.Location = new System.Drawing.Point(656, 172);


            this.txt_drHz.Location = new System.Drawing.Point(666, 172);


            this.txt_drHz.Name = "txt_drHz";


            this.txt_drHz.Size = new System.Drawing.Size(165, 24);


            this.txt_drHz.Size = new System.Drawing.Size(170, 24);


            this.txt_drHz.StyleController = this.layoutMx1;


            this.txt_drHz.TabIndex = 438;


            // 


            // txt_dcHz


            // 


            this.txt_dcHz.Location = new System.Drawing.Point(385, 172);


            this.txt_dcHz.Location = new System.Drawing.Point(390, 172);


            this.txt_dcHz.Name = "txt_dcHz";


            this.txt_dcHz.Size = new System.Drawing.Size(165, 24);


            this.txt_dcHz.Size = new System.Drawing.Size(170, 24);


            this.txt_dcHz.StyleController = this.layoutMx1;


            this.txt_dcHz.TabIndex = 439;


            // 


@@ -863,15 +859,15 @@


            // 


            this.txt_fSrcType.Location = new System.Drawing.Point(114, 172);


            this.txt_fSrcType.Name = "txt_fSrcType";


            this.txt_fSrcType.Size = new System.Drawing.Size(165, 24);


            this.txt_fSrcType.Size = new System.Drawing.Size(170, 24);


            this.txt_fSrcType.StyleController = this.layoutMx1;


            this.txt_fSrcType.TabIndex = 440;


            // 


            // txt_djtype


            // 


            this.txt_djtype.Location = new System.Drawing.Point(927, 172);


            this.txt_djtype.Location = new System.Drawing.Point(942, 172);


            this.txt_djtype.Name = "txt_djtype";


            this.txt_djtype.Size = new System.Drawing.Size(166, 24);


            this.txt_djtype.Size = new System.Drawing.Size(172, 24);


            this.txt_djtype.StyleController = this.layoutMx1;


            this.txt_djtype.TabIndex = 441;


            // 


@@ -950,7 +946,7 @@


            rowDefinition4,


            rowDefinition5,


            rowDefinition6});


            this.Root.Size = new System.Drawing.Size(1105, 212);


            this.Root.Size = new System.Drawing.Size(1126, 212);


            this.Root.TextVisible = false;


            // 


            // layoutControlItem1


@@ -958,37 +954,37 @@


            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(271, 32);


            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem1.Text = "调拨单号";


            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem2


            // 


            this.layoutControlItem2.Control = this.txt_fapporgName;


            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);


            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);


            this.layoutControlItem2.Name = "layoutControlItem2";


            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem2.Text = "申请组织";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem3


            // 


            this.layoutControlItem3.Control = this.txt_fCreatorId;


            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);


            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);


            this.layoutControlItem3.Name = "layoutControlItem3";


            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem3.Text = "申请人";


            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem4


            // 


            this.layoutControlItem4.Control = this.txt_createBy;


            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);


            this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);


            this.layoutControlItem4.Name = "layoutControlItem4";


            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem4.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem4.Text = "创建人";


            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -998,40 +994,40 @@


            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem5.Text = "申请类型";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem6


            // 


            this.layoutControlItem6.Control = this.txt_ftranstype;


            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);


            this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem6.Text = "调拨类型";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_fCreateDate;


            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);


            this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem7.Text = "申请时间";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem8


            // 


            this.layoutControlItem8.Control = this.txt_createDate;


            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);


            this.layoutControlItem8.Location = new System.Drawing.Point(828, 32);


            this.layoutControlItem8.Name = "layoutControlItem8";


            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem8.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem8.Text = "创建时间";


            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1041,29 +1037,29 @@


            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);


            this.layoutControlItem9.Name = "layoutControlItem9";


            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem9.Text = "业务类型";


            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_fOwnerTypeOutIdHead;


            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);


            this.layoutControlItem10.Location = new System.Drawing.Point(276, 64);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem10.Text = "调出货主类型";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_djcheckuser;


            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);


            this.layoutControlItem11.Location = new System.Drawing.Point(552, 64);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem11.Text = "审核人";


            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1073,29 +1069,29 @@


            this.layoutControlItem12.Location = new System.Drawing.Point(0, 96);


            this.layoutControlItem12.Name = "layoutControlItem12";


            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem12.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem12.Text = "调拨方向";


            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem13


            // 


            this.layoutControlItem13.Control = this.txt_fOwnerTypeInIdHead;


            this.layoutControlItem13.Location = new System.Drawing.Point(271, 96);


            this.layoutControlItem13.Location = new System.Drawing.Point(276, 96);


            this.layoutControlItem13.Name = "layoutControlItem13";


            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem13.Text = "调入货主类型";


            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem14


            // 


            this.layoutControlItem14.Control = this.txt_djcheckdate;


            this.layoutControlItem14.Location = new System.Drawing.Point(542, 96);


            this.layoutControlItem14.Location = new System.Drawing.Point(552, 96);


            this.layoutControlItem14.Name = "layoutControlItem14";


            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem14.Text = "审核时间";


            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1105,18 +1101,18 @@


            this.layoutControlItem15.Location = new System.Drawing.Point(0, 128);


            this.layoutControlItem15.Name = "layoutControlItem15";


            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;


            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem15.Text = "备注";


            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem16


            // 


            this.layoutControlItem16.Control = this.txt_taskNo;


            this.layoutControlItem16.Location = new System.Drawing.Point(271, 128);


            this.layoutControlItem16.Location = new System.Drawing.Point(276, 128);


            this.layoutControlItem16.Name = "layoutControlItem16";


            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;


            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem16.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem16.Text = "申请单号";


            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1124,33 +1120,33 @@


            // 


            this.layoutControlItem17.Control = this.txt_rkName;


            this.layoutControlItem17.CustomizationFormText = "移入仓库";


            this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);


            this.layoutControlItem17.Location = new System.Drawing.Point(552, 128);


            this.layoutControlItem17.Name = "layoutControlItem17";


            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;


            this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem17.Text = "移入仓库";


            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem18


            // 


            this.layoutControlItem18.Control = this.txt_ckName;


            this.layoutControlItem18.Location = new System.Drawing.Point(813, 128);


            this.layoutControlItem18.Location = new System.Drawing.Point(828, 128);


            this.layoutControlItem18.Name = "layoutControlItem18";


            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;


            this.layoutControlItem18.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem18.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem18.Text = "移出仓库";


            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem19


            // 


            this.layoutControlItem19.Control = this.txt_statusChk;


            this.layoutControlItem19.Location = new System.Drawing.Point(813, 64);


            this.layoutControlItem19.Location = new System.Drawing.Point(828, 64);


            this.layoutControlItem19.Name = "layoutControlItem19";


            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem19.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem19.Text = "审核状态";


            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem19.TextVisible = false;


@@ -1158,11 +1154,11 @@


            // layoutControlItem20


            // 


            this.layoutControlItem20.Control = this.txt_wjChk;


            this.layoutControlItem20.Location = new System.Drawing.Point(813, 96);


            this.layoutControlItem20.Location = new System.Drawing.Point(828, 96);


            this.layoutControlItem20.Name = "layoutControlItem20";


            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem20.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem20.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem20.Text = "完结状态";


            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem20.TextVisible = false;


@@ -1170,22 +1166,22 @@


            // layoutControlItem22


            // 


            this.layoutControlItem22.Control = this.txt_drHz;


            this.layoutControlItem22.Location = new System.Drawing.Point(542, 160);


            this.layoutControlItem22.Location = new System.Drawing.Point(552, 160);


            this.layoutControlItem22.Name = "layoutControlItem22";


            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;


            this.layoutControlItem22.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem22.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem22.Text = "调入货主";


            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem23


            // 


            this.layoutControlItem23.Control = this.txt_dcHz;


            this.layoutControlItem23.Location = new System.Drawing.Point(271, 160);


            this.layoutControlItem23.Location = new System.Drawing.Point(276, 160);


            this.layoutControlItem23.Name = "layoutControlItem23";


            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 5;


            this.layoutControlItem23.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem23.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem23.Text = "调出货主";


            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1195,18 +1191,18 @@


            this.layoutControlItem24.Location = new System.Drawing.Point(0, 160);


            this.layoutControlItem24.Name = "layoutControlItem24";


            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;


            this.layoutControlItem24.Size = new System.Drawing.Size(271, 32);


            this.layoutControlItem24.Size = new System.Drawing.Size(276, 32);


            this.layoutControlItem24.Text = "源单类型";


            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem25


            // 


            this.layoutControlItem25.Control = this.txt_djtype;


            this.layoutControlItem25.Location = new System.Drawing.Point(813, 160);


            this.layoutControlItem25.Location = new System.Drawing.Point(828, 160);


            this.layoutControlItem25.Name = "layoutControlItem25";


            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;


            this.layoutControlItem25.Size = new System.Drawing.Size(272, 32);


            this.layoutControlItem25.Size = new System.Drawing.Size(278, 32);


            this.layoutControlItem25.Text = "单据类型";


            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);


            // 


@@ -1611,7 +1607,7 @@


            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();


            this.split1.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();


            this.xtraTabPage2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();


@@ -1690,7 +1686,7 @@


        private System.Windows.Forms.PictureBox picCheckBox;


        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;


        private DevExpress.XtraEditors.SplitContainerControl split1;


        private DevExpress.XtraGrid.GridControl gcMain;


        private DevExpress.XtraGrid.GridControl gcMain1;


        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;


        private DevExpress.XtraGrid.Columns.GridColumn gv_status;


        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;




 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs


@@ -154,16 +154,16 @@


                if (dd.rtnCode > 0)


                {


                    DataTable dt = dd.rtnData.list;


                    gcMain.BindingContext = new BindingContext();


                    gcMain1.BindingContext = new BindingContext();


                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;


                    if (dt.Rows.Count > 0)


                    {


                        gcMain.DataSource = dt;


                        gcMain.ForceInitialize();


                        gcMain1.DataSource = dt;


                        gcMain1.ForceInitialize();


                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);


                    }


                    else


                        UtilityHelper.SetDefaultTable(gcMain, gridView1);


                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);


                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;


                    pageBar1.TotalPages = dd.rtnData.pages;//总页


                    pageBar1.CurrentPage = curPage;//当前页


@@ -219,6 +219,7 @@


                        gcMx1.DataSource = dt;


                        gcMx1.ForceInitialize();


                        gvMx1.BestFitColumns();


                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);


                    }


                    else


                    {


@@ -237,6 +238,7 @@


                        gcMx2.DataSource = dt1;


                        gcMx2.ForceInitialize();


                        gvMx2.BestFitColumns();


                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);


                    }


                    else


                    {




 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs


@@ -227,6 +227,7 @@


            // 


            this.toolBarMenu1.chkParameter = null;


            this.toolBarMenu1.currentAction = null;


            this.toolBarMenu1.defaultActions = null;


            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;


            this.toolBarMenu1.guidKey = null;


            this.toolBarMenu1.isSetBtn = false;


@@ -358,8 +359,6 @@


            this.gridColumn14.FieldName = "fCustId";


            this.gridColumn14.MinWidth = 25;


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 3;


            this.gridColumn14.Width = 94;


            // 


            // gridColumn17


@@ -369,7 +368,7 @@


            this.gridColumn17.MinWidth = 25;


            this.gridColumn17.Name = "gridColumn17";


            this.gridColumn17.Visible = true;


            this.gridColumn17.VisibleIndex = 4;


            this.gridColumn17.VisibleIndex = 3;


            this.gridColumn17.Width = 94;


            // 


            // gridColumn18


@@ -378,8 +377,6 @@


            this.gridColumn18.FieldName = "fStockOrgId";


            this.gridColumn18.MinWidth = 25;


            this.gridColumn18.Name = "gridColumn18";


            this.gridColumn18.Visible = true;


            this.gridColumn18.VisibleIndex = 5;


            this.gridColumn18.Width = 94;


            // 


            // gridColumn19


@@ -389,7 +386,7 @@


            this.gridColumn19.MinWidth = 25;


            this.gridColumn19.Name = "gridColumn19";


            this.gridColumn19.Visible = true;


            this.gridColumn19.VisibleIndex = 6;


            this.gridColumn19.VisibleIndex = 4;


            this.gridColumn19.Width = 94;


            // 


            // gv_qt005


@@ -403,7 +400,7 @@


            this.gv_qt005.OptionsColumn.AllowEdit = false;


            this.gv_qt005.Tag = "query_a.qt005";


            this.gv_qt005.Visible = true;


            this.gv_qt005.VisibleIndex = 7;


            this.gv_qt005.VisibleIndex = 5;


            this.gv_qt005.Width = 94;


            // 


            // gv_qt001


@@ -417,7 +414,7 @@


            this.gv_qt001.OptionsColumn.AllowEdit = false;


            this.gv_qt001.Tag = "query_a.qt001";


            this.gv_qt001.Visible = true;


            this.gv_qt001.VisibleIndex = 8;


            this.gv_qt001.VisibleIndex = 6;


            this.gv_qt001.Width = 200;


            // 


            // gv_qt016


@@ -431,7 +428,7 @@


            this.gv_qt016.OptionsColumn.AllowEdit = false;


            this.gv_qt016.Tag = "query_a.qt016";


            this.gv_qt016.Visible = true;


            this.gv_qt016.VisibleIndex = 9;


            this.gv_qt016.VisibleIndex = 7;


            this.gv_qt016.Width = 94;


            // 


            // gv_qt002


@@ -445,7 +442,7 @@


            this.gv_qt002.OptionsColumn.AllowEdit = false;


            this.gv_qt002.Tag = "query_a.qt002";


            this.gv_qt002.Visible = true;


            this.gv_qt002.VisibleIndex = 10;


            this.gv_qt002.VisibleIndex = 8;


            this.gv_qt002.Width = 180;


            // 


            // gv_qt010


@@ -459,7 +456,7 @@


            this.gv_qt010.OptionsColumn.AllowEdit = false;


            this.gv_qt010.Tag = "query_a.qt010";


            this.gv_qt010.Visible = true;


            this.gv_qt010.VisibleIndex = 11;


            this.gv_qt010.VisibleIndex = 9;


            this.gv_qt010.Width = 94;


            // 


            // gridColumn13


@@ -469,7 +466,7 @@


            this.gridColumn13.MinWidth = 25;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 12;


            this.gridColumn13.VisibleIndex = 10;


            this.gridColumn13.Width = 94;


            // 


            // gv18


@@ -549,9 +546,9 @@


            // txt_fCustId


            // 


            this.txt_fCustId.IsReadly = false;


            this.txt_fCustId.Location = new System.Drawing.Point(370, 44);


            this.txt_fCustId.Location = new System.Drawing.Point(365, 44);


            this.txt_fCustId.Name = "txt_fCustId";


            this.txt_fCustId.Size = new System.Drawing.Size(211, 28);


            this.txt_fCustId.Size = new System.Drawing.Size(205, 28);


            this.txt_fCustId.TabIndex = 333;


            // 


            // lbGuid


@@ -569,26 +566,26 @@


            this.txt_remark.Name = "txt_remark";


            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_remark.Properties.Appearance.Options.UseFont = true;


            this.txt_remark.Size = new System.Drawing.Size(497, 28);


            this.txt_remark.Size = new System.Drawing.Size(486, 28);


            this.txt_remark.StyleController = this.layoutMx1;


            this.txt_remark.TabIndex = 240;


            // 


            // txt_fStockId


            // 


            this.txt_fStockId.IsReadly = false;


            this.txt_fStockId.Location = new System.Drawing.Point(370, 12);


            this.txt_fStockId.Location = new System.Drawing.Point(365, 12);


            this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);


            this.txt_fStockId.Name = "txt_fStockId";


            this.txt_fStockId.Size = new System.Drawing.Size(211, 28);


            this.txt_fStockId.Size = new System.Drawing.Size(205, 28);


            this.txt_fStockId.TabIndex = 301;


            // 


            // txt_checkBy


            // 


            this.txt_checkBy.Location = new System.Drawing.Point(944, 12);


            this.txt_checkBy.Location = new System.Drawing.Point(927, 12);


            this.txt_checkBy.Name = "txt_checkBy";


            this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;


            this.txt_checkBy.Size = new System.Drawing.Size(211, 28);


            this.txt_checkBy.Size = new System.Drawing.Size(207, 28);


            this.txt_checkBy.StyleController = this.layoutMx1;


            this.txt_checkBy.TabIndex = 267;


            this.txt_checkBy.Tag = "readonly";


@@ -598,7 +595,7 @@


            this.txt_fStockOrgId.IsReadly = false;


            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 44);


            this.txt_fStockOrgId.Name = "txt_fStockOrgId";


            this.txt_fStockOrgId.Size = new System.Drawing.Size(210, 28);


            this.txt_fStockOrgId.Size = new System.Drawing.Size(205, 28);


            this.txt_fStockOrgId.TabIndex = 326;


            // 


            // txt_billNo


@@ -607,46 +604,46 @@


            this.txt_billNo.Name = "txt_billNo";


            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_billNo.Properties.Appearance.Options.UseFont = true;


            this.txt_billNo.Size = new System.Drawing.Size(210, 28);


            this.txt_billNo.Size = new System.Drawing.Size(205, 28);


            this.txt_billNo.StyleController = this.layoutMx1;


            this.txt_billNo.TabIndex = 213;


            this.txt_billNo.Tag = "readonly";


            // 


            // txt_checkDate


            // 


            this.txt_checkDate.Location = new System.Drawing.Point(944, 44);


            this.txt_checkDate.Location = new System.Drawing.Point(927, 44);


            this.txt_checkDate.Name = "txt_checkDate";


            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);


            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;


            this.txt_checkDate.Size = new System.Drawing.Size(211, 28);


            this.txt_checkDate.Size = new System.Drawing.Size(207, 28);


            this.txt_checkDate.StyleController = this.layoutMx1;


            this.txt_checkDate.TabIndex = 217;


            this.txt_checkDate.Tag = "readonly";


            // 


            // txt_isCheck


            // 


            this.txt_isCheck.Location = new System.Drawing.Point(872, 76);


            this.txt_isCheck.Location = new System.Drawing.Point(855, 76);


            this.txt_isCheck.Name = "txt_isCheck";


            this.txt_isCheck.Properties.Caption = "审核状态";


            this.txt_isCheck.Size = new System.Drawing.Size(283, 24);


            this.txt_isCheck.Size = new System.Drawing.Size(279, 24);


            this.txt_isCheck.StyleController = this.layoutMx1;


            this.txt_isCheck.TabIndex = 330;


            this.txt_isCheck.Tag = "readonly";


            // 


            // txt_createBy


            // 


            this.txt_createBy.Location = new System.Drawing.Point(657, 12);


            this.txt_createBy.Location = new System.Drawing.Point(646, 12);


            this.txt_createBy.Name = "txt_createBy";


            this.txt_createBy.Size = new System.Drawing.Size(211, 24);


            this.txt_createBy.Size = new System.Drawing.Size(205, 24);


            this.txt_createBy.StyleController = this.layoutMx1;


            this.txt_createBy.TabIndex = 331;


            this.txt_createBy.Tag = "readonly";


            // 


            // txt_createDate


            // 


            this.txt_createDate.Location = new System.Drawing.Point(657, 44);


            this.txt_createDate.Location = new System.Drawing.Point(646, 44);


            this.txt_createDate.Name = "txt_createDate";


            this.txt_createDate.Size = new System.Drawing.Size(211, 24);


            this.txt_createDate.Size = new System.Drawing.Size(205, 24);


            this.txt_createDate.StyleController = this.layoutMx1;


            this.txt_createDate.TabIndex = 332;


            this.txt_createDate.Tag = "readonly";


@@ -662,10 +659,10 @@


            // 


            // txt_isFinish


            // 


            this.txt_isFinish.Location = new System.Drawing.Point(585, 76);


            this.txt_isFinish.Location = new System.Drawing.Point(574, 76);


            this.txt_isFinish.Name = "txt_isFinish";


            this.txt_isFinish.Properties.Caption = "完结状态";


            this.txt_isFinish.Size = new System.Drawing.Size(283, 24);


            this.txt_isFinish.Size = new System.Drawing.Size(277, 24);


            this.txt_isFinish.StyleController = this.layoutMx1;


            this.txt_isFinish.TabIndex = 335;


            this.txt_isFinish.Tag = "readonly";


@@ -733,7 +730,7 @@


            rowDefinition1,


            rowDefinition2,


            rowDefinition3});


            this.Root.Size = new System.Drawing.Size(1167, 116);


            this.Root.Size = new System.Drawing.Size(1146, 116);


            this.Root.TextVisible = false;


            // 


            // layoutControlItem1


@@ -741,7 +738,7 @@


            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(286, 32);


            this.layoutControlItem1.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem1.Text = "申请单号";


            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);


            // 


@@ -751,39 +748,39 @@


            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);


            this.layoutControlItem4.Name = "layoutControlItem4";


            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem4.Size = new System.Drawing.Size(286, 32);


            this.layoutControlItem4.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem4.Text = "库存组织";


            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem9


            // 


            this.layoutControlItem9.Control = this.txt_checkBy;


            this.layoutControlItem9.Location = new System.Drawing.Point(860, 0);


            this.layoutControlItem9.Location = new System.Drawing.Point(843, 0);


            this.layoutControlItem9.Name = "layoutControlItem9";


            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem9.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem9.Size = new System.Drawing.Size(283, 32);


            this.layoutControlItem9.Text = "审核人";


            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_checkDate;


            this.layoutControlItem10.Location = new System.Drawing.Point(860, 32);


            this.layoutControlItem10.Location = new System.Drawing.Point(843, 32);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem10.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem10.Size = new System.Drawing.Size(283, 32);


            this.layoutControlItem10.Text = "审核日期";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_isCheck;


            this.layoutControlItem11.Location = new System.Drawing.Point(860, 64);


            this.layoutControlItem11.Location = new System.Drawing.Point(843, 64);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem11.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem11.Size = new System.Drawing.Size(283, 32);


            this.layoutControlItem11.Text = "审核状态";


            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem11.TextVisible = false;


@@ -792,42 +789,42 @@


            // 


            this.layoutControlItem14.Control = this.txt_createBy;


            this.layoutControlItem14.CustomizationFormText = "申请人";


            this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);


            this.layoutControlItem14.Location = new System.Drawing.Point(562, 0);


            this.layoutControlItem14.Name = "layoutControlItem14";


            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem14.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem14.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem14.Text = "申请人";


            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem15


            // 


            this.layoutControlItem15.Control = this.txt_createDate;


            this.layoutControlItem15.Location = new System.Drawing.Point(573, 32);


            this.layoutControlItem15.Location = new System.Drawing.Point(562, 32);


            this.layoutControlItem15.Name = "layoutControlItem15";


            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem15.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem15.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem15.Text = "申请时间";


            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem8


            // 


            this.layoutControlItem8.Control = this.txt_fStockId;


            this.layoutControlItem8.Location = new System.Drawing.Point(286, 0);


            this.layoutControlItem8.Location = new System.Drawing.Point(281, 0);


            this.layoutControlItem8.Name = "layoutControlItem8";


            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem8.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem8.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem8.Text = "收料仓库";


            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);


            // 


            // layoutControlItem3


            // 


            this.layoutControlItem3.Control = this.txt_isFinish;


            this.layoutControlItem3.Location = new System.Drawing.Point(573, 64);


            this.layoutControlItem3.Location = new System.Drawing.Point(562, 64);


            this.layoutControlItem3.Name = "layoutControlItem3";


            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem3.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem3.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem3.Text = "完结标识";


            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem3.TextVisible = false;


@@ -835,11 +832,11 @@


            // layoutControlItem6


            // 


            this.layoutControlItem6.Control = this.txt_fCustId;


            this.layoutControlItem6.Location = new System.Drawing.Point(286, 32);


            this.layoutControlItem6.Location = new System.Drawing.Point(281, 32);


            this.layoutControlItem6.Name = "layoutControlItem6";


            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem6.Size = new System.Drawing.Size(287, 32);


            this.layoutControlItem6.Size = new System.Drawing.Size(281, 32);


            this.layoutControlItem6.Text = "选择客户";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);


            // 


@@ -850,7 +847,7 @@


            this.layoutControlItem13.Name = "layoutControlItem13";


            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;


            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem13.Size = new System.Drawing.Size(573, 32);


            this.layoutControlItem13.Size = new System.Drawing.Size(562, 32);


            this.layoutControlItem13.Text = "入库原因";


            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);


            // 


@@ -1198,10 +1195,11 @@


            // ucBtnPrint1


            // 


            this.ucBtnPrint1.guidKey = null;


            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);


            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);


            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);


            this.ucBtnPrint1.Name = "ucBtnPrint1";


            this.ucBtnPrint1.rptParameter = null;


            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);


            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 29);


            this.ucBtnPrint1.TabIndex = 230;


            // 


            // lbMxGuid




 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs


@@ -418,6 +418,7 @@


        }


        private void getModel(string strGuid)


        {


            gcMx1.DataSource = null;


            bool isEdit = false;


            if (toolBarMenu1.currentAction == "add") return;


            if (toolBarMenu1.currentAction == "edit") isEdit = true;


@@ -458,6 +459,7 @@


                        gcMx1.DataSource = dt;


                        gcMx1.ForceInitialize();


                        gvMx1.BestFitColumns();


                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);


                    }


                    else


                    {


@@ -475,6 +477,7 @@


                        gcMx2.DataSource = dt2;


                        gcMx2.ForceInitialize();


                        gvMx2.BestFitColumns();


                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);


                    }


                    else


                    {


@@ -658,7 +661,7 @@


                try


                {


                    var strJson = UtilityHelper.HttpPost("",


                        _webServiceName + "DeleteBarcode",


                           "VArrivalBarcodeManager/DeleteBarcode",


                        JsonConvert.SerializeObject(_obj));


                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);


                    if (_rtn.rtnCode > 0)