bug

lu

4 天以前 e7a4a432735a3bd29518247c87a956786a9d596e

bug

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs

@@ -114,7 +114,7 @@
            this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
            this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
            this.txt_tlOrg = new DevExpress.XtraEditors.TextEdit();
            this.txt_receiveOrgId = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -274,7 +274,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tlOrg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveOrgId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
@@ -833,7 +833,7 @@
            this.layoutMx1.Controls.Add(this.txt_checkStates);
            this.layoutMx1.Controls.Add(this.txt_freceQty);
            this.layoutMx1.Controls.Add(this.txt_aboutGuid);
            this.layoutMx1.Controls.Add(this.txt_tlOrg);
            this.layoutMx1.Controls.Add(this.txt_receiveOrgId);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
@@ -1053,14 +1053,14 @@
            this.txt_aboutGuid.StyleController = this.layoutMx1;
            this.txt_aboutGuid.TabIndex = 816;
            // 
            // txt_tlOrg
            // txt_receiveOrgId
            // 
            this.txt_tlOrg.Location = new System.Drawing.Point(734, 152);
            this.txt_tlOrg.Name = "txt_tlOrg";
            this.txt_tlOrg.Size = new System.Drawing.Size(249, 24);
            this.txt_tlOrg.StyleController = this.layoutMx1;
            this.txt_tlOrg.TabIndex = 818;
            this.txt_tlOrg.Tag = "readonly";
            this.txt_receiveOrgId.Location = new System.Drawing.Point(734, 152);
            this.txt_receiveOrgId.Name = "txt_receiveOrgId";
            this.txt_receiveOrgId.Size = new System.Drawing.Size(249, 24);
            this.txt_receiveOrgId.StyleController = this.layoutMx1;
            this.txt_receiveOrgId.TabIndex = 818;
            this.txt_receiveOrgId.Tag = "readonly";
            // 
            // layoutControlItem17
            // 
@@ -1350,7 +1350,7 @@
            // 
            // layoutControlItem27
            // 
            this.layoutControlItem27.Control = this.txt_tlOrg;
            this.layoutControlItem27.Control = this.txt_receiveOrgId;
            this.layoutControlItem27.Location = new System.Drawing.Point(650, 140);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -2065,10 +2065,10 @@
            // 
            this.layoutControl1.Controls.Add(this.txt_iCount_1);
            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
            this.layoutControl1.Location = new System.Drawing.Point(352, 45);
            this.layoutControl1.Location = new System.Drawing.Point(352, 53);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.Root = this.layoutControlGroup2;
            this.layoutControl1.Size = new System.Drawing.Size(336, 29);
            this.layoutControl1.Size = new System.Drawing.Size(336, 38);
            this.layoutControl1.TabIndex = 475;
            this.layoutControl1.Text = "layoutControl1";
            // 
@@ -2112,7 +2112,7 @@
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 29);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 38);
            this.layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem30
@@ -2120,7 +2120,7 @@
            this.layoutControlItem30.Control = this.txt_iCount_1;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.Size = new System.Drawing.Size(168, 29);
            this.layoutControlItem30.Size = new System.Drawing.Size(168, 38);
            this.layoutControlItem30.Text = "打印整张数值";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -2130,7 +2130,7 @@
            this.layoutControlItem31.Location = new System.Drawing.Point(168, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem31.Size = new System.Drawing.Size(168, 29);
            this.layoutControlItem31.Size = new System.Drawing.Size(168, 38);
            this.layoutControlItem31.Text = "打印余数";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -2145,7 +2145,7 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(340, 33);
            this.radOut.Size = new System.Drawing.Size(340, 41);
            this.radOut.StyleController = this.layout99;
            this.radOut.TabIndex = 474;
            // 
@@ -2153,16 +2153,16 @@
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 45);
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 53);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 29);
            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 38);
            this.ucBtnPrint1.TabIndex = 231;
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 45);
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 53);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -2235,7 +2235,7 @@
            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition9,
            rowDefinition10});
            this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 86);
            this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 103);
            this.layoutControlGroup3.TextVisible = false;
            // 
            // layoutControlItem29
