lu
2025-01-11 6cba6ef58393b27bdff10bf9087a4c94750a7ec5
工单细节
已修改13个文件
1307 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs 225 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs 87 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs 758 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -39,19 +39,22 @@
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1rkQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
            this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -84,7 +87,7 @@
            this.lb_status = new DevExpress.XtraEditors.LabelControl();
            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
            this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,8 +101,8 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
            this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
            this.txt_outPart = new DevExpress.XtraEditors.TextEdit();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -117,7 +120,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -128,6 +131,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
@@ -142,7 +147,7 @@
            this.gvMx2remark.Name = "gvMx2remark";
            this.gvMx2remark.Tag = "query_a.REMARK";
            this.gvMx2remark.Visible = true;
            this.gvMx2remark.VisibleIndex = 6;
            this.gvMx2remark.VisibleIndex = 9;
            this.gvMx2remark.Width = 94;
            // 
            // gvMx2depotSectionCode
@@ -155,7 +160,7 @@
            this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
            this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
            this.gvMx2depotSectionCode.Visible = true;
            this.gvMx2depotSectionCode.VisibleIndex = 5;
            this.gvMx2depotSectionCode.VisibleIndex = 6;
            this.gvMx2depotSectionCode.Width = 94;
            // 
            // gvMx2depotCode
@@ -168,7 +173,7 @@
            this.gvMx2depotCode.Name = "gvMx2depotCode";
            this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx2depotCode.Visible = true;
            this.gvMx2depotCode.VisibleIndex = 4;
            this.gvMx2depotCode.VisibleIndex = 5;
            this.gvMx2depotCode.Width = 94;
            // 
            // gvMx2quantity
@@ -181,7 +186,7 @@
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.QUANTITY";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 3;
            this.gvMx2quantity.VisibleIndex = 4;
            this.gvMx2quantity.Width = 94;
            // 
            // gvMx2lotNo
@@ -189,7 +194,7 @@
            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2lotNo.Caption = "物料名称";
            this.gvMx2lotNo.FieldName = "lotNo";
            this.gvMx2lotNo.FieldName = "itemName";
            this.gvMx2lotNo.MinWidth = 50;
            this.gvMx2lotNo.Name = "gvMx2lotNo";
            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
@@ -247,16 +252,48 @@
            this.gvMx2itemBarcode,
            this.gvMx2itemNo,
            this.gvMx2lotNo,
            this.gridColumn4,
            this.gvMx2quantity,
            this.gvMx2depotCode,
            this.gvMx2depotSectionCode,
            this.gridColumn6,
            this.gridColumn5,
            this.gvMx2remark});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "物料规格";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "建立者";
            this.gridColumn6.FieldName = "createBy";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 94;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "建立时间";
            this.gridColumn5.FieldName = "createDate";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 8;
            this.gridColumn5.Width = 94;
            // 
            // gvMx1itemId
            // 
@@ -268,7 +305,7 @@
            this.gvMx1itemId.Name = "gvMx1itemId";
            this.gvMx1itemId.Tag = "query_a.item_id";
            this.gvMx1itemId.Visible = true;
            this.gvMx1itemId.VisibleIndex = 9;
            this.gvMx1itemId.VisibleIndex = 6;
            this.gvMx1itemId.Width = 94;
            // 
            // gvMx1tlQty
@@ -281,33 +318,20 @@
            this.gvMx1tlQty.Name = "gvMx1tlQty";
            this.gvMx1tlQty.Tag = "query_a.tl_qty";
            this.gvMx1tlQty.Visible = true;
            this.gvMx1tlQty.VisibleIndex = 8;
            this.gvMx1tlQty.VisibleIndex = 3;
            this.gvMx1tlQty.Width = 94;
            //
            // gvMx1rkQty
            //
            this.gvMx1rkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1rkQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1rkQty.Caption = "已入库数 ";
            this.gvMx1rkQty.FieldName = "rkQty";
            this.gvMx1rkQty.MinWidth = 50;
            this.gvMx1rkQty.Name = "gvMx1rkQty";
            this.gvMx1rkQty.Tag = "query_a.rk_qty";
            this.gvMx1rkQty.Visible = true;
            this.gvMx1rkQty.VisibleIndex = 7;
            this.gvMx1rkQty.Width = 94;
            // 
            // gvMx1workNo
            // 
            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1workNo.Caption = "任务单号";
            this.gvMx1workNo.Caption = "工单单号";
            this.gvMx1workNo.FieldName = "workNo";
            this.gvMx1workNo.MinWidth = 50;
            this.gvMx1workNo.Name = "gvMx1workNo";
            this.gvMx1workNo.Tag = "query_a.work_no";
            this.gvMx1workNo.Visible = true;
            this.gvMx1workNo.VisibleIndex = 6;
            this.gvMx1workNo.VisibleIndex = 4;
            this.gvMx1workNo.Width = 94;
            // 
            // gvMx1remark
@@ -328,12 +352,12 @@
            this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
            this.gvMx1createDate.Caption = "物料规格";
            this.gvMx1createDate.FieldName = "createDate";
            this.gvMx1createDate.FieldName = "itemModel";
            this.gvMx1createDate.MinWidth = 50;
            this.gvMx1createDate.Name = "gvMx1createDate";
            this.gvMx1createDate.Tag = "query_a.create_date";
            this.gvMx1createDate.Visible = true;
            this.gvMx1createDate.VisibleIndex = 4;
            this.gvMx1createDate.VisibleIndex = 2;
            this.gvMx1createDate.Width = 94;
            // 
            // gvMx1createBy
@@ -341,26 +365,13 @@
            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
            this.gvMx1createBy.Caption = "物料名称";
            this.gvMx1createBy.FieldName = "createBy";
            this.gvMx1createBy.FieldName = "itemName";
            this.gvMx1createBy.MinWidth = 50;
            this.gvMx1createBy.Name = "gvMx1createBy";
            this.gvMx1createBy.Tag = "query_a.create_by";
            this.gvMx1createBy.Visible = true;
            this.gvMx1createBy.VisibleIndex = 3;
            this.gvMx1createBy.VisibleIndex = 1;
            this.gvMx1createBy.Width = 94;
            //
            // gvMx1quantity
            //
            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx1quantity.Caption = "申请数量 ";
            this.gvMx1quantity.FieldName = "quantity";
            this.gvMx1quantity.MinWidth = 50;
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "query_a.quantity";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 2;
            this.gvMx1quantity.Width = 94;
            // 
            // gvMx1itemNo
            // 
@@ -372,7 +383,7 @@
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.item_no";
            this.gvMx1itemNo.Visible = true;
            this.gvMx1itemNo.VisibleIndex = 1;
            this.gvMx1itemNo.VisibleIndex = 0;
            this.gvMx1itemNo.Width = 94;
            // 
            // gvMx1guid
@@ -384,8 +395,6 @@
            this.gvMx1guid.MinWidth = 50;
            this.gvMx1guid.Name = "gvMx1guid";
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Visible = true;
            this.gvMx1guid.VisibleIndex = 0;
            this.gvMx1guid.Width = 94;
            // 
            // tabMxPage1
@@ -410,31 +419,50 @@
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gvMx1workNo,
            this.gvMx1itemNo,
            this.gvMx1createBy,
            this.gvMx1createDate,
            this.gvMx1quantity,
            this.gvMx1remark,
            this.gvMx1rkQty,
            this.gvMx1tlQty,
            this.gvMx1itemId});
            this.gvMx1workNo,
            this.gvMx1remark,
            this.gvMx1itemId,
            this.gridColumn3,
            this.gridColumn2});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "建立者";
            this.gridColumn3.FieldName = "createBy";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 8;
            this.gridColumn3.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "建立时间";
            this.gridColumn2.FieldName = "createDate";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 94;
            // 
            // lb_depotId
            // 
            this.lb_depotId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depotId.Appearance.Options.UseFont = true;
            this.lb_depotId.Location = new System.Drawing.Point(302, 51);
            this.lb_depotId.Location = new System.Drawing.Point(266, 51);
            this.lb_depotId.Name = "lb_depotId";
            this.lb_depotId.Size = new System.Drawing.Size(34, 21);
            this.lb_depotId.Size = new System.Drawing.Size(68, 21);
            this.lb_depotId.TabIndex = 571;
            this.lb_depotId.Text = "仓库";
            this.lb_depotId.Text = "发料仓库";
            // 
            // gv_pbillNo
            // 
@@ -455,7 +483,7 @@
            this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_boardItem.AppearanceCell.Options.UseFont = true;
            this.gv_boardItem.Caption = "产品编码";
            this.gv_boardItem.FieldName = "boardItem";
            this.gv_boardItem.FieldName = "itemNo";
            this.gv_boardItem.MinWidth = 50;
            this.gv_boardItem.Name = "gv_boardItem";
            this.gv_boardItem.OptionsColumn.AllowEdit = false;
@@ -468,15 +496,15 @@
            // 
            this.lb_outType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_outType.Appearance.Options.UseFont = true;
            this.lb_outType.Location = new System.Drawing.Point(263, 89);
            this.lb_outType.Location = new System.Drawing.Point(266, 86);
            this.lb_outType.Name = "lb_outType";
            this.lb_outType.Size = new System.Drawing.Size(73, 21);
            this.lb_outType.Size = new System.Drawing.Size(68, 21);
            this.lb_outType.TabIndex = 450;
            this.lb_outType.Text = "出库类别 ";
            this.lb_outType.Text = "出库类别";
            // 
            // txt_outType
            // 
            this.txt_outType.Location = new System.Drawing.Point(342, 85);
            this.txt_outType.Location = new System.Drawing.Point(342, 82);
            this.txt_outType.Name = "txt_outType";
            this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_outType.Properties.Appearance.Options.UseFont = true;
@@ -548,11 +576,11 @@
            // 
            this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_outPart.Appearance.Options.UseFont = true;
            this.lb_outPart.Location = new System.Drawing.Point(263, 20);
            this.lb_outPart.Location = new System.Drawing.Point(266, 20);
            this.lb_outPart.Name = "lb_outPart";
            this.lb_outPart.Size = new System.Drawing.Size(73, 21);
            this.lb_outPart.Size = new System.Drawing.Size(68, 21);
            this.lb_outPart.TabIndex = 319;
            this.lb_outPart.Text = "领料部门 ";
            this.lb_outPart.Text = "领料部门";
            // 
            // gv_outPart
            // 
