bug

lu

19 小时以前 feda55cf6e916b826c5d6c8b5d96d7dab795f715

bug

 DevApp/Gs.DevApp/App.config

@@ -35,9 +35,9 @@
    </assemblyBinding>
  </runtime>
  <appSettings>
    <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
    <add key="WebApiUrl" value="http://localhost:5263/" />
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
    <add key="WebApiUrl" value="http://192.168.1.145:81/" />
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
    <add key="LogPath" value="logs" />
    <add key="ProductName" value="G-MES V2.0" />
    <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs

@@ -112,6 +112,10 @@
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -142,10 +146,6 @@
            this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -195,6 +195,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -203,10 +207,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -572,7 +572,7 @@
            // txt_fOwnerIdHead
            // 
            this.txt_fOwnerIdHead.IsReadly = false;
            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 146);
            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 147);
            this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
            this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24);
            this.txt_fOwnerIdHead.TabIndex = 537;
@@ -580,7 +580,7 @@
            // txt_fPurchaseDeptId
            // 
            this.txt_fPurchaseDeptId.IsReadly = false;
            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 146);
            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 147);
            this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
            this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24);
            this.txt_fPurchaseDeptId.TabIndex = 535;
@@ -588,7 +588,7 @@
            // txt_fRequireOrgId
            // 
            this.txt_fRequireOrgId.IsReadly = false;
            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 146);
            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 147);
            this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
            this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24);
            this.txt_fRequireOrgId.TabIndex = 534;
@@ -596,7 +596,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 110);
            this.btnSelect.Location = new System.Drawing.Point(12, 108);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -623,7 +623,7 @@
            // txt_returnType
            // 
            this.txt_returnType.EditValue = "-请选择-";
            this.txt_returnType.Location = new System.Drawing.Point(360, 77);
            this.txt_returnType.Location = new System.Drawing.Point(360, 76);
            this.txt_returnType.Name = "txt_returnType";
            this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -677,7 +677,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(636, 77);
            this.txt_remark.Location = new System.Drawing.Point(636, 76);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -697,7 +697,7 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(84, 77);
            this.txt_suppId.Location = new System.Drawing.Point(84, 76);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(200, 24);
@@ -715,7 +715,7 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(840, 77);
            this.txt_status.Location = new System.Drawing.Point(840, 76);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(274, 24);
@@ -725,7 +725,7 @@
            // 
            // txt_isFinish
            // 
            this.txt_isFinish.Location = new System.Drawing.Point(840, 110);
            this.txt_isFinish.Location = new System.Drawing.Point(840, 108);
            this.txt_isFinish.Name = "txt_isFinish";
            this.txt_isFinish.Properties.Caption = "完结标识";
            this.txt_isFinish.Size = new System.Drawing.Size(274, 24);
@@ -761,13 +761,13 @@
            // 
            // txt_fHasLinkRad
            // 
            this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 110);
            this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 108);
            this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
            this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有源单"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "无源单")});
            this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 32);
            this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 35);
            this.txt_fHasLinkRad.StyleController = this.layoutMx1;
            this.txt_fHasLinkRad.TabIndex = 533;
            // 
@@ -838,7 +838,7 @@
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 36D;
            rowDefinition4.Height = 39D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -866,18 +866,18 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_returnType;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 65);
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 64);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem6.Text = "退料原因";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -888,7 +888,7 @@
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem5.Text = "退料方式";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -921,7 +921,7 @@
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -943,18 +943,18 @@
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem15.Text = "更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 65);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 64);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -962,22 +962,22 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 65);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem4.Text = "选供应商";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 98);
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 39);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -986,11 +986,11 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 98);
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 96);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 36);
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 39);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
@@ -998,13 +998,64 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 65);
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 64);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layoutControlItem3.Control = this.txt_fHasLinkRad;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 96);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 39);
            this.layoutControlItem3.Text = "源单类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem1
            // 
            this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem1.Control = this.txt_fRequireOrgId;
            this.layItem1.Location = new System.Drawing.Point(0, 135);
            this.layItem1.Name = "layItem1";
            this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem1.Size = new System.Drawing.Size(276, 32);
            this.layItem1.Text = "需求组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem4
            // 
            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem4.Control = this.txt_fOwnerIdHead;
            this.layItem4.Location = new System.Drawing.Point(276, 135);
            this.layItem4.Name = "layItem4";
            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem4.Size = new System.Drawing.Size(276, 32);
            this.layItem4.Text = "货主";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem2
            // 
            this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem2.Control = this.txt_fPurchaseDeptId;
            this.layItem2.Location = new System.Drawing.Point(552, 135);
            this.layItem2.Name = "layItem2";
            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem2.Size = new System.Drawing.Size(276, 32);
            this.layItem2.Text = "采购部门";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1290,7 +1341,7 @@
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "当前库存";
            this.gridColumn8.Caption = "当前总库存";
            this.gridColumn8.FieldName = "kcQty";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
