bug
lu
2025-09-08 db070b0ad98daecaa3c5a66a0c16fd93a7d00570
bug
已修改7个文件
已添加1个文件
753 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs 174 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs 279 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -273,23 +273,24 @@
            _toolCk(3);
        }
        /// <summary>
        /// å“è´¨
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
        {
            _toolCk(4);
        }
        /// <summary>
        /// åå“è´¨
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
        {
            _toolCk(4);
        }
        /// <summary>
        /// å“è´¨
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
        {
            _toolCk(5);
        }
        /// <summary>
        ///     å®¡æ ¸äº‹ä»¶
        /// </summary>
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -115,7 +115,6 @@
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -166,6 +165,7 @@
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -224,7 +224,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -236,6 +235,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -619,8 +619,7 @@
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem16,
            this.layoutControlItem12,
            this.layoutControlItem21});
            this.layoutControlItem12});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
@@ -649,10 +648,10 @@
            // 
            // txt_chkStatus
            // 
            this.txt_chkStatus.Location = new System.Drawing.Point(682, 73);
            this.txt_chkStatus.Location = new System.Drawing.Point(671, 74);
            this.txt_chkStatus.Name = "txt_chkStatus";
            this.txt_chkStatus.Properties.Caption = "审核状态";
            this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
            this.txt_chkStatus.Size = new System.Drawing.Size(326, 24);
            this.txt_chkStatus.StyleController = this.layoutMx1;
            this.txt_chkStatus.TabIndex = 376;
            this.txt_chkStatus.Tag = "readonly";
@@ -672,7 +671,7 @@
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
            this.txt_billNo.Size = new System.Drawing.Size(223, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -680,23 +679,23 @@
            // txt_fBillTypeID
            // 
            this.txt_fBillTypeID.EditValue = "标准销售出库单(XSCKD01_SYS)";
            this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 42);
            this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 43);
            this.txt_fBillTypeID.Name = "txt_fBillTypeID";
            this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
            "标准销售出库单(XSCKD01_SYS)"});
            this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
            this.txt_fBillTypeID.Size = new System.Drawing.Size(223, 24);
            this.txt_fBillTypeID.StyleController = this.layoutMx1;
            this.txt_fBillTypeID.TabIndex = 362;
            // 
            // txt_fApproverID
            // 
            this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
            this.txt_fApproverID.Location = new System.Drawing.Point(773, 12);
            this.txt_fApproverID.Name = "txt_fApproverID";
            this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
            this.txt_fApproverID.Size = new System.Drawing.Size(224, 24);
            this.txt_fApproverID.StyleController = this.layoutMx1;
            this.txt_fApproverID.TabIndex = 222;
            this.txt_fApproverID.Tag = "readonly";