@@ -666,7 +694,7 @@
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(522, 83);
            this.lb_remark.Location = new System.Drawing.Point(522, 86);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(73, 21);
            this.lb_remark.TabIndex = 243;
@@ -674,7 +702,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(599, 79);
            this.txt_remark.Location = new System.Drawing.Point(599, 82);
            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;
@@ -795,14 +823,14 @@
            this.lb_taskNo.TabIndex = 216;
            this.lb_taskNo.Text = "生产订单 ";
            // 
            // txt_taskNo
            // txt_pbillNo
            // 
            this.txt_taskNo.Location = new System.Drawing.Point(98, 82);
            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(150, 28);
            this.txt_taskNo.TabIndex = 216;
            this.txt_pbillNo.Location = new System.Drawing.Point(98, 82);
            this.txt_pbillNo.Name = "txt_pbillNo";
            this.txt_pbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
            this.txt_pbillNo.Size = new System.Drawing.Size(150, 28);
            this.txt_pbillNo.TabIndex = 216;
            // 
            // lb_itemOutNo
            // 
@@ -895,6 +923,7 @@
            // gridColumn1
            // 
            this.gridColumn1.Caption = "产品名称";
            this.gridColumn1.FieldName = "itemName";
            this.gridColumn1.MinWidth = 120;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
@@ -956,8 +985,8 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_depotId);
            this.panel1.Controls.Add(this.txt_outPart);
            this.panel1.Controls.Add(this.depot_id);
            this.panel1.Controls.Add(this.txt_status);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
@@ -979,7 +1008,7 @@
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_status);
            this.panel1.Controls.Add(this.lb_taskNo);
            this.panel1.Controls.Add(this.txt_taskNo);
            this.panel1.Controls.Add(this.txt_pbillNo);
            this.panel1.Controls.Add(this.lb_itemOutNo);
            this.panel1.Controls.Add(this.txt_itemOutNo);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -989,22 +1018,23 @@
            this.panel1.Size = new System.Drawing.Size(1126, 121);
            this.panel1.TabIndex = 1;
            // 
            // txt_depotId
            //
            this.txt_depotId.Location = new System.Drawing.Point(342, 50);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depotId.Properties.Appearance.Options.UseFont = true;
            this.txt_depotId.Size = new System.Drawing.Size(171, 28);
            this.txt_depotId.TabIndex = 575;
            //
            // txt_outPart
            // 
            this.txt_outPart.IsReadly = false;
            this.txt_outPart.Location = new System.Drawing.Point(342, 19);
            this.txt_outPart.Location = new System.Drawing.Point(342, 16);
            this.txt_outPart.Name = "txt_outPart";
            this.txt_outPart.Size = new System.Drawing.Size(174, 28);
            this.txt_outPart.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_outPart.Properties.Appearance.Options.UseFont = true;
            this.txt_outPart.Size = new System.Drawing.Size(171, 28);
            this.txt_outPart.TabIndex = 574;
            //
            // depot_id
            //
            this.depot_id.IsReadly = false;
            this.depot_id.Location = new System.Drawing.Point(342, 51);
            this.depot_id.Margin = new System.Windows.Forms.Padding(0);
            this.depot_id.Name = "depot_id";
            this.depot_id.Size = new System.Drawing.Size(174, 28);
            this.depot_id.TabIndex = 573;
            // 
            // txt_status
            // 
@@ -1067,7 +1097,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1079,6 +1109,8 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1108,12 +1140,10 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1rkQty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1161,15 +1191,20 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
        private DevExpress.XtraEditors.LabelControl lb_taskNo;
        private DevExpress.XtraEditors.TextEdit txt_taskNo;
        private DevExpress.XtraEditors.TextEdit txt_pbillNo;
        private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
        private DevExpress.XtraEditors.CheckEdit txt_status;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private UserControl.UcLookCk depot_id;
        private UserControl.UcLookDepartment txt_outPart;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.TextEdit txt_depotId;
        private DevExpress.XtraEditors.TextEdit txt_outPart;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -25,6 +25,9 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -38,7 +41,6 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            depot_id.getSuppler("");
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -81,6 +83,19 @@
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// 日志
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemOutNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///     审核事件
@@ -195,6 +210,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -241,7 +257,7 @@
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["mesInvItemOutCDetailsList"])
                    foreach (var a in _job["rtnData"]["list"])
                    {
                        array.Add(a);
                    }
@@ -251,13 +267,14 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    JArray array1 = new JArray();
                    foreach (var a in _job["rtnData"]["mesInvItemOutItemsList"])
                    foreach (var a in _job["rtnData"]["list2"])
                    {
                        array1.Add(a);
                    }
@@ -267,6 +284,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt1;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
@@ -279,43 +297,6 @@
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx2.CloseEditor();
            gvMx2.UpdateCurrentRow();
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx2.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx2",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
        }
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -278,6 +278,10 @@
            // 
            // acrd
            // 
            this.acrd.Appearance.Item.Hovered.Font = new System.Drawing.Font("Tahoma", 10F);
            this.acrd.Appearance.Item.Hovered.ForeColor = System.Drawing.Color.Blue;
            this.acrd.Appearance.Item.Hovered.Options.UseFont = true;
            this.acrd.Appearance.Item.Hovered.Options.UseForeColor = true;
            this.acrd.Dock = System.Windows.Forms.DockStyle.Left;
            this.acrd.FilterText = "查找";
            this.acrd.Location = new System.Drawing.Point(0, 39);
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -53,6 +53,8 @@
            this.txt_isIncludeDoc = new DevExpress.XtraEditors.CheckEdit();
            this.txt_isSpilit = new DevExpress.XtraEditors.CheckEdit();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.lblPreview = new DevExpress.XtraEditors.LabelControl();
            this.txxtItem4 = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -84,6 +86,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_isSpilit.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).BeginInit();
@@ -99,12 +102,12 @@
            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
            this.gv_createdBy.Caption = "建立者";
            this.gv_createdBy.FieldName = "createBy";
            this.gv_createdBy.MinWidth = 50;
            this.gv_createdBy.MinWidth = 10;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 8;
            this.gv_createdBy.VisibleIndex = 7;
            this.gv_createdBy.Width = 94;
            // 
            // gv_createDate
@@ -113,12 +116,12 @@
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立日期";
            this.gv_createDate.FieldName = "createTime";
            this.gv_createDate.MinWidth = 180;
            this.gv_createDate.MinWidth = 10;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 7;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            // 
            // gv_flagIncludeDocCode
@@ -127,12 +130,12 @@
            this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
            this.gv_flagIncludeDocCode.Caption = "包含单据类型";
            this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
            this.gv_flagIncludeDocCode.MinWidth = 50;
            this.gv_flagIncludeDocCode.MinWidth = 10;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 5;
            this.gv_flagIncludeDocCode.VisibleIndex = 6;
            this.gv_flagIncludeDocCode.Width = 94;
            // 
            // gv_flagSpilitNo
@@ -141,7 +144,7 @@
            this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
            this.gv_flagSpilitNo.Caption = "序号前分隔符";
            this.gv_flagSpilitNo.FieldName = "isSpilit";
            this.gv_flagSpilitNo.MinWidth = 50;
            this.gv_flagSpilitNo.MinWidth = 10;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
@@ -155,10 +158,12 @@
            this.gv_resetZero.AppearanceCell.Options.UseFont = true;
            this.gv_resetZero.Caption = "每天归零";
            this.gv_resetZero.FieldName = "resetZero";
            this.gv_resetZero.MinWidth = 25;
            this.gv_resetZero.MinWidth = 10;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 5;
            this.gv_resetZero.Width = 94;
            // 
            // gv_noLength
@@ -167,7 +172,7 @@
            this.gv_noLength.AppearanceCell.Options.UseFont = true;
            this.gv_noLength.Caption = "序号长度";
            this.gv_noLength.FieldName = "noLength";
            this.gv_noLength.MinWidth = 50;
            this.gv_noLength.MinWidth = 10;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
@@ -181,7 +186,7 @@
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 300;
            this.gv_ruleFormat.MinWidth = 10;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
@@ -195,7 +200,7 @@
            this.gv_docCode.AppearanceCell.Options.UseFont = true;
            this.gv_docCode.Caption = "单据类型";
            this.gv_docCode.FieldName = "docCode";
            this.gv_docCode.MinWidth = 150;
            this.gv_docCode.MinWidth = 10;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
@@ -213,7 +218,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(949, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1074, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -245,8 +250,8 @@
            this.gv_flagSpilitNo,
            this.gv_resetZero,
            this.gv_flagIncludeDocCode,
            this.gv_createDate,
            this.gv_createdBy});
            this.gv_createdBy,
            this.gv_createDate});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -272,7 +277,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(949, 580);
            this.xtraTabControl1.Size = new System.Drawing.Size(1074, 580);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -302,7 +307,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(947, 548);
            this.xtraTabPage2.Size = new System.Drawing.Size(1072, 548);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
@@ -323,7 +328,7 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(72, 33);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(797, 448);
            this.panel1.Size = new System.Drawing.Size(937, 448);
            this.panel1.TabIndex = 1;
            // 
            // txt_resetZero
@@ -407,6 +412,8 @@
            this.panelControl1.Appearance.Options.UseBackColor = true;
            this.panelControl1.Appearance.Options.UseForeColor = true;
            this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            this.panelControl1.Controls.Add(this.comboBoxEdit1);
            this.panelControl1.Controls.Add(this.labelControl9);
            this.panelControl1.Controls.Add(this.labelControl1);
            this.panelControl1.Controls.Add(this.lblPreview);
            this.panelControl1.Controls.Add(this.txxtItem4);