@@ -1340,57 +1391,6 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layoutControlItem3.Control = this.txt_fHasLinkRad;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 98);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem3.Text = "源单类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem1
            // 
            this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem1.Control = this.txt_fRequireOrgId;
            this.layItem1.Location = new System.Drawing.Point(0, 134);
            this.layItem1.Name = "layItem1";
            this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem1.Size = new System.Drawing.Size(276, 33);
            this.layItem1.Text = "需求组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem4
            // 
            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem4.Control = this.txt_fOwnerIdHead;
            this.layItem4.Location = new System.Drawing.Point(276, 134);
            this.layItem4.Name = "layItem4";
            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem4.Size = new System.Drawing.Size(276, 33);
            this.layItem4.Text = "货主";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem2
            // 
            this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem2.Control = this.txt_fPurchaseDeptId;
            this.layItem2.Location = new System.Drawing.Point(552, 134);
            this.layItem2.Name = "layItem2";
            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem2.Size = new System.Drawing.Size(276, 33);
            this.layItem2.Text = "采购部门";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // Frm_MesCgthSq
            // 
@@ -1451,6 +1451,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1459,10 +1463,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
            this.ResumeLayout(false);

        }

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs

@@ -127,6 +127,8 @@
                                _row["remark"] = dym.remark;
                                _row["orderNo"] = dym.orderNo; //序号
                                _row["kcQty"] = dym.kcQty; //库存数量
                                _row["depotId"] = dym.depotId; //库存数量
                                _row["depotName"] = dym.depotName; //库存数量
                                _Table.Rows.Add(_row);
                            }
                            gcMx1.BindingContext = new BindingContext();

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs

@@ -187,7 +187,6 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -308,7 +307,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBl)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -1654,8 +1652,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.rptBl,
            this.repositoryItemMemoEdit1});
            this.rptBl});
            this.gcMx1.Size = new System.Drawing.Size(1256, 228);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1938,10 +1935,6 @@
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 15;
            this.gridColumn23.Width = 94;
            // 
            // repositoryItemMemoEdit1
            // 
            this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
            // 
            // xtraTabPage3
            // 
@@ -2245,7 +2238,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBl)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -2358,7 +2350,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraEditors.TextEdit txt_tbl026;

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs

@@ -49,6 +49,7 @@
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -116,6 +117,8 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptBl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -186,6 +189,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBl)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -267,6 +271,7 @@
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn13,
            this.gv_tbl013,
            this.gv_tbl020,
            this.gv_billNo,
@@ -287,6 +292,14 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn13
            // 
            this.gridColumn13.Caption = "主键Guid";
            this.gridColumn13.FieldName = "guid";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Width = 94;
            // 
            // gv_tbl013
            // 
@@ -540,7 +553,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 105);
            this.btnSelect.Location = new System.Drawing.Point(12, 97);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(86, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -549,7 +562,7 @@
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(626, 43);
            this.txt_itemName.Location = new System.Drawing.Point(626, 35);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(195, 24);
@@ -560,7 +573,7 @@
            // txt_tbl005
            // 
            this.txt_tbl005.EditValue = "-请选择-";
            this.txt_tbl005.Location = new System.Drawing.Point(84, 74);
            this.txt_tbl005.Location = new System.Drawing.Point(84, 66);
            this.txt_tbl005.Name = "txt_tbl005";
            this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -577,14 +590,14 @@
            // txt_tbl002
            // 
            this.txt_tbl002.IsReadly = false;
            this.txt_tbl002.Location = new System.Drawing.Point(84, 43);
            this.txt_tbl002.Location = new System.Drawing.Point(84, 35);
            this.txt_tbl002.Name = "txt_tbl002";
            this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl002.TabIndex = 462;
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
            this.txt_billNo.Location = new System.Drawing.Point(84, 4);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
@@ -594,7 +607,7 @@
            // 
            // txt_tbl012
            // 
            this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
            this.txt_tbl012.Location = new System.Drawing.Point(897, 35);
            this.txt_tbl012.Name = "txt_tbl012";
            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
@@ -604,7 +617,7 @@
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(355, 12);
            this.txt_daa014.Location = new System.Drawing.Point(355, 4);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
            this.txt_daa014.Size = new System.Drawing.Size(195, 24);
@@ -614,7 +627,7 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
            this.txt_itemNo.Location = new System.Drawing.Point(626, 4);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
@@ -624,7 +637,7 @@
            // 
            // txt_tbl011
            // 
            this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
            this.txt_tbl011.Location = new System.Drawing.Point(897, 4);
            this.txt_tbl011.Name = "txt_tbl011";
            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
@@ -634,7 +647,7 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(626, 74);
            this.txt_itemModel.Location = new System.Drawing.Point(626, 66);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
@@ -644,7 +657,7 @@
            // 
            // txt_tbl006
            // 
            this.txt_tbl006.Location = new System.Drawing.Point(355, 74);
            this.txt_tbl006.Location = new System.Drawing.Point(355, 66);
            this.txt_tbl006.Name = "txt_tbl006";
            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
@@ -653,7 +666,7 @@
            // 
            // txt_tbl013
            // 
            this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
            this.txt_tbl013.Location = new System.Drawing.Point(825, 66);
            this.txt_tbl013.Name = "txt_tbl013";
            this.txt_tbl013.Properties.Caption = "审核状态";
            this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
@@ -663,7 +676,7 @@
            // 
            // txt_erpProductionOrderNo
            // 
            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 43);
            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 35);
            this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
            this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