@@ -2244,29 +2244,29 @@
            this.layoutControlItem29.Location = new System.Drawing.Point(680, 0);
            this.layoutControlItem29.Name = "layoutControlItem24";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem29.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem29.Size = new System.Drawing.Size(340, 41);
            this.layoutControlItem29.Text = "可打印总数";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem32
            // 
            this.layoutControlItem32.Control = this.txt_psnQty_1;
            this.layoutControlItem32.Location = new System.Drawing.Point(680, 33);
            this.layoutControlItem32.Location = new System.Drawing.Point(680, 41);
            this.layoutControlItem32.Name = "layoutControlItem25";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem32.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem32.Size = new System.Drawing.Size(340, 42);
            this.layoutControlItem32.Text = "每张条码数量";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem33
            // 
            this.layoutControlItem33.Control = this.ucBtnPrint1;
            this.layoutControlItem33.Location = new System.Drawing.Point(1020, 33);
            this.layoutControlItem33.Location = new System.Drawing.Point(1020, 41);
            this.layoutControlItem33.Name = "layoutControlItem27";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem33.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem33.Size = new System.Drawing.Size(340, 42);
            this.layoutControlItem33.Text = "打印按钮";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem33.TextVisible = false;
@@ -2279,7 +2279,7 @@
            this.layoutControlItem34.Name = "layoutControlItem28";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem34.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem34.Size = new System.Drawing.Size(340, 41);
            this.layoutControlItem34.Text = "自动计算";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem34.TextVisible = false;
@@ -2289,7 +2289,7 @@
            this.layoutControlItem13.Control = this.txtQuantity;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem13.Size = new System.Drawing.Size(340, 41);
            this.layoutControlItem13.Text = "申请总量";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -2299,18 +2299,18 @@
            this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem18.Size = new System.Drawing.Size(340, 41);
            this.layoutControlItem18.Text = "已打印总量";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem24
            // 
            this.layoutControlItem24.Control = this.layoutControl1;
            this.layoutControlItem24.Location = new System.Drawing.Point(340, 33);
            this.layoutControlItem24.Location = new System.Drawing.Point(340, 41);
            this.layoutControlItem24.Name = "item0";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 33);
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 42);
            this.layoutControlItem24.Text = "自动计算";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem24.TextVisible = false;
@@ -2520,16 +2520,15 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // Frm_RkDetect01
            // RkDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1344, 800);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_RkDetect01";
            this.Text = "入库检验";
            this.Name = "RkDetect01";
            this.Size = new System.Drawing.Size(1344, 800);
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2569,7 +2568,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tlOrg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_receiveOrgId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
@@ -2843,7 +2842,7 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private UserControl.UcLookCk txt_rkCkId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraEditors.TextEdit txt_tlOrg;
        private DevExpress.XtraEditors.TextEdit txt_receiveOrgId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs

@@ -417,7 +417,6 @@
                txt_rkCkId.Focus();
                return;
            }

            if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("当检验结果不合格时，请填写备注说明！");
@@ -528,7 +527,7 @@
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                    string strCk = dy.rkCkId;
                    txt_rkCkId.getSuppler(txt_tlOrg.Text.Trim(), strCk);
                    txt_rkCkId.getSuppler(txt_receiveOrgId.Text.Trim(), strCk);
                    setEable(isEdit);
                    txtQuantity.Text = dy["fbatchQty"].ToString();
                    txt_kQty.Text = dy["kdy"].ToString();
@@ -585,11 +584,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }

        }

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx

@@ -117,4 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -242,6 +242,9 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);
            
        }
        /// <summary>
        /// 保存事件

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs

@@ -303,6 +303,9 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fStockOrgId);

        }
        /// <summary>
        /// 保存事件