@@ -422,8 +429,35 @@
            this.panelControl1.Location = new System.Drawing.Point(81, 73);
            this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(661, 188);
            this.panelControl1.Size = new System.Drawing.Size(780, 188);
            this.panelControl1.TabIndex = 229;
            //
            // comboBoxEdit1
            //
            this.comboBoxEdit1.EditValue = "序号";
            this.comboBoxEdit1.Location = new System.Drawing.Point(617, 48);
            this.comboBoxEdit1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.comboBoxEdit1.Name = "comboBoxEdit1";
            this.comboBoxEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.comboBoxEdit1.Properties.Appearance.Options.UseFont = true;
            this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.comboBoxEdit1.Properties.Items.AddRange(new object[] {
            "序号"});
            this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.comboBoxEdit1.Size = new System.Drawing.Size(122, 28);
            this.comboBoxEdit1.TabIndex = 4;
            //
            // labelControl9
            //
            this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl9.Appearance.Options.UseFont = true;
            this.labelControl9.Location = new System.Drawing.Point(632, 17);
            this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl9.Name = "labelControl9";
            this.labelControl9.Size = new System.Drawing.Size(60, 21);
            this.labelControl9.TabIndex = 3;
            this.labelControl9.Text = "参数5:";
            // 
            // labelControl1
            // 
@@ -442,7 +476,7 @@
            this.lblPreview.Appearance.ForeColor = System.Drawing.Color.White;
            this.lblPreview.Appearance.Options.UseFont = true;
            this.lblPreview.Appearance.Options.UseForeColor = true;
            this.lblPreview.Location = new System.Drawing.Point(112, 140);
            this.lblPreview.Location = new System.Drawing.Point(50, 139);
            this.lblPreview.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.lblPreview.Name = "lblPreview";
            this.lblPreview.Size = new System.Drawing.Size(269, 24);