@@ -704,94 +703,94 @@
            // txt_salesId
            // 
            this.txt_salesId.IsReadly = false;
            this.txt_salesId.Location = new System.Drawing.Point(114, 73);
            this.txt_salesId.Location = new System.Drawing.Point(114, 74);
            this.txt_salesId.Name = "txt_salesId";
            this.txt_salesId.Size = new System.Drawing.Size(229, 24);
            this.txt_salesId.Size = new System.Drawing.Size(223, 24);
            this.txt_salesId.TabIndex = 367;
            // 
            // txt_fSaleOrgIdTxt
            // 
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(443, 12);
            this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
            this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
            this.txt_fSaleOrgIdTxt.TabIndex = 365;
            this.txt_fSaleOrgIdTxt.Tag = "readonly";
            // 
            // txt_fCreatorId
            // 
            this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 104);
            this.txt_fCreatorId.Location = new System.Drawing.Point(1103, 105);
            this.txt_fCreatorId.Name = "txt_fCreatorId";
            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
            this.txt_fCreatorId.Size = new System.Drawing.Size(224, 24);
            this.txt_fCreatorId.StyleController = this.layoutMx1;
            this.txt_fCreatorId.TabIndex = 219;
            this.txt_fCreatorId.Tag = "readonly";
            // 
            // txt_fApproveDate
            // 
            this.txt_fApproveDate.Location = new System.Drawing.Point(784, 42);
            this.txt_fApproveDate.Location = new System.Drawing.Point(773, 43);
            this.txt_fApproveDate.Name = "txt_fApproveDate";
            this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
            this.txt_fApproveDate.Size = new System.Drawing.Size(224, 24);
            this.txt_fApproveDate.StyleController = this.layoutMx1;
            this.txt_fApproveDate.TabIndex = 228;
            this.txt_fApproveDate.Tag = "readonly";
            // 
            // txt_fNote
            // 
            this.txt_fNote.Location = new System.Drawing.Point(114, 104);
            this.txt_fNote.Location = new System.Drawing.Point(114, 105);
            this.txt_fNote.Name = "txt_fNote";
            this.txt_fNote.Properties.Appearance.Options.UseFont = true;
            this.txt_fNote.Size = new System.Drawing.Size(229, 24);
            this.txt_fNote.Size = new System.Drawing.Size(223, 24);
            this.txt_fNote.StyleController = this.layoutMx1;
            this.txt_fNote.TabIndex = 243;
            // 
            // txt_fSalesManIDTxt
            // 
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 104);
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(773, 105);
            this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
            this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
            this.txt_fSalesManIDTxt.TabIndex = 231;
            this.txt_fSalesManIDTxt.Tag = "readonly";
            // 
            // txt_fCreateDate
            // 
            this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 135);
            this.txt_fCreateDate.Location = new System.Drawing.Point(1103, 136);
            this.txt_fCreateDate.Name = "txt_fCreateDate";
            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
            this.txt_fCreateDate.Size = new System.Drawing.Size(224, 24);
            this.txt_fCreateDate.StyleController = this.layoutMx1;
            this.txt_fCreateDate.TabIndex = 226;
            this.txt_fCreateDate.Tag = "readonly";
            // 
            // txt_fCustomerIDTxt
            // 
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 42);
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(443, 43);
            this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
            this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(224, 24);
            this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
            this.txt_fCustomerIDTxt.TabIndex = 368;
            this.txt_fCustomerIDTxt.Tag = "readonly";
            // 
            // txt_shf
            // 
            this.txt_shf.Location = new System.Drawing.Point(449, 73);
            this.txt_shf.Location = new System.Drawing.Point(443, 74);
            this.txt_shf.Name = "txt_shf";
            this.txt_shf.Size = new System.Drawing.Size(229, 24);
            this.txt_shf.Size = new System.Drawing.Size(224, 24);
            this.txt_shf.StyleController = this.layoutMx1;
            this.txt_shf.TabIndex = 373;
            this.txt_shf.Tag = "readonly";
            // 
            // txt_shName
            // 
            this.txt_shName.Location = new System.Drawing.Point(449, 104);
            this.txt_shName.Location = new System.Drawing.Point(443, 105);
            this.txt_shName.Name = "txt_shName";
            this.txt_shName.Size = new System.Drawing.Size(229, 24);
            this.txt_shName.Size = new System.Drawing.Size(224, 24);
            this.txt_shName.StyleController = this.layoutMx1;
            this.txt_shName.TabIndex = 374;
            this.txt_shName.Tag = "readonly";
@@ -808,31 +807,31 @@
            // 
            // txt_qt031
            // 
            this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
            this.txt_qt031.Location = new System.Drawing.Point(1103, 12);
            this.txt_qt031.Name = "txt_qt031";
            this.txt_qt031.Properties.ReadOnly = true;
            this.txt_qt031.Size = new System.Drawing.Size(229, 24);
            this.txt_qt031.Size = new System.Drawing.Size(224, 24);
            this.txt_qt031.StyleController = this.layoutMx1;
            this.txt_qt031.TabIndex = 378;
            this.txt_qt031.Tag = "readonly";
            // 
            // txt_qt030
            // 
            this.txt_qt030.Location = new System.Drawing.Point(1119, 42);
            this.txt_qt030.Location = new System.Drawing.Point(1103, 43);
            this.txt_qt030.Name = "txt_qt030";
            this.txt_qt030.Properties.ReadOnly = true;
            this.txt_qt030.Size = new System.Drawing.Size(229, 24);
            this.txt_qt030.Size = new System.Drawing.Size(224, 24);
            this.txt_qt030.StyleController = this.layoutMx1;
            this.txt_qt030.TabIndex = 379;
            this.txt_qt030.Tag = "readonly";
            // 
            // txt_qt029
            // 
            this.txt_qt029.Location = new System.Drawing.Point(1017, 73);
            this.txt_qt029.Location = new System.Drawing.Point(1001, 74);
            this.txt_qt029.Name = "txt_qt029";
            this.txt_qt029.Properties.Caption = "财务审核状态";
            this.txt_qt029.Properties.ReadOnly = true;
            this.txt_qt029.Size = new System.Drawing.Size(331, 24);
            this.txt_qt029.Size = new System.Drawing.Size(326, 24);
            this.txt_qt029.StyleController = this.layoutMx1;
            this.txt_qt029.TabIndex = 380;
            this.txt_qt029.Tag = "readonly";