@@ -917,7 +930,8 @@
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.repositoryItemButtonEdit1,
            this.rptBl});
            this.gcMx1.Size = new System.Drawing.Size(1124, 400);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -939,7 +953,8 @@
            this.gridColumn1,
            this.gridColumn2,
            this.gvMxDel,
            this.gridColumn5});
            this.gridColumn5,
            this.gridColumn12});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1037,7 +1052,7 @@
            this.gvMx1tld006.Name = "gvMx1tld006";
            this.gvMx1tld006.Tag = "query_a.tld006";
            this.gvMx1tld006.Visible = true;
            this.gvMx1tld006.VisibleIndex = 6;
            this.gvMx1tld006.VisibleIndex = 7;
            this.gvMx1tld006.Width = 94;
            // 
            // gvMx1tld007
@@ -1049,7 +1064,7 @@
            this.gvMx1tld007.Name = "gvMx1tld007";
            this.gvMx1tld007.Tag = "query_a.tld007";
            this.gvMx1tld007.Visible = true;
            this.gvMx1tld007.VisibleIndex = 7;
            this.gvMx1tld007.VisibleIndex = 8;
            this.gvMx1tld007.Width = 94;
            // 
            // gvMx1tld009
@@ -1060,8 +1075,6 @@
            this.gvMx1tld009.MinWidth = 50;
            this.gvMx1tld009.Name = "gvMx1tld009";
            this.gvMx1tld009.Tag = "query_a.tld009";
            this.gvMx1tld009.Visible = true;
            this.gvMx1tld009.VisibleIndex = 8;
            this.gvMx1tld009.Width = 94;
            // 
            // gridColumn1
@@ -1119,6 +1132,30 @@
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn12
            // 
            this.gridColumn12.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
            this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn12.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
            this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn12.Caption = "选择不良类别";
            this.gridColumn12.ColumnEdit = this.rptBl;
            this.gridColumn12.FieldName = "tld015";
            this.gridColumn12.MinWidth = 100;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Tag = "edit";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 6;
            this.gridColumn12.Width = 100;
            // 
            // rptBl
            // 
            this.rptBl.AutoHeight = false;
            this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
            this.rptBl.Name = "rptBl";
            this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
            // 
            // xtraTabPage3
            // 
@@ -1331,6 +1368,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptBl)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1426,5 +1464,8 @@
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraEditors.SplitContainerControl split99;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs

@@ -1,4 +1,5 @@
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -347,7 +348,8 @@
                        Guid = _guid,
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        Sl = _sl, //申请数量
                        Remark = _tld014
                        Remark = _tld014,
                        Bllb = row["tld015"].ToString().Replace("|", ",")
                    });
                }
            }
@@ -603,6 +605,26 @@
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
 

        private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            UcDictionarySelect frm = new UcDictionarySelect("异常描述", "  a.s_type='QC异常描述' and a.pid<>'00000000-0000-0000-0000-000000000000'");
            frm.UpdateParent += (ss, ee) =>
            {
                System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
                var lst = ee.DynamicList;
                foreach (dynamic dym in lst)
                {
                    if (stringBuilder.Length > 0)
                        stringBuilder.Append("|");
                    stringBuilder.Append(dym.dicTxt);
                }
                gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
            };
            frm.ShowDialog();
        }
    }
}

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs

@@ -139,7 +139,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn4
@@ -149,7 +149,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn3
@@ -159,7 +159,7 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.VisibleIndex = 1;
            this.gridColumn3.Width = 94;
            // 
            // gv_Btn

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs

@@ -107,7 +107,9 @@
                    ysNum = "0",//已扫数量
                    remark = "",
                    orderNo = "0", //序号
                    kcQty = dr["kcQty"].ToString()//库存数量
                    kcQty = dr["kcQty"].ToString(),//库存数量
                    depotId = dr["depotId"].ToString(),//
                    depotName = dr["depotName"].ToString(),//
                });
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
                Close();