@@ -460,7 +494,7 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txxtItem4.Properties.Items.AddRange(new object[] {
            "<无>",
            "<公司编号>",
            "<组织编号>",
            "<年年>",
            "<年年年年>",
            "<月月>",
@@ -480,7 +514,7 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txxtItem3.Properties.Items.AddRange(new object[] {
            "<无>",
            "<公司编号>",
            "<组织编号>",
            "<年年>",
            "<年年年年>",
            "<月月>",
@@ -500,7 +534,7 @@
            this.txt_docFormat.Properties.Appearance.Options.UseBackColor = true;
            this.txt_docFormat.Properties.Appearance.Options.UseFont = true;
            this.txt_docFormat.Properties.ReadOnly = true;
            this.txt_docFormat.Size = new System.Drawing.Size(499, 28);
            this.txt_docFormat.Size = new System.Drawing.Size(627, 28);
            this.txt_docFormat.TabIndex = 0;
            // 
            // txxtItem2
@@ -514,7 +548,7 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txxtItem2.Properties.Items.AddRange(new object[] {
            "<无>",
            "<公司编号>",
            "<组织编号>",
            "<年年>",
            "<年年年年>",
            "<月月>",
@@ -545,7 +579,7 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txxtItem1.Properties.Items.AddRange(new object[] {
            "<无>",
            "<公司编号>",
            "<组织编号>",
            "<年年>",
            "<年年年年>",
            "<月月>",
@@ -667,7 +701,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(949, 660);
            this.ClientSize = new System.Drawing.Size(1074, 660);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
@@ -688,6 +722,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.panelControl1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docFormat.Properties)).EndInit();
@@ -741,5 +776,7 @@
        private DevExpress.XtraEditors.CheckEdit txt_resetZero;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
        private DevExpress.XtraEditors.LabelControl labelControl9;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -37,18 +37,15 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getTree();
            txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
            txxtItem1.EditValueChanged += TxxtItem1_EditValueChanged;
            txxtItem2.EditValueChanged += TxxtItem1_EditValueChanged;
            txxtItem3.EditValueChanged += TxxtItem1_EditValueChanged;
            txxtItem4.EditValueChanged += TxxtItem1_EditValueChanged;
            txt_noLength.ValueChanged += Txt_noLength_ValueChanged;
            txt_isIncludeDoc.CheckedChanged +=
                Txt_flagIncludeDocCode_CheckedChanged;
            txt_isSpilit.CheckedChanged +=
                Txt_flagIncludeDocCode_CheckedChanged;
            txt_docCode.EditValueChanged += (s, e) => { DoPreviewCode(); };
            txxtItem1.EditValueChanged += (s, e) => { DoPreviewCode(); };
            txxtItem2.EditValueChanged += (s, e) => { DoPreviewCode(); };
            txxtItem3.EditValueChanged += (s, e) => { DoPreviewCode(); };
            txxtItem4.EditValueChanged += (s, e) => { DoPreviewCode(); };
            txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
            txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
            txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
        }
        /// <summary>
        ///     分页事件
@@ -144,7 +141,7 @@
                getModel(lbGuid.Text.Trim());
            else
            {
                getPageList(1);
            }
        }
@@ -166,7 +163,7 @@
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled =txxtItem4.Enabled = panelControl1.Enabled = true;
            txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true;
        }
        /// <summary>
@@ -218,7 +215,7 @@
            var _obj = new
            {
                guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //主建
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                docCode = txt_docCode.EditValue.ToString(),
                docFormat = txt_docFormat.Text,
                noLength = txt_noLength.Value.ToString(),
@@ -264,11 +261,10 @@
                    gcMain.BindingContext = new BindingContext();
                    gcMain.DataSource = dt;
                    gcMain.ForceInitialize();
                    int dddd = dd.rtnData.pages;//总页
                    pageBar1.TotalPages = dddd;
                    pageBar1.RecordCount = dd.rtnData.total;//记录总数
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.setTxt();
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                    gridView1.BestFitColumns();
                }
                else
                {
@@ -349,24 +345,9 @@
            txt_docCode.Properties.DataSource = dataTable;
            txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列
            txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列
            txt_docCode.Properties.TextEditStyle =TextEditStyles.DisableTextEditor;
            txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
        }
        private void Txt_flagIncludeDocCode_CheckedChanged(object sender,
            EventArgs e)
        {
            DoPreviewCode();
        }
        private void Txt_noLength_ValueChanged(object sender, EventArgs e)
        {
            DoPreviewCode();
        }
        private void TxxtItem1_EditValueChanged(object sender, EventArgs e)
        {
            DoPreviewCode();
        }
        private void DoPreviewCode()
        {
            if (txt_docCode.Enabled == false
@@ -384,7 +365,6 @@
            }
            else
            {
                // txtRuleFormat="<年年>", "<年年年年>", "<月月>", "<日日>" });
                var preview = txt_docFormat.Text;
                var length = int.Parse(txt_noLength.Value.ToString());
                var docCode = "";
@@ -398,13 +378,8 @@
                preview = preview.Replace("<日日>", "18");
                preview = preview + (txt_isSpilit.Checked ? "-" : "") +
                          "8".PadLeft(length, '0');
                lblPreview.Text = "生成编号:" + preview;
                lblPreview.Text = "样例:" + preview;
            }
        }
        private void Txt_docCode_EditValueChanged(object sender, EventArgs e)
        {
            DoPreviewCode();
        }
        /// <summary>
@@ -442,7 +417,7 @@
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("","General/GeneralCheck",
                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -111,7 +111,7 @@
            this.gv_operationTime.AppearanceCell.Options.UseFont = true;
            this.gv_operationTime.Caption = "组织名称";
            this.gv_operationTime.FieldName = "name";
            this.gv_operationTime.MinWidth = 300;
            this.gv_operationTime.MinWidth = 10;
            this.gv_operationTime.Name = "gv_operationTime";
            this.gv_operationTime.OptionsColumn.AllowEdit = false;
            this.gv_operationTime.Tag = "query_OPERATION_TIME";
@@ -125,7 +125,7 @@
            this.gv_operationTable.AppearanceCell.Options.UseFont = true;
            this.gv_operationTable.Caption = "组织编号";
            this.gv_operationTable.FieldName = "fNumber";
            this.gv_operationTable.MinWidth = 100;
            this.gv_operationTable.MinWidth = 10;
            this.gv_operationTable.Name = "gv_operationTable";
            this.gv_operationTable.OptionsColumn.AllowEdit = false;
            this.gv_operationTable.Tag = "query_OPERATION_TABLE";
@@ -139,7 +139,7 @@
            this.gv_msg.AppearanceCell.Options.UseFont = true;
            this.gv_msg.Caption = "使用状态";
            this.gv_msg.FieldName = "isStatus";
            this.gv_msg.MinWidth = 200;
            this.gv_msg.MinWidth = 10;
            this.gv_msg.Name = "gv_msg";
            this.gv_msg.OptionsColumn.AllowEdit = false;
            this.gv_msg.Tag = "query_MSG";
@@ -153,7 +153,7 @@
            this.gv_userName.AppearanceCell.Options.UseFont = true;
            this.gv_userName.Caption = "同步时间";
            this.gv_userName.FieldName = "edtTime";
            this.gv_userName.MinWidth = 50;
            this.gv_userName.MinWidth = 10;
            this.gv_userName.Name = "gv_userName";
            this.gv_userName.OptionsColumn.AllowEdit = false;
            this.gv_userName.Tag = "query_USER_NAME";
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -62,6 +62,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -106,6 +106,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -140,55 +140,55 @@
            // 
            this.roleName.Caption = "角色名称";
            this.roleName.FieldName = "roleName";
            this.roleName.MinWidth = 120;
            this.roleName.MinWidth = 10;
            this.roleName.Name = "roleName";
            this.roleName.OptionsColumn.AllowEdit = false;
            this.roleName.Tag = "query_role_Name";
            this.roleName.Visible = true;
            this.roleName.VisibleIndex = 0;
            this.roleName.Width = 120;
            this.roleName.Width = 173;
            // 
            // rolRemark
            // 
            this.rolRemark.Caption = "功能备注";
            this.rolRemark.FieldName = "roleRemark";
            this.rolRemark.MinWidth = 250;
            this.rolRemark.MinWidth = 10;
            this.rolRemark.Name = "rolRemark";
            this.rolRemark.OptionsColumn.AllowEdit = false;
            this.rolRemark.Tag = "query_role_Remark";
            this.rolRemark.Visible = true;
            this.rolRemark.VisibleIndex = 1;
            this.rolRemark.Width = 250;
            this.rolRemark.Width = 362;
            // 
            // status
            // 
            this.status.Caption = "使用状态";
            this.status.FieldName = "isStatus";
            this.status.MinWidth = 25;
            this.status.MinWidth = 10;
            this.status.Name = "status";
            this.status.OptionsColumn.AllowEdit = false;
            this.status.Tag = "query_is_Status";
            this.status.Visible = true;
            this.status.VisibleIndex = 2;
            this.status.Width = 94;
            this.status.Width = 25;
            // 
            // roleCreateBy
            // 
            this.roleCreateBy.Caption = "建立者";
            this.roleCreateBy.FieldName = "createBy";
            this.roleCreateBy.MinWidth = 50;
            this.roleCreateBy.MinWidth = 10;
            this.roleCreateBy.Name = "roleCreateBy";
            this.roleCreateBy.OptionsColumn.AllowEdit = false;
            this.roleCreateBy.Tag = "query_create_by";
            this.roleCreateBy.Visible = true;
            this.roleCreateBy.VisibleIndex = 3;
            this.roleCreateBy.Width = 94;
            this.roleCreateBy.Width = 50;
            // 
            // createDate
            // 
            this.createDate.Caption = "建立时间";
            this.createDate.FieldName = "createTime";
            this.createDate.MinWidth = 180;
            this.createDate.MinWidth = 10;
            this.createDate.Name = "createDate";
            this.createDate.OptionsColumn.AllowEdit = false;
            this.createDate.Tag = "query_create_Time";
@@ -200,11 +200,11 @@
            // 
            this.gridColumn1.Caption = "配置权限";
            this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.MinWidth = 10;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 94;
            this.gridColumn1.Width = 50;
            // 
            // repositoryItemButtonEdit1
            // 
DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -258,6 +258,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -36,9 +36,7 @@
            this.gvMx1numerator = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1issueType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1mtono = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1positionNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1cab014 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1cab012 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1cab009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -52,42 +50,30 @@
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_closeType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_forceCloserid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_saleOrderEntryseq = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_saleOrderNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_saleOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_srcBillentryseq = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_srcBillType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_stockInlimitl = new DevExpress.XtraEditors.LabelControl();
            this.txt_stockInlimitl = new DevExpress.XtraEditors.TextEdit();
            this.gv_stockInlimitl = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_stockInlimith = new DevExpress.XtraEditors.LabelControl();
            this.txt_stockInlimith = new DevExpress.XtraEditors.TextEdit();
            this.gv_stockInlimith = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
            this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.txt_caa024 = new DevExpress.XtraEditors.TextEdit();
            this.gv_caa024 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_caa021 = new DevExpress.XtraEditors.LabelControl();
            this.gv_caa021 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_caa020 = new DevExpress.XtraEditors.LabelControl();
            this.txt_caa020 = new DevExpress.XtraEditors.TextEdit();
            this.gv_caa020 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa019 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa018 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_caa016 = new DevExpress.XtraEditors.LabelControl();
            this.txt_caa016 = new DevExpress.XtraEditors.TextEdit();
            this.gv_caa016 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_caa015 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_caa012 = new DevExpress.XtraEditors.LabelControl();
            this.txt_caa012 = new DevExpress.XtraEditors.TextEdit();
            this.gv_caa012 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,14 +95,13 @@
            this.lb_caa001 = new DevExpress.XtraEditors.LabelControl();
            this.txt_caa001 = new DevExpress.XtraEditors.TextEdit();
            this.gv_caa001 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_erpid = new DevExpress.XtraEditors.LabelControl();
            this.txt_erpid = new DevExpress.XtraEditors.TextEdit();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -127,17 +112,24 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_caa004 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_gdzt = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.lb_erpid = new DevExpress.XtraEditors.LabelControl();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit();
@@ -147,7 +139,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -157,6 +148,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
@@ -171,7 +166,7 @@
            this.gvMx1scraprate.Name = "gvMx1scraprate";
            this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
            this.gvMx1scraprate.Visible = true;
            this.gvMx1scraprate.VisibleIndex = 6;
            this.gvMx1scraprate.VisibleIndex = 20;
            this.gvMx1scraprate.Width = 94;
            // 
            // gvMx1scrapqty
@@ -184,7 +179,7 @@
            this.gvMx1scrapqty.Name = "gvMx1scrapqty";
            this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
            this.gvMx1scrapqty.Visible = true;
            this.gvMx1scrapqty.VisibleIndex = 7;
            this.gvMx1scrapqty.VisibleIndex = 21;
            this.gvMx1scrapqty.Width = 94;
            // 
            // gvMx1denominator
@@ -197,7 +192,7 @@
            this.gvMx1denominator.Name = "gvMx1denominator";
            this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
            this.gvMx1denominator.Visible = true;
            this.gvMx1denominator.VisibleIndex = 14;
            this.gvMx1denominator.VisibleIndex = 15;
            this.gvMx1denominator.Width = 94;
            // 
            // gvMx1numerator
@@ -210,7 +205,7 @@
            this.gvMx1numerator.Name = "gvMx1numerator";
            this.gvMx1numerator.Tag = "query_a.NUMERATOR";
            this.gvMx1numerator.Visible = true;
            this.gvMx1numerator.VisibleIndex = 13;
            this.gvMx1numerator.VisibleIndex = 14;
            this.gvMx1numerator.Width = 94;
            // 
            // gvMx1issueType
@@ -223,7 +218,7 @@
            this.gvMx1issueType.Name = "gvMx1issueType";
            this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
            this.gvMx1issueType.Visible = true;
            this.gvMx1issueType.VisibleIndex = 11;
            this.gvMx1issueType.VisibleIndex = 18;
            this.gvMx1issueType.Width = 94;
            // 
            // gvMx1depotCode
@@ -236,21 +231,8 @@
            this.gvMx1depotCode.Name = "gvMx1depotCode";
            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx1depotCode.Visible = true;
            this.gvMx1depotCode.VisibleIndex = 4;
            this.gvMx1depotCode.VisibleIndex = 16;
            this.gvMx1depotCode.Width = 94;
            //
            // gvMx1lot
            //
            this.gvMx1lot.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1lot.AppearanceCell.Options.UseFont = true;
            this.gvMx1lot.Caption = "批号";
            this.gvMx1lot.FieldName = "lot";
            this.gvMx1lot.MinWidth = 50;
            this.gvMx1lot.Name = "gvMx1lot";
            this.gvMx1lot.Tag = "query_a.LOT";
            this.gvMx1lot.Visible = true;
            this.gvMx1lot.VisibleIndex = 19;
            this.gvMx1lot.Width = 94;
            // 
            // gvMx1mtono
            // 
@@ -262,33 +244,20 @@
            this.gvMx1mtono.Name = "gvMx1mtono";
            this.gvMx1mtono.Tag = "query_a.MTONO";
            this.gvMx1mtono.Visible = true;
            this.gvMx1mtono.VisibleIndex = 18;
            this.gvMx1mtono.VisibleIndex = 13;
            this.gvMx1mtono.Width = 94;
            //
            // gvMx1positionNo
            //
            this.gvMx1positionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1positionNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1positionNo.Caption = "位置号";
            this.gvMx1positionNo.FieldName = "positionNo";
            this.gvMx1positionNo.MinWidth = 50;
            this.gvMx1positionNo.Name = "gvMx1positionNo";
            this.gvMx1positionNo.Tag = "query_a.POSITION_NO";
            this.gvMx1positionNo.Visible = true;
            this.gvMx1positionNo.VisibleIndex = 17;
            this.gvMx1positionNo.Width = 94;
            // 
            // gvMx1cab014
            // 
            this.gvMx1cab014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1cab014.AppearanceCell.Options.UseFont = true;
            this.gvMx1cab014.Caption = "是否替料";
            this.gvMx1cab014.FieldName = "cab014";
            this.gvMx1cab014.Caption = "替料标识";
            this.gvMx1cab014.FieldName = "cab014Chk";
            this.gvMx1cab014.MinWidth = 50;
            this.gvMx1cab014.Name = "gvMx1cab014";
            this.gvMx1cab014.Tag = "query_a.CAB014";
            this.gvMx1cab014.Visible = true;
            this.gvMx1cab014.VisibleIndex = 16;
            this.gvMx1cab014.VisibleIndex = 9;
            this.gvMx1cab014.Width = 94;
            // 
            // gvMx1cab012
@@ -301,7 +270,7 @@
            this.gvMx1cab012.Name = "gvMx1cab012";
            this.gvMx1cab012.Tag = "query_a.CAB012";
            this.gvMx1cab012.Visible = true;
            this.gvMx1cab012.VisibleIndex = 15;
            this.gvMx1cab012.VisibleIndex = 5;
            this.gvMx1cab012.Width = 94;
            // 
            // gvMx1cab009
@@ -314,7 +283,7 @@
            this.gvMx1cab009.Name = "gvMx1cab009";
            this.gvMx1cab009.Tag = "query_a.CAB009";
            this.gvMx1cab009.Visible = true;
            this.gvMx1cab009.VisibleIndex = 10;
            this.gvMx1cab009.VisibleIndex = 7;
            this.gvMx1cab009.Width = 94;
            // 
            // gvMx1cab007
@@ -327,7 +296,7 @@
            this.gvMx1cab007.Name = "gvMx1cab007";
            this.gvMx1cab007.Tag = "query_a.CAB007";
            this.gvMx1cab007.Visible = true;
            this.gvMx1cab007.VisibleIndex = 9;
            this.gvMx1cab007.VisibleIndex = 8;
            this.gvMx1cab007.Width = 94;
            // 
            // gvMx1cab006
@@ -340,7 +309,7 @@
            this.gvMx1cab006.Name = "gvMx1cab006";
            this.gvMx1cab006.Tag = "query_a.CAB006";
            this.gvMx1cab006.Visible = true;
            this.gvMx1cab006.VisibleIndex = 8;
            this.gvMx1cab006.VisibleIndex = 6;
            this.gvMx1cab006.Width = 94;
            // 
            // gvMx1cab003
@@ -384,7 +353,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 356);
            this.tabMxPage1.Text = "明细";
            // 
            // gcMx1
@@ -393,7 +362,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 355);
            this.gcMx1.Size = new System.Drawing.Size(1124, 356);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -402,27 +371,28 @@
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gridColumn6,
            this.gvMx1cab002,
            this.gridColumn6,
            this.gvMx1cab003,
            this.gridColumn14,
            this.gvMx1depotCode,
            this.gridColumn15,
            this.gvMx1scraprate,
            this.gvMx1scrapqty,
            this.gridColumn10,
            this.gvMx1cab012,
            this.gvMx1cab006,
            this.gvMx1cab007,
            this.gvMx1cab009,
            this.gvMx1issueType,
            this.gridColumn16,
            this.gvMx1cab007,
            this.gvMx1cab014,
            this.gridColumn11,
            this.gridColumn12,
            this.gridColumn13,
            this.gvMx1mtono,
            this.gvMx1numerator,
            this.gvMx1denominator,
            this.gvMx1cab012,
            this.gvMx1cab014,
            this.gvMx1positionNo,
            this.gvMx1mtono,
            this.gvMx1lot,
            this.gridColumn17});
            this.gvMx1depotCode,
            this.gridColumn15,
            this.gvMx1issueType,
            this.gridColumn16,
            this.gvMx1scraprate,
            this.gvMx1scrapqty});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -432,7 +402,7 @@
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "gridColumn6";
            this.gridColumn6.Caption = "ppbom单号";
            this.gridColumn6.FieldName = "cab001";
            this.gridColumn6.MinWidth = 80;
            this.gridColumn6.Name = "gridColumn6";