@@ -897,7 +896,8 @@
            this.layoutControlItem17,
            this.layoutControlItem9,
            this.layoutControlItem3,
            this.layoutControlItem2});
            this.layoutControlItem2,
            this.layoutControlItem21});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -929,7 +929,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 174);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem13
@@ -937,11 +937,11 @@
            this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem13.CustomizationFormText = "客户名称";
            this.layoutControlItem13.Location = new System.Drawing.Point(335, 30);
            this.layoutControlItem13.Location = new System.Drawing.Point(329, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem13.Text = "客户名称";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -950,10 +950,10 @@
            this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem5.CustomizationFormText = "销售组织";
            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(329, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(335, 30);
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem5.Text = "销售组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -962,11 +962,11 @@
            this.layoutControlItem14.Control = this.txt_shf;
            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem14.CustomizationFormText = "收货方";
            this.layoutControlItem14.Location = new System.Drawing.Point(335, 61);
            this.layoutControlItem14.Location = new System.Drawing.Point(329, 62);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem14.Text = "收货方";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -975,10 +975,10 @@
            this.layoutControlItem8.Control = this.txt_fNote;
            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem8.CustomizationFormText = "申请备注";
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem8.Text = "申请备注";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -987,10 +987,10 @@
            this.layoutControlItem4.Control = this.txt_salesId;
            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem4.CustomizationFormText = "销售订单";
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 61);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem4.Text = "销售订单";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -999,10 +999,10 @@
            this.layoutControlItem10.Control = this.txt_fApproverID;
            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem10.CustomizationFormText = "审核人";
            this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(659, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(335, 30);
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem10.Text = "审核人员";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1011,22 +1011,22 @@
            this.layoutControlItem11.Control = this.txt_fApproveDate;
            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem11.CustomizationFormText = "审核日期";
            this.layoutControlItem11.Location = new System.Drawing.Point(670, 30);
            this.layoutControlItem11.Location = new System.Drawing.Point(659, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem11.Text = "审核日期";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_chkStatus;
            this.layoutControlItem15.Location = new System.Drawing.Point(670, 61);
            this.layoutControlItem15.Location = new System.Drawing.Point(659, 62);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem15.Text = "审核状态";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
@@ -1034,32 +1034,32 @@
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_qt031;
            this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
            this.layoutControlItem18.Location = new System.Drawing.Point(989, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(335, 30);
            this.layoutControlItem18.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem18.Text = "财务审核人员";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_qt030;
            this.layoutControlItem19.Location = new System.Drawing.Point(1005, 30);
            this.layoutControlItem19.Location = new System.Drawing.Point(989, 31);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem19.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem19.Text = "财务审核日期";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_qt029;
            this.layoutControlItem20.Location = new System.Drawing.Point(1005, 61);
            this.layoutControlItem20.Location = new System.Drawing.Point(989, 62);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem20.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem20.Text = "财务审核状态";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem20.TextVisible = false;
@@ -1069,11 +1069,11 @@
            this.layoutControlItem6.Control = this.txt_fCreatorId;
            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem6.CustomizationFormText = "创建人";
            this.layoutControlItem6.Location = new System.Drawing.Point(1005, 92);
            this.layoutControlItem6.Location = new System.Drawing.Point(989, 93);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem6.Text = "创建人员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1082,11 +1082,11 @@
            this.layoutControlItem7.Control = this.txt_fCreateDate;
            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem7.CustomizationFormText = "创建日期";
            this.layoutControlItem7.Location = new System.Drawing.Point(1005, 123);
            this.layoutControlItem7.Location = new System.Drawing.Point(989, 124);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem7.Text = "创建日期";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1095,11 +1095,11 @@
            this.layoutControlItem17.Control = this.txt_shName;
            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem17.CustomizationFormText = "收货人姓名";
            this.layoutControlItem17.Location = new System.Drawing.Point(335, 92);
            this.layoutControlItem17.Location = new System.Drawing.Point(329, 93);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem17.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem17.Text = "收货人姓名";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1108,11 +1108,11 @@
            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem9.CustomizationFormText = "销售员";
            this.layoutControlItem9.Location = new System.Drawing.Point(670, 92);
            this.layoutControlItem9.Location = new System.Drawing.Point(659, 93);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem9.Text = "销售人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1121,10 +1121,10 @@
            this.layoutControlItem3.Control = this.txt_fBillTypeID;
            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem3.CustomizationFormText = "单据类型";
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem3.Text = "单据类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -1135,23 +1135,9 @@
            this.layoutControlItem2.CustomizationFormText = "申请编号";
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.Size = new System.Drawing.Size(335, 30);
            this.layoutControlItem2.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem2.Text = "申请编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.btnSelect;
            this.layoutControlItem21.CustomizationFormText = "选择物料";
            this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem21.TextVisible = false;
            // 
            // tabMx
            // 
@@ -1682,6 +1668,20 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.btnSelect;
            this.layoutControlItem21.CustomizationFormText = "选择物料";
            this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
            this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem21.TextVisible = false;
            //
            // Frm_SalesDeliver
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1750,7 +1750,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1762,6 +1761,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -76,6 +77,62 @@
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            };
            //选择需要的明细
            btnSelect.Click += (s, e) =>
            {
                if (string.IsNullOrEmpty(this.txt_salesId.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择销售订单!");
                    this.txt_salesId.Focus();
                    return;
                }
                var frm = new Frm_SalesDeliverSelect(this.txt_salesId.GetId());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        var lst = ee.DynamicList;
                        DataTable _Table = (DataTable)gcMx1.DataSource;
                        foreach (dynamic dym in lst)
                        {
                            DataRow _row = _Table.NewRow();
                            _row["salesDetailId"] = dym.salesDetailId;
                            _row["billNo"] = dym.billNo;
                            _row["itemNo"] = dym.itemNo;
                            _row["itemName"] = dym.itemName;
                            _row["itemModel"] = dym.itemModel;
                            _row["dwXs"] = dym.dwXs;
                            _row["dwJj"] = dym.dwJj;
                            _row["jjSl"] = dym.jjSl;
                            _row["deliveryDate"] = dym.deliveryDate;
                             _row["xsSl"] = dym.xsSl;
                            _row["isFree"] = dym.isFree;
                            _row["hzlx"] = dym.hzlx;
                            _row["hz"] = dym.hz;
                            _row["xxbz"] = dym.xxbz;
                            _row["fhsx"] = dym.fhsx;
                            _row["fhxx"] = dym.fhxx;
                            _row["jsOrg"] = dym.jsOrg;
                            _row["gyOrg"] = dym.gyOrg;
                            _row["kcOrg"] = dym.kcOrg;
                            _Table.Rows.Add(_row);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _Table;
                        gcMx1.ForceInitialize();
                        gvMx1.CloseEditor();
                        gvMx1.PostEditor();
                        gvMx1.UpdateCurrentRow();
                    }
                    catch (Exception ex)
                    {
                        Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
@@ -28,11 +28,284 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            this.SuspendLayout();
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1056, 639);
            this.gcMain.TabIndex = 4;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.colChkInt,
            this.gv_guid,
            this.gridColumn4,
            this.gv_supplierItemCode,
            this.gv_supplierItemName,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn9,
            this.gv_purchaseUnit,
            this.gridColumn10,
            this.gridColumn2,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // colChkInt
            //
            this.colChkInt.Caption = ".";
            this.colChkInt.FieldName = "chkInt";
            this.colChkInt.MinWidth = 25;
            this.colChkInt.Name = "colChkInt";
            this.colChkInt.Visible = true;
            this.colChkInt.VisibleIndex = 0;
            this.colChkInt.Width = 94;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.OptionsColumn.ReadOnly = true;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "销售单号";
            this.gridColumn4.FieldName = "billNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 94;
            //
            // gv_supplierItemCode
            //
            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemCode.Caption = "物料编码";
            this.gv_supplierItemCode.FieldName = "itemNo";
            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 2;
            this.gv_supplierItemCode.Width = 100;
            //
            // gv_supplierItemName
            //
            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
            this.gv_supplierItemName.Caption = "物料名称";
            this.gv_supplierItemName.FieldName = "itemName";
            this.gv_supplierItemName.Name = "gv_supplierItemName";
            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 6;
            this.gv_supplierItemName.Width = 120;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "物料规格";
            this.gridColumn5.FieldName = "itemModel";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 7;
            this.gridColumn5.Width = 250;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "销售单位";
            this.gridColumn6.FieldName = "xxdw";
            this.gridColumn6.MaxWidth = 50;
            this.gridColumn6.MinWidth = 50;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 50;
            //
            // gridColumn7
            //
            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn7.Caption = "销售单数量";
            this.gridColumn7.FieldName = "qty";
            this.gridColumn7.MaxWidth = 50;
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 50;
            //
            // gridColumn9
            //
            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn9.Caption = "供应组织";
            this.gridColumn9.FieldName = "gyOrg";
            this.gridColumn9.MaxWidth = 50;
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Width = 50;
            //
            // gv_purchaseUnit
            //
            this.gv_purchaseUnit.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gv_purchaseUnit.AppearanceCell.Options.UseForeColor = true;
            this.gv_purchaseUnit.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gv_purchaseUnit.AppearanceHeader.Options.UseForeColor = true;
            this.gv_purchaseUnit.Caption = "库存组织";
            this.gv_purchaseUnit.FieldName = "kcOrg";
            this.gv_purchaseUnit.MaxWidth = 50;
            this.gv_purchaseUnit.MinWidth = 50;
            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gv_purchaseUnit.Width = 50;
            //
            // gridColumn10
            //
            this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn10.Caption = "未发货数量";
            this.gridColumn10.FieldName = "syQty";
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 4;
            this.gridColumn10.Width = 125;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "销售组织";
            this.gridColumn2.FieldName = "salesOrgName";
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 250;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "计价单位";
            this.gridColumn1.FieldName = "jjdw";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            //
            // panelControl1
            //
            this.panelControl1.Controls.Add(this.btnIn);
            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panelControl1.Location = new System.Drawing.Point(0, 639);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(1056, 43);
            this.panelControl1.TabIndex = 5;
            //
            // btnIn
            //
            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            this.btnIn.Appearance.Options.UseBackColor = true;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(960, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            //
            // Frm_SalesDeliverSelect
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Text = "Frm_SalesDeliverSelect";
        }
            this.ClientSize = new System.Drawing.Size(1056, 682);
            this.Controls.Add(this.gcMain);
            this.Controls.Add(this.panelControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "Frm_SalesDeliverSelect";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择销售单明细";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
@@ -1,8 +1,13 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Repository;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.SqlTypes;
using System.Drawing;
using System.Linq;
using System.Text;
@@ -13,9 +18,102 @@
{
    public partial class Frm_SalesDeliverSelect : DevExpress.XtraEditors.XtraForm
    {
        public Frm_SalesDeliverSelect()
        private readonly string _webServiceName = "MesShouTuiManager/";
        private string xiaoShouId = "";
        /// <summary>
        ///
        /// </summary>
        /// <param name="_cusId">客户</param>
        /// <param name="_inOrgId">组织</param>
        /// <param name="_ckId">仓库</param>
        /// <param name="_isSource">0有源1,1无源</param>
        public Frm_SalesDeliverSelect(string _xiaoShouId)
        {
            InitializeComponent();
            this.xiaoShouId= _xiaoShouId;
            this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
            this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
            this.colChkInt.OptionsFilter.AllowFilter = false;
            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
            this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.colChkInt.VisibleIndex = 0;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
            getPageList(1);
            btnIn.Click += (s, e) =>
            {
                var list = new List<dynamic>();
                gridView1.PostEditor();
                gridView1.UpdateCurrentRow();
                DataTable dt = this.gcMain.DataSource as DataTable;
                {
                    foreach (DataRow dr in dt.Rows)
                    {
                        string checkBox = dr["chkInt"].ToString();
                        //string _guid = dr["guid"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            list.Add(new
                            {
                                salesDetailId = dr["id"].ToString(),
                                billNo = dr["billNo"].ToString(),
                                itemNo = dr["itemNo"].ToString(),
                                itemName = dr["itemName"].ToString(),
                                itemModel = dr["itemModel"].ToString(),
                                dwXs = dr["xxdw"].ToString(),
                                dwJj = dr["jjdw"].ToString(),
                                jjSl = dr["priceUnitQty"].ToString(),
                                deliveryDate = dr["deliveryDate"].ToString(),
                                xsSl = dr["qty"].ToString(),
                                isFree = dr["isFree"].ToString(),
                                hzlx = dr["hzlx"].ToString(),
                                hz = dr["hz"].ToString(),
                                xxbz = dr["xxbz"].ToString(),
                                fhsx = dr["fhsx"].ToString(),
                                fhxx = dr["fhxx"].ToString(),
                                jsOrg = dr["jsOrg"].ToString(),
                                gyOrg = dr["gyOrg"].ToString(),
                                kcOrg = dr["kcOrg"].ToString(),
                            });
                        }
                    }
                }
                UpdateParent?.Invoke(this,
                    new UpdateParentEventArgs { DynamicList = list });
                Close();
            };
        }
        /// <summary>
        ///     é€‰æ‹©åŽçš„回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
            var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), this.xiaoShouId);
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                   "SalesManager/SelectFormMx", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -9,7 +9,6 @@
{
    public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "MesShouTuiManager/";
        private string cusId = "";
        private string inOrgId = "";
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1897,6 +1897,9 @@
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliver.resx">
      <DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverSelect.resx">
      <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesOrder.resx">
      <DependentUpon>Frm_SalesOrder.cs</DependentUpon>
    </EmbeddedResource>