@@ -450,6 +420,46 @@
            this.gridColumn14.VisibleIndex = 3;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn10
            //
            this.gridColumn10.Caption = "物料规格";
            this.gridColumn10.FieldName = "itemModel";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 4;
            this.gridColumn10.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "发料组织";
            this.gridColumn11.FieldName = "issuingOrganizationTxt";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 10;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "供应组织";
            this.gridColumn12.FieldName = "supplyOrganizationTxt";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 11;
            this.gridColumn12.Width = 94;
            //
            // gridColumn13
            //
            this.gridColumn13.Caption = "货主";
            this.gridColumn13.FieldName = "ownerId";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 12;
            this.gridColumn13.Width = 94;
            //
            // gridColumn15
            // 
            this.gridColumn15.Caption = "仓库名称";
@@ -457,7 +467,7 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 5;
            this.gridColumn15.VisibleIndex = 17;
            this.gridColumn15.Width = 94;
            // 
            // gridColumn16
@@ -467,17 +477,8 @@
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 12;
            this.gridColumn16.VisibleIndex = 19;
            this.gridColumn16.Width = 94;
            //
            // gridColumn17
            //
            this.gridColumn17.Caption = "BOM单号";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 20;
            this.gridColumn17.Width = 94;
            // 
            // gv_closeType
            // 
@@ -485,12 +486,12 @@
            this.gv_closeType.AppearanceCell.Options.UseFont = true;
            this.gv_closeType.Caption = "结案类型";
            this.gv_closeType.FieldName = "closeType";
            this.gv_closeType.MinWidth = 80;
            this.gv_closeType.MinWidth = 50;
            this.gv_closeType.Name = "gv_closeType";
            this.gv_closeType.OptionsColumn.AllowEdit = false;
            this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
            this.gv_closeType.Visible = true;
            this.gv_closeType.VisibleIndex = 30;
            this.gv_closeType.VisibleIndex = 20;
            this.gv_closeType.Width = 80;
            // 
            // gv_forceCloserid
@@ -499,12 +500,12 @@
            this.gv_forceCloserid.AppearanceCell.Options.UseFont = true;
            this.gv_forceCloserid.Caption = "结案人";
            this.gv_forceCloserid.FieldName = "forceCloserid";
            this.gv_forceCloserid.MinWidth = 80;
            this.gv_forceCloserid.MinWidth = 50;
            this.gv_forceCloserid.Name = "gv_forceCloserid";
            this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
            this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
            this.gv_forceCloserid.Visible = true;
            this.gv_forceCloserid.VisibleIndex = 29;
            this.gv_forceCloserid.VisibleIndex = 19;
            this.gv_forceCloserid.Width = 80;
            // 
            // gv_saleOrderEntryseq
@@ -513,27 +514,28 @@
            this.gv_saleOrderEntryseq.AppearanceCell.Options.UseFont = true;
            this.gv_saleOrderEntryseq.Caption = "需求单据行号";
            this.gv_saleOrderEntryseq.FieldName = "saleOrderEntryseq";
            this.gv_saleOrderEntryseq.MaxWidth = 60;
            this.gv_saleOrderEntryseq.MinWidth = 50;
            this.gv_saleOrderEntryseq.Name = "gv_saleOrderEntryseq";
            this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
            this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
            this.gv_saleOrderEntryseq.Visible = true;
            this.gv_saleOrderEntryseq.VisibleIndex = 28;
            this.gv_saleOrderEntryseq.VisibleIndex = 17;
            this.gv_saleOrderEntryseq.Width = 50;
            // 
            // lb_saleOrderNo
            // 
            this.lb_saleOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_saleOrderNo.Appearance.Options.UseFont = true;
            this.lb_saleOrderNo.Location = new System.Drawing.Point(525, 53);
            this.lb_saleOrderNo.Location = new System.Drawing.Point(20, 85);
            this.lb_saleOrderNo.Name = "lb_saleOrderNo";
            this.lb_saleOrderNo.Size = new System.Drawing.Size(90, 21);
            this.lb_saleOrderNo.Size = new System.Drawing.Size(68, 21);
            this.lb_saleOrderNo.TabIndex = 450;
            this.lb_saleOrderNo.Text = "销售订单号 ";
            this.lb_saleOrderNo.Text = "需求单号";
            // 
            // txt_saleOrderNo
            // 
            this.txt_saleOrderNo.Location = new System.Drawing.Point(623, 49);
            this.txt_saleOrderNo.Location = new System.Drawing.Point(95, 81);
            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
            this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
@@ -546,182 +548,47 @@
            this.gv_saleOrderNo.AppearanceCell.Options.UseFont = true;
            this.gv_saleOrderNo.Caption = "需求单据号";
            this.gv_saleOrderNo.FieldName = "saleOrderNo";
            this.gv_saleOrderNo.MinWidth = 100;
            this.gv_saleOrderNo.MinWidth = 50;
            this.gv_saleOrderNo.Name = "gv_saleOrderNo";
            this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
            this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
            this.gv_saleOrderNo.Visible = true;
            this.gv_saleOrderNo.VisibleIndex = 27;
            this.gv_saleOrderNo.VisibleIndex = 16;
            this.gv_saleOrderNo.Width = 100;
            //
            // gv_srcBillentryseq
            //
            this.gv_srcBillentryseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_srcBillentryseq.AppearanceCell.Options.UseFont = true;
            this.gv_srcBillentryseq.Caption = "源单分录行号";
            this.gv_srcBillentryseq.FieldName = "srcBillentryseq";
            this.gv_srcBillentryseq.MinWidth = 50;
            this.gv_srcBillentryseq.Name = "gv_srcBillentryseq";
            this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
            this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
            this.gv_srcBillentryseq.Visible = true;
            this.gv_srcBillentryseq.VisibleIndex = 26;
            this.gv_srcBillentryseq.Width = 50;
            //
            // gv_srcBillNo
            //
            this.gv_srcBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_srcBillNo.AppearanceCell.Options.UseFont = true;
            this.gv_srcBillNo.Caption = "源单编号";
            this.gv_srcBillNo.FieldName = "srcBillNo";
            this.gv_srcBillNo.MinWidth = 100;
            this.gv_srcBillNo.Name = "gv_srcBillNo";
            this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
            this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
            this.gv_srcBillNo.Visible = true;
            this.gv_srcBillNo.VisibleIndex = 25;
            this.gv_srcBillNo.Width = 100;
            //
            // gv_srcBillType
            //
            this.gv_srcBillType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_srcBillType.AppearanceCell.Options.UseFont = true;
            this.gv_srcBillType.Caption = "源单类型";
            this.gv_srcBillType.FieldName = "srcBillType";
            this.gv_srcBillType.MinWidth = 60;
            this.gv_srcBillType.Name = "gv_srcBillType";
            this.gv_srcBillType.OptionsColumn.AllowEdit = false;
            this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
            this.gv_srcBillType.Visible = true;
            this.gv_srcBillType.VisibleIndex = 24;
            this.gv_srcBillType.Width = 60;
            //
            // gv_createType
            //
            this.gv_createType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createType.AppearanceCell.Options.UseFont = true;
            this.gv_createType.Caption = "生成方式";
            this.gv_createType.FieldName = "createType";
            this.gv_createType.MinWidth = 100;
            this.gv_createType.Name = "gv_createType";
            this.gv_createType.OptionsColumn.AllowEdit = false;
            this.gv_createType.Tag = "query_a.CREATE_TYPE";
            this.gv_createType.Visible = true;
            this.gv_createType.VisibleIndex = 23;
            this.gv_createType.Width = 100;
            // 
            // lb_stockInlimitl
            // 
            this.lb_stockInlimitl.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_stockInlimitl.Appearance.Options.UseFont = true;
            this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 86);
            this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 52);
            this.lb_stockInlimitl.Name = "lb_stockInlimitl";
            this.lb_stockInlimitl.Size = new System.Drawing.Size(73, 21);
            this.lb_stockInlimitl.Size = new System.Drawing.Size(68, 21);
            this.lb_stockInlimitl.TabIndex = 370;
            this.lb_stockInlimitl.Text = "入库下限 ";
            this.lb_stockInlimitl.Text = "入库数量";
            // 
            // txt_stockInlimitl
            // txt_caa024
            // 
            this.txt_stockInlimitl.Location = new System.Drawing.Point(336, 82);
            this.txt_stockInlimitl.Name = "txt_stockInlimitl";
            this.txt_stockInlimitl.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_stockInlimitl.Properties.Appearance.Options.UseFont = true;
            this.txt_stockInlimitl.Size = new System.Drawing.Size(150, 28);
            this.txt_stockInlimitl.TabIndex = 370;
            //
            // gv_stockInlimitl
            //
            this.gv_stockInlimitl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_stockInlimitl.AppearanceCell.Options.UseFont = true;
            this.gv_stockInlimitl.Caption = "入库下限";
            this.gv_stockInlimitl.FieldName = "stockInlimitl";
            this.gv_stockInlimitl.MinWidth = 100;
            this.gv_stockInlimitl.Name = "gv_stockInlimitl";
            this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
            this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
            this.gv_stockInlimitl.Visible = true;
            this.gv_stockInlimitl.VisibleIndex = 32;
            this.gv_stockInlimitl.Width = 100;
            //
            // lb_stockInlimith
            //
            this.lb_stockInlimith.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_stockInlimith.Appearance.Options.UseFont = true;
            this.lb_stockInlimith.Location = new System.Drawing.Point(260, 118);
            this.lb_stockInlimith.Name = "lb_stockInlimith";
            this.lb_stockInlimith.Size = new System.Drawing.Size(73, 21);
            this.lb_stockInlimith.TabIndex = 360;
            this.lb_stockInlimith.Text = "入库上限 ";
            //
            // txt_stockInlimith
            //
            this.txt_stockInlimith.Location = new System.Drawing.Point(336, 114);
            this.txt_stockInlimith.Name = "txt_stockInlimith";
            this.txt_stockInlimith.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_stockInlimith.Properties.Appearance.Options.UseFont = true;
            this.txt_stockInlimith.Size = new System.Drawing.Size(150, 28);
            this.txt_stockInlimith.TabIndex = 360;
            //
            // gv_stockInlimith
            //
            this.gv_stockInlimith.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_stockInlimith.AppearanceCell.Options.UseFont = true;
            this.gv_stockInlimith.Caption = "入库上限";
            this.gv_stockInlimith.FieldName = "stockInlimith";
            this.gv_stockInlimith.MinWidth = 100;
            this.gv_stockInlimith.Name = "gv_stockInlimith";
            this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
            this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
            this.gv_stockInlimith.Visible = true;
            this.gv_stockInlimith.VisibleIndex = 31;
            this.gv_stockInlimith.Width = 100;
            //
            // lb_depotCode
            //
            this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depotCode.Appearance.Options.UseFont = true;
            this.lb_depotCode.Location = new System.Drawing.Point(49, 118);
            this.lb_depotCode.Name = "lb_depotCode";
            this.lb_depotCode.Size = new System.Drawing.Size(39, 21);
            this.lb_depotCode.TabIndex = 327;
            this.lb_depotCode.Text = "仓库 ";
            //
            // txt_ckName
            //
            this.txt_ckName.Location = new System.Drawing.Point(95, 114);
            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(150, 28);
            this.txt_ckName.TabIndex = 327;
            //
            // gv_depotCode
            //
            this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "仓库";
            this.gv_depotCode.FieldName = "depotName";
            this.gv_depotCode.MinWidth = 120;
            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 = 9;
            this.gv_depotCode.Width = 120;
            this.txt_caa024.Location = new System.Drawing.Point(336, 48);
            this.txt_caa024.Name = "txt_caa024";
            this.txt_caa024.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa024.Properties.Appearance.Options.UseFont = true;
            this.txt_caa024.Size = new System.Drawing.Size(150, 28);
            this.txt_caa024.TabIndex = 370;
            // 
            // gv_caa024
            // 
            this.gv_caa024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa024.AppearanceCell.Options.UseFont = true;
            this.gv_caa024.Caption = "已入库数量";
            this.gv_caa024.Caption = "已入库数";
            this.gv_caa024.FieldName = "caa024";
            this.gv_caa024.MinWidth = 60;
            this.gv_caa024.MaxWidth = 50;
            this.gv_caa024.MinWidth = 50;
            this.gv_caa024.Name = "gv_caa024";
            this.gv_caa024.OptionsColumn.AllowEdit = false;
            this.gv_caa024.Tag = "query_a.CAA024";
            this.gv_caa024.Visible = true;
            this.gv_caa024.VisibleIndex = 19;
            this.gv_caa024.Width = 60;
            this.gv_caa024.VisibleIndex = 12;
            this.gv_caa024.Width = 50;
            // 
            // gv_checkUser
            // 
@@ -734,15 +601,16 @@
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 14;
            this.gv_checkUser.VisibleIndex = 15;
            this.gv_checkUser.Width = 50;
            // 
            // gv_fstatus
            // 
            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
            this.gv_fstatus.Caption = "已审核";
            this.gv_fstatus.Caption = "审核标识";
            this.gv_fstatus.FieldName = "fstatusChk";
            this.gv_fstatus.MaxWidth = 50;
            this.gv_fstatus.MinWidth = 50;
            this.gv_fstatus.Name = "gv_fstatus";
            this.gv_fstatus.OptionsColumn.AllowEdit = false;
@@ -755,11 +623,11 @@
            // 
            this.lb_caa021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa021.Appearance.Options.UseFont = true;
            this.lb_caa021.Location = new System.Drawing.Point(15, 86);
            this.lb_caa021.Location = new System.Drawing.Point(507, 20);
            this.lb_caa021.Name = "lb_caa021";
            this.lb_caa021.Size = new System.Drawing.Size(73, 21);
            this.lb_caa021.Size = new System.Drawing.Size(68, 21);
            this.lb_caa021.TabIndex = 267;
            this.lb_caa021.Text = "生产车间 ";
            this.lb_caa021.Text = "生产车间";
            // 
            // gv_caa021
            // 
@@ -767,27 +635,17 @@
            this.gv_caa021.AppearanceCell.Options.UseFont = true;
            this.gv_caa021.Caption = "生产车间";
            this.gv_caa021.FieldName = "sccj";
            this.gv_caa021.MinWidth = 120;
            this.gv_caa021.MinWidth = 50;
            this.gv_caa021.Name = "gv_caa021";
            this.gv_caa021.OptionsColumn.AllowEdit = false;
            this.gv_caa021.Tag = "query_a.CAA021";
            this.gv_caa021.Visible = true;
            this.gv_caa021.VisibleIndex = 8;
            this.gv_caa021.VisibleIndex = 9;
            this.gv_caa021.Width = 120;
            //
            // lb_caa020
            //
            this.lb_caa020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa020.Appearance.Options.UseFont = true;
            this.lb_caa020.Location = new System.Drawing.Point(495, 86);
            this.lb_caa020.Name = "lb_caa020";
            this.lb_caa020.Size = new System.Drawing.Size(120, 21);
            this.lb_caa020.TabIndex = 262;
            this.lb_caa020.Text = "ERP生产订单号 ";
            // 
            // txt_caa020
            // 
            this.txt_caa020.Location = new System.Drawing.Point(623, 82);
            this.txt_caa020.Location = new System.Drawing.Point(95, 48);
            this.txt_caa020.Name = "txt_caa020";
            this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa020.Properties.Appearance.Options.UseFont = true;
@@ -800,59 +658,31 @@
            this.gv_caa020.AppearanceCell.Options.UseFont = true;
            this.gv_caa020.Caption = "任务单号";
            this.gv_caa020.FieldName = "caa020";
            this.gv_caa020.MinWidth = 100;
            this.gv_caa020.MinWidth = 50;
            this.gv_caa020.Name = "gv_caa020";
            this.gv_caa020.OptionsColumn.AllowEdit = false;
            this.gv_caa020.Tag = "query_a.CAA020";
            this.gv_caa020.Visible = true;
            this.gv_caa020.VisibleIndex = 5;
            this.gv_caa020.VisibleIndex = 6;
            this.gv_caa020.Width = 100;
            //
            // gv_caa019
            //
            this.gv_caa019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa019.AppearanceCell.Options.UseFont = true;
            this.gv_caa019.Caption = "erp源单行号";
            this.gv_caa019.FieldName = "caa019";
            this.gv_caa019.MinWidth = 50;
            this.gv_caa019.Name = "gv_caa019";
            this.gv_caa019.OptionsColumn.AllowEdit = false;
            this.gv_caa019.Tag = "query_a.CAA019";
            this.gv_caa019.Visible = true;
            this.gv_caa019.VisibleIndex = 15;
            this.gv_caa019.Width = 50;
            //
            // gv_caa018
            //
            this.gv_caa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa018.AppearanceCell.Options.UseFont = true;
            this.gv_caa018.Caption = "ERP源单ID";
            this.gv_caa018.FieldName = "caa018";
            this.gv_caa018.MinWidth = 80;
            this.gv_caa018.Name = "gv_caa018";
            this.gv_caa018.OptionsColumn.AllowEdit = false;
            this.gv_caa018.Tag = "query_a.CAA018";
            this.gv_caa018.Visible = true;
            this.gv_caa018.VisibleIndex = 33;
            this.gv_caa018.Width = 80;
            // 
            // lb_caa016
            // 
            this.lb_caa016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa016.Appearance.Options.UseFont = true;
            this.lb_caa016.Location = new System.Drawing.Point(49, 152);
            this.lb_caa016.Location = new System.Drawing.Point(54, 153);
            this.lb_caa016.Name = "lb_caa016";
            this.lb_caa016.Size = new System.Drawing.Size(39, 21);
            this.lb_caa016.Size = new System.Drawing.Size(34, 21);
            this.lb_caa016.TabIndex = 243;
            this.lb_caa016.Text = "备注 ";
            this.lb_caa016.Text = "备注";
            // 
            // txt_caa016
            // 
            this.txt_caa016.Location = new System.Drawing.Point(95, 148);
            this.txt_caa016.Location = new System.Drawing.Point(95, 149);
            this.txt_caa016.Name = "txt_caa016";
            this.txt_caa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa016.Properties.Appearance.Options.UseFont = true;
            this.txt_caa016.Size = new System.Drawing.Size(690, 28);
            this.txt_caa016.Size = new System.Drawing.Size(642, 28);
            this.txt_caa016.TabIndex = 243;
            // 
            // gv_caa016
@@ -861,27 +691,13 @@
            this.gv_caa016.AppearanceCell.Options.UseFont = true;
            this.gv_caa016.Caption = "备注";
            this.gv_caa016.FieldName = "caa016";
            this.gv_caa016.MinWidth = 100;
            this.gv_caa016.MinWidth = 50;
            this.gv_caa016.Name = "gv_caa016";
            this.gv_caa016.OptionsColumn.AllowEdit = false;
            this.gv_caa016.Tag = "query_a.CAA016";
            this.gv_caa016.Visible = true;
            this.gv_caa016.VisibleIndex = 22;
            this.gv_caa016.VisibleIndex = 21;
            this.gv_caa016.Width = 100;
            //
            // gv_caa015
            //
            this.gv_caa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa015.AppearanceCell.Options.UseFont = true;
            this.gv_caa015.Caption = "销售订单号";
            this.gv_caa015.FieldName = "caa015";
            this.gv_caa015.MinWidth = 100;
            this.gv_caa015.Name = "gv_caa015";
            this.gv_caa015.OptionsColumn.AllowEdit = false;
            this.gv_caa015.Tag = "query_a.CAA015";
            this.gv_caa015.Visible = true;
            this.gv_caa015.VisibleIndex = 21;
            this.gv_caa015.Width = 100;
            // 
            // lb_caa012
            // 
@@ -889,9 +705,9 @@
            this.lb_caa012.Appearance.Options.UseFont = true;
            this.lb_caa012.Location = new System.Drawing.Point(260, 20);
            this.lb_caa012.Name = "lb_caa012";
            this.lb_caa012.Size = new System.Drawing.Size(73, 21);
            this.lb_caa012.Size = new System.Drawing.Size(68, 21);
            this.lb_caa012.TabIndex = 231;
            this.lb_caa012.Text = "工单数量 ";
            this.lb_caa012.Text = "工单数量";
            // 
            // txt_caa012
            // 
@@ -906,7 +722,7 @@
            // 
            this.gv_caa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa012.AppearanceCell.Options.UseFont = true;
            this.gv_caa012.Caption = "工单总数";
            this.gv_caa012.Caption = "总数";
            this.gv_caa012.FieldName = "caa012";
            this.gv_caa012.MinWidth = 50;
            this.gv_caa012.Name = "gv_caa012";
@@ -920,15 +736,15 @@
            // 
            this.lb_caa011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa011.Appearance.Options.UseFont = true;
            this.lb_caa011.Location = new System.Drawing.Point(780, 53);
            this.lb_caa011.Location = new System.Drawing.Point(780, 52);
            this.lb_caa011.Name = "lb_caa011";
            this.lb_caa011.Size = new System.Drawing.Size(107, 21);
            this.lb_caa011.Size = new System.Drawing.Size(102, 21);
            this.lb_caa011.TabIndex = 228;
            this.lb_caa011.Text = "预计完工时间 ";
            this.lb_caa011.Text = "预计完工时间";
            // 
            // txt_caa011
            // 
            this.txt_caa011.Location = new System.Drawing.Point(893, 49);
            this.txt_caa011.Location = new System.Drawing.Point(893, 48);
            this.txt_caa011.Name = "txt_caa011";
            this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa011.Properties.Appearance.Options.UseFont = true;
@@ -941,12 +757,12 @@
            this.gv_caa011.AppearanceCell.Options.UseFont = true;
            this.gv_caa011.Caption = "预计完工时间";
            this.gv_caa011.FieldName = "caa011";
            this.gv_caa011.MinWidth = 180;
            this.gv_caa011.MinWidth = 50;
            this.gv_caa011.Name = "gv_caa011";
            this.gv_caa011.OptionsColumn.AllowEdit = false;
            this.gv_caa011.Tag = "query_a.CAA011";
            this.gv_caa011.Visible = true;
            this.gv_caa011.VisibleIndex = 13;
            this.gv_caa011.VisibleIndex = 14;
            this.gv_caa011.Width = 180;
            // 
            // lb_caa010
@@ -955,9 +771,9 @@
            this.lb_caa010.Appearance.Options.UseFont = true;
            this.lb_caa010.Location = new System.Drawing.Point(780, 20);
            this.lb_caa010.Name = "lb_caa010";
            this.lb_caa010.Size = new System.Drawing.Size(107, 21);
            this.lb_caa010.Size = new System.Drawing.Size(102, 21);
            this.lb_caa010.TabIndex = 226;
            this.lb_caa010.Text = "预计开工时间 ";
            this.lb_caa010.Text = "预计开工时间";
            // 
            // txt_caa010
            // 
@@ -974,27 +790,27 @@
            this.gv_caa010.AppearanceCell.Options.UseFont = true;
            this.gv_caa010.Caption = "预计开工时间";
            this.gv_caa010.FieldName = "caa010";
            this.gv_caa010.MinWidth = 180;
            this.gv_caa010.MinWidth = 50;
            this.gv_caa010.Name = "gv_caa010";
            this.gv_caa010.OptionsColumn.AllowEdit = false;
            this.gv_caa010.Tag = "query_a.CAA010";
            this.gv_caa010.Visible = true;
            this.gv_caa010.VisibleIndex = 12;
            this.gv_caa010.VisibleIndex = 13;
            this.gv_caa010.Width = 180;
            // 
            // lb_caa009
            // 
            this.lb_caa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa009.Appearance.Options.UseFont = true;
            this.lb_caa009.Location = new System.Drawing.Point(294, 53);
            this.lb_caa009.Location = new System.Drawing.Point(294, 85);
            this.lb_caa009.Name = "lb_caa009";
            this.lb_caa009.Size = new System.Drawing.Size(39, 21);
            this.lb_caa009.Size = new System.Drawing.Size(34, 21);
            this.lb_caa009.TabIndex = 222;
            this.lb_caa009.Text = "单位 ";
            this.lb_caa009.Text = "单位";
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(336, 49);
            this.txt_dwName.Location = new System.Drawing.Point(336, 81);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
@@ -1019,15 +835,15 @@
            // 
            this.lb_caa006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa006.Appearance.Options.UseFont = true;
            this.lb_caa006.Location = new System.Drawing.Point(15, 53);
            this.lb_caa006.Location = new System.Drawing.Point(20, 119);
            this.lb_caa006.Name = "lb_caa006";
            this.lb_caa006.Size = new System.Drawing.Size(73, 21);
            this.lb_caa006.Size = new System.Drawing.Size(68, 21);
            this.lb_caa006.TabIndex = 219;
            this.lb_caa006.Text = "产品编码 ";
            this.lb_caa006.Text = "产品编码";
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(95, 49);
            this.txt_itemNo.Location = new System.Drawing.Point(95, 115);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
@@ -1040,27 +856,27 @@
            this.gv_caa006.AppearanceCell.Options.UseFont = true;
            this.gv_caa006.Caption = "产品编码";
            this.gv_caa006.FieldName = "itemNo";
            this.gv_caa006.MinWidth = 80;
            this.gv_caa006.MinWidth = 50;
            this.gv_caa006.Name = "gv_caa006";
            this.gv_caa006.OptionsColumn.AllowEdit = false;
            this.gv_caa006.Tag = "query_a.CAA006";
            this.gv_caa006.Visible = true;
            this.gv_caa006.VisibleIndex = 6;
            this.gv_caa006.VisibleIndex = 7;
            this.gv_caa006.Width = 80;
            // 
            // lb_caa005
            // 
            this.lb_caa005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_caa005.Appearance.Options.UseFont = true;
            this.lb_caa005.Location = new System.Drawing.Point(780, 86);
            this.lb_caa005.Location = new System.Drawing.Point(780, 85);
            this.lb_caa005.Name = "lb_caa005";
            this.lb_caa005.Size = new System.Drawing.Size(107, 21);
            this.lb_caa005.Size = new System.Drawing.Size(102, 21);
            this.lb_caa005.TabIndex = 217;
            this.lb_caa005.Text = "计划下达日期 ";
            this.lb_caa005.Text = "计划下达时间";
            // 
            // txt_caa005
            // 
            this.txt_caa005.Location = new System.Drawing.Point(893, 82);
            this.txt_caa005.Location = new System.Drawing.Point(893, 81);
            this.txt_caa005.Name = "txt_caa005";
            this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa005.Properties.Appearance.Options.UseFont = true;
@@ -1071,14 +887,14 @@
            // 
            this.gv_caa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa005.AppearanceCell.Options.UseFont = true;
            this.gv_caa005.Caption = "计划下达日期";
            this.gv_caa005.FieldName = "caa005";
            this.gv_caa005.MinWidth = 180;
            this.gv_caa005.Caption = "同步时间";
            this.gv_caa005.FieldName = "createDate";
            this.gv_caa005.MinWidth = 50;
            this.gv_caa005.Name = "gv_caa005";
            this.gv_caa005.OptionsColumn.AllowEdit = false;
            this.gv_caa005.Tag = "query_a.CAA005";
            this.gv_caa005.Visible = true;
            this.gv_caa005.VisibleIndex = 20;
            this.gv_caa005.VisibleIndex = 24;
            this.gv_caa005.Width = 180;
            // 
            // lb_caa001
@@ -1104,34 +920,15 @@
            // 
            this.gv_caa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_caa001.AppearanceCell.Options.UseFont = true;
            this.gv_caa001.Caption = "单据编号";
            this.gv_caa001.Caption = "投料单号";
            this.gv_caa001.FieldName = "caa001";
            this.gv_caa001.MinWidth = 100;
            this.gv_caa001.MinWidth = 50;
            this.gv_caa001.Name = "gv_caa001";
            this.gv_caa001.OptionsColumn.AllowEdit = false;
            this.gv_caa001.Tag = "query_a.CAA001";
            this.gv_caa001.Visible = true;
            this.gv_caa001.VisibleIndex = 3;
            this.gv_caa001.Width = 100;
            //
            // lb_erpid
            //
            this.lb_erpid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_erpid.Appearance.Options.UseFont = true;
            this.lb_erpid.Location = new System.Drawing.Point(562, 20);
            this.lb_erpid.Name = "lb_erpid";
            this.lb_erpid.Size = new System.Drawing.Size(53, 21);
            this.lb_erpid.TabIndex = 211;
            this.lb_erpid.Text = "ERPID ";
            //
            // txt_erpid
            //
            this.txt_erpid.Location = new System.Drawing.Point(623, 16);
            this.txt_erpid.Name = "txt_erpid";
            this.txt_erpid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_erpid.Properties.Appearance.Options.UseFont = true;
            this.txt_erpid.Size = new System.Drawing.Size(150, 28);
            this.txt_erpid.TabIndex = 211;
            // 
            // toolBarMenu1
            // 
@@ -1173,35 +970,26 @@
            this.gridColumn8,
            this.gv_caa001,
            this.gridColumn1,
            this.gridColumn9,
            this.gv_caa020,
            this.gv_caa006,
            this.gridColumn3,
            this.gv_caa021,
            this.gv_caa012,
            this.gv_caa009,
            this.gv_caa024,
            this.gv_caa010,
            this.gv_caa011,
            this.gv_checkUser,
            this.gv_depotCode,
            this.gv_caa019,
            this.gridColumn2,
            this.gridColumn7,
            this.gridColumn4,
            this.gv_caa024,
            this.gv_caa005,
            this.gv_caa015,
            this.gv_caa016,
            this.gv_createType,
            this.gv_srcBillType,
            this.gv_srcBillNo,
            this.gv_srcBillentryseq,
            this.gv_saleOrderNo,
            this.gv_saleOrderEntryseq,
            this.gridColumn2,
            this.gv_forceCloserid,
            this.gv_closeType,
            this.gv_stockInlimith,
            this.gv_stockInlimitl,
            this.gv_caa018});
            this.gv_caa016,
            this.gridColumn7,
            this.gridColumn4,
            this.gv_caa005});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -1213,6 +1001,7 @@
            // 
            this.gridColumn5.Caption = "结案标识";
            this.gridColumn5.FieldName = "jabzChk";
            this.gridColumn5.MaxWidth = 50;
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "query_a.jabzChk";
@@ -1224,7 +1013,7 @@
            // 
            this.gridColumn8.Caption = "生产组织";
            this.gridColumn8.FieldName = "fSubsidiary";
            this.gridColumn8.MinWidth = 200;
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Tag = "org.fnamber";
            this.gridColumn8.Visible = true;
@@ -1235,53 +1024,65 @@
            // 
            this.gridColumn1.Caption = "工单状态";
            this.gridColumn1.FieldName = "gdzt";
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 80;
            // 
            // gridColumn9
            //
            this.gridColumn9.Caption = "用料清单状态";
            this.gridColumn9.MaxWidth = 60;
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 5;
            this.gridColumn9.Width = 60;
            //
            // gridColumn3
            // 
            this.gridColumn3.Caption = "产品名称";
            this.gridColumn3.FieldName = "itemName";
            this.gridColumn3.MinWidth = 120;
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.VisibleIndex = 8;
            this.gridColumn3.Width = 120;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "单据类型";
            this.gridColumn2.FieldName = "djlx";
            this.gridColumn2.MinWidth = 110;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 16;
            this.gridColumn2.VisibleIndex = 18;
            this.gridColumn2.Width = 110;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "已排总数";
            this.gridColumn7.FieldName = "caa012yp";
            this.gridColumn7.MaxWidth = 50;
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 17;
            this.gridColumn7.VisibleIndex = 22;
            this.gridColumn7.Width = 50;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "未排总数";
            this.gridColumn4.FieldName = "caa012wp";
            this.gridColumn4.MaxWidth = 50;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 18;
            this.gridColumn4.VisibleIndex = 23;
            this.gridColumn4.Width = 50;
            // 
            // xtraTabControl1
@@ -1327,10 +1128,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 183);
            this.tabMx.Location = new System.Drawing.Point(0, 182);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 387);
            this.tabMx.Size = new System.Drawing.Size(1126, 388);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1338,19 +1139,22 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_caa004);
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.txt_itemModel);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txt_itemName);
            this.panel1.Controls.Add(this.txt_gdzt);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_dptName);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_saleOrderNo);
            this.panel1.Controls.Add(this.txt_saleOrderNo);
            this.panel1.Controls.Add(this.lb_stockInlimitl);
            this.panel1.Controls.Add(this.txt_stockInlimitl);
            this.panel1.Controls.Add(this.lb_stockInlimith);
            this.panel1.Controls.Add(this.txt_stockInlimith);
            this.panel1.Controls.Add(this.lb_depotCode);
            this.panel1.Controls.Add(this.txt_ckName);
            this.panel1.Controls.Add(this.txt_caa024);
            this.panel1.Controls.Add(this.lb_caa021);
            this.panel1.Controls.Add(this.lb_caa020);
            this.panel1.Controls.Add(this.txt_caa020);
            this.panel1.Controls.Add(this.lb_caa016);
            this.panel1.Controls.Add(this.txt_caa016);
@@ -1369,17 +1173,92 @@
            this.panel1.Controls.Add(this.lb_caa001);
            this.panel1.Controls.Add(this.txt_caa001);
            this.panel1.Controls.Add(this.lb_erpid);
            this.panel1.Controls.Add(this.txt_erpid);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 183);
            this.panel1.Size = new System.Drawing.Size(1126, 182);
            this.panel1.TabIndex = 1;
            //
            // txt_caa004
            //
            this.txt_caa004.Location = new System.Drawing.Point(587, 81);
            this.txt_caa004.Name = "txt_caa004";
            this.txt_caa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_caa004.Properties.Appearance.Options.UseFont = true;
            this.txt_caa004.Size = new System.Drawing.Size(150, 28);
            this.txt_caa004.TabIndex = 461;
            //
            // labelControl4
            //
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(507, 85);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(68, 21);
            this.labelControl4.TabIndex = 460;
            this.labelControl4.Text = "单据类型";
            //
            // labelControl3
            //
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(507, 119);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(68, 21);
            this.labelControl3.TabIndex = 458;
            this.labelControl3.Text = "产品规格";
            //
            // txt_itemModel
            //
            this.txt_itemModel.Location = new System.Drawing.Point(587, 115);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(150, 28);
            this.txt_itemModel.TabIndex = 459;
            //
            // labelControl1
            //
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(260, 119);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 456;
            this.labelControl1.Text = "产品名称";
            //
            // txt_itemName
            //
            this.txt_itemName.Location = new System.Drawing.Point(336, 115);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(150, 28);
            this.txt_itemName.TabIndex = 457;
            //
            // txt_gdzt
            //
            this.txt_gdzt.Location = new System.Drawing.Point(587, 48);
            this.txt_gdzt.Name = "txt_gdzt";
            this.txt_gdzt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
            this.txt_gdzt.Size = new System.Drawing.Size(150, 28);
            this.txt_gdzt.TabIndex = 455;
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(507, 52);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 454;
            this.labelControl2.Text = "工单状态";
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(95, 82);
            this.txt_dptName.Location = new System.Drawing.Point(587, 16);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
@@ -1404,6 +1283,16 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            //
            // lb_erpid
            //
            this.lb_erpid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_erpid.Appearance.Options.UseFont = true;
            this.lb_erpid.Location = new System.Drawing.Point(20, 52);
            this.lb_erpid.Name = "lb_erpid";
            this.lb_erpid.Size = new System.Drawing.Size(68, 21);
            this.lb_erpid.TabIndex = 211;
            this.lb_erpid.Text = "任务单号";
            // 
            // picCheckBox
            // 
@@ -1430,9 +1319,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit();
@@ -1442,7 +1329,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1453,6 +1339,10 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1476,9 +1366,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1numerator;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1issueType;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtono;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1positionNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab014;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab012;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab009;
@@ -1497,39 +1385,21 @@
        private DevExpress.XtraEditors.LabelControl lb_saleOrderNo;
        private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillentryseq;
        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createType;
        private DevExpress.XtraEditors.LabelControl lb_stockInlimitl;
        private DevExpress.XtraEditors.TextEdit txt_stockInlimitl;
        private DevExpress.XtraGrid.Columns.GridColumn gv_stockInlimitl;
        private DevExpress.XtraEditors.LabelControl lb_stockInlimith;
        private DevExpress.XtraEditors.TextEdit txt_stockInlimith;
        private DevExpress.XtraGrid.Columns.GridColumn gv_stockInlimith;
        private DevExpress.XtraEditors.LabelControl lb_depotCode;
        private DevExpress.XtraEditors.TextEdit txt_ckName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
        private DevExpress.XtraEditors.TextEdit txt_caa024;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa024;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
        private DevExpress.XtraEditors.LabelControl lb_caa021;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa021;
        private DevExpress.XtraEditors.LabelControl lb_caa020;
        private DevExpress.XtraEditors.TextEdit txt_caa020;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa020;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa019;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa018;
        private DevExpress.XtraEditors.LabelControl lb_caa016;
        private DevExpress.XtraEditors.TextEdit txt_caa016;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa016;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa015;
        private DevExpress.XtraEditors.LabelControl lb_caa012;
        private DevExpress.XtraEditors.TextEdit txt_caa012;
@@ -1558,16 +1428,12 @@
        private DevExpress.XtraEditors.LabelControl lb_caa001;
        private DevExpress.XtraEditors.TextEdit txt_caa001;
        private DevExpress.XtraGrid.Columns.GridColumn gv_caa001;
        private DevExpress.XtraEditors.LabelControl lb_erpid;
        private DevExpress.XtraEditors.TextEdit txt_erpid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -1575,5 +1441,19 @@
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraEditors.TextEdit txt_dptName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.LabelControl lb_erpid;
        private DevExpress.XtraEditors.TextEdit txt_caa004;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraEditors.TextEdit txt_gdzt;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -20,8 +20,6 @@
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            //this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick;
            //this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
            {
@@ -100,26 +98,7 @@
                getPageList(1);
            }
        }
        /// <summary>
        /// 结案
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
        {
            _toolCk(1);
        }
        /// <summary>
        /// 反结案
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
        {
            _toolCk(0);
        }
        /// <summary>
        /// 
        /// </summary>
@@ -144,6 +123,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -200,6 +180,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -212,58 +193,6 @@
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(int _inFieldValue)
        {
            string strMsg = "";
            switch (_inFieldValue)
            {
                case 1:
                    strMsg = "结案";
                    break;
                case 0:
                    strMsg = "反结案";
                    break;
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_caa001, gridView1, "caa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue = _inFieldValue,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -495,6 +495,7 @@
                    lst.Add(btnKg.Name);
                    lst.Add(btnWg.Name);
                    lst.Add(btnZhongTai.Name);
                    lst.Add(btnHelp.Name);
                    _enabledBtn(lst);
                }
            }