1

lu

2024-11-16 3ff3c816c74c077a320c4a9cb3094fb0b9fcc2c5

1

 DevApp/Gs.DevApp/App.config

@@ -29,7 +29,7 @@
    </runtime>
    <appSettings>
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<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/QC/Frm_MesQaItemsDetect01.Designer.cs

@@ -29,22 +29,22 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -246,6 +246,9 @@
            // 
            // gvMx1
            // 
            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx1.ColumnPanelRowHeight = 50;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gvMx1fcheckItem,
@@ -340,12 +343,12 @@
            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
            this.gvMx1fupAllow.Caption = "上限";
            this.gvMx1fupAllow.FieldName = "fupAllow";
            this.gvMx1fupAllow.MinWidth = 50;
            this.gvMx1fupAllow.MinWidth = 40;
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 4;
            this.gvMx1fupAllow.Width = 94;
            this.gvMx1fupAllow.Width = 40;
            // 
            // gvMx1fstand
            // 
@@ -353,7 +356,7 @@
            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
            this.gvMx1fstand.Caption = "标准值";
            this.gvMx1fstand.FieldName = "fstand";
            this.gvMx1fstand.MinWidth = 50;
            this.gvMx1fstand.MinWidth = 40;
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "query_a.fstand";
            this.gvMx1fstand.Visible = true;
@@ -366,7 +369,7 @@
            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
            this.gvMx1fdownAllow.Caption = "下限";
            this.gvMx1fdownAllow.FieldName = "fdownAllow";
            this.gvMx1fdownAllow.MinWidth = 50;
            this.gvMx1fdownAllow.MinWidth = 40;
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
            this.gvMx1fdownAllow.Visible = true;
@@ -379,7 +382,7 @@
            this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1freQty.Caption = "RE数量";
            this.gvMx1freQty.FieldName = "freQty";
            this.gvMx1freQty.MinWidth = 50;
            this.gvMx1freQty.MinWidth = 40;
            this.gvMx1freQty.Name = "gvMx1freQty";
            this.gvMx1freQty.Tag = "query_a.fre_qty";
            this.gvMx1freQty.Visible = true;
@@ -392,7 +395,7 @@
            this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
            this.gvMx1checkQyt.Caption = "抽检数量";
            this.gvMx1checkQyt.FieldName = "checkQyt";
            this.gvMx1checkQyt.MinWidth = 50;
            this.gvMx1checkQyt.MinWidth = 40;
            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
            this.gvMx1checkQyt.Visible = true;
@@ -405,7 +408,7 @@
            this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1fenterQty.Caption = "已录入数量";
            this.gvMx1fenterQty.FieldName = "fenterQty";
            this.gvMx1fenterQty.MinWidth = 50;
            this.gvMx1fenterQty.MinWidth = 40;
            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
            this.gvMx1fenterQty.Visible = true;
@@ -422,7 +425,7 @@
            this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1fcheckResu.Caption = "检验结果";
            this.gvMx1fcheckResu.FieldName = "fcheckResu";
            this.gvMx1fcheckResu.MinWidth = 50;
            this.gvMx1fcheckResu.MinWidth = 60;
            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
            this.gvMx1fcheckResu.Visible = true;
@@ -435,7 +438,7 @@
            this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
            this.gvMx1fngRate.Caption = "不良率";
            this.gvMx1fngRate.FieldName = "fngRate";
            this.gvMx1fngRate.MinWidth = 80;
            this.gvMx1fngRate.MinWidth = 40;
            this.gvMx1fngRate.Name = "gvMx1fngRate";
            this.gvMx1fngRate.Tag = "query_a.fng_rate";
            this.gvMx1fngRate.Visible = true;
@@ -448,7 +451,7 @@
            this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1fngQty.Caption = "不合格数";
            this.gvMx1fngQty.FieldName = "fngQty";
            this.gvMx1fngQty.MinWidth = 50;
            this.gvMx1fngQty.MinWidth = 40;
            this.gvMx1fngQty.Name = "gvMx1fngQty";
            this.gvMx1fngQty.Tag = "query_a.fng_qty";
            this.gvMx1fngQty.Visible = true;
@@ -461,12 +464,12 @@
            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1sampleSizeNo.Caption = "检验标志编码";
            this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
            this.gvMx1sampleSizeNo.MinWidth = 150;
            this.gvMx1sampleSizeNo.MinWidth = 200;
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 13;
            this.gvMx1sampleSizeNo.Width = 150;
            this.gvMx1sampleSizeNo.Width = 200;
            // 
            // gvMx1fcheckLevel
            // 
@@ -1357,10 +1360,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions10.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions10.Image")));
            editorButtonImageOptions10.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浏览", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浏览", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1378,10 +1381,10 @@
            // repositoryItemButtonEdit3
            // 
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
            editorButtonImageOptions11.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "下载", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "下载", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1399,10 +1402,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions12.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -41,6 +41,22 @@
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
                }
            };
            this.gvMx1.IndicatorWidth = 50;
            gvMx1.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                {
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
                }
            };
            this.gvMx2.IndicatorWidth = 50;
            gvMx2.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                {
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
                }
            };
            gridView1.CustomDrawEmptyForeground += (s, e) =>
            {
                string str = "暂未查找到匹配的数据!";
@@ -146,31 +162,37 @@
                string _strCmd = txtJianYan.Text.Trim().ToUpper();
                string _strOK = "OK";
                string _strNG = "NG";
                if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
                int n = 0;
                if ((_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或 NG 命令!");
                    return;
                    if (!_strCmd.Contains("-"))
                    {
                        Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或 NG 命令!");
                        return;
                    }
                    string[] _ary = _strCmd.Split('-');
                    if (_ary.Length != 2)
                    {
                        Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：：请正确使用OK 或  NG 命令!");
                        return;
                    }
                    string _str1 = _ary[0];
                    if (!(_str1 == _strOK || _str1 == _strNG))
                    {
                        Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或  NG 命令!");
                        return;
                    }
                    string _str2 = _ary[1];
                    if (int.TryParse(_str2, out n))
                    {
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或  NG 命令!");
                        return;
                    }
                }
                if (!_strCmd.Contains("-"))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：缺少 中画线!");
                    return;
                }
                string[] _ary = _strCmd.Split('-');
                if (_ary.Length != 2)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：：请正确使用OK 或  NG 命令!");
                    return;
                }
                string _str1 = _ary[0];
                if (!(_str1 == _strOK || _str1 == _strNG))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或  NG 命令!");
                    return;
                }
                string _str2 = _ary[1];
                int n;
                if (int.TryParse(_str2, out n))
                if (int.TryParse(_strCmd, out n))
                {
                }
                else
@@ -178,25 +200,12 @@
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("命令输入错误：请正确使用OK 或  NG 命令!");
                    return;
                }
                for (int i = 0; i < gvMx2.DataRowCount; i++)
                var _obj = new
                {
                    gvMx2.SetRowCellValue(i, "fcheckResu", _str1);
                    gvMx2.SetRowCellValue(i, "fstand", _str1);
                }
                List<MesQaItemsDetectDetail12> lst = new List<MesQaItemsDetectDetail12>();
                for (var i = 0; i < gvMx2.DataRowCount; i++)
                {
                    var row = gvMx2.GetDataRow(i);
                    if (row != null)
                        lst.Add(new MesQaItemsDetectDetail12()
                        {
                            ParentGuid = UtilityHelper.ToGuid(guid5),
                            Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                            FcheckResu = row["fcheckResu"].ToString(),
                            GrandpaGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                        });
                }
                var _obj = lst;
                    inOrderGuid1 = UtilityHelper.ToGuid(lbGuid.Text.Trim()), ////这是检验单guid
                    inOrderGuid5 = guid5,//这是抽样的guid
                    inP1 = _strCmd,//这是9，有可能是19，或者0k-19,或者ng-19
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
@@ -206,6 +215,8 @@
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        txtJianYan.Text = "";
                        getModel(lbGuid.Text.Trim(), false, 999);
                    }
                }
                catch (Exception ex)
@@ -543,7 +554,6 @@
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }

            _loading.Stop();
        }


 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx

@@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
        bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs

@@ -593,7 +593,7 @@
                "0.010---(AQL_0_0010)"
                , "0.015---(AQL_0_0015)"
                , "0.025---(AQL_0_0025)"
                ,"0.04---(AQL_0_0040)"
                ,"0.040---(AQL_0_0040)"
                ,"0.065---(AQL_0_0065)"
                ,"0.10---(AQL_0_010)"
                ,"0.15---(AQL_0_015)"

 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs

@@ -345,6 +345,7 @@
            dataTable.Rows.Add("DH(采购到货单)");
            dataTable.Rows.Add("JY(检验申请单)");
            dataTable.Rows.Add("TL(采购退料单)");
            dataTable.Rows.Add("IN(入库单)");
            //dataTable.Rows.Add("PO(采购订单)");
            //dataTable.Rows.Add("IA(库存调整)");
            //dataTable.Rows.Add("IO(出库单)");

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

@@ -214,7 +214,7 @@
            this.gvMx1sourceDocumentType.AppearanceCell.Options.UseFont = true;
            this.gvMx1sourceDocumentType.Caption = "来源单据类型";
            this.gvMx1sourceDocumentType.FieldName = "sourceDocumentType";
            this.gvMx1sourceDocumentType.MinWidth = 100;
            this.gvMx1sourceDocumentType.MinWidth = 80;
            this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
            this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
            this.gvMx1sourceDocumentType.Visible = true;
@@ -227,7 +227,7 @@
            this.gvMx1returnableStoredQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1returnableStoredQty.Caption = "可退入库数量";
            this.gvMx1returnableStoredQty.FieldName = "returnableStoredQty";
            this.gvMx1returnableStoredQty.MinWidth = 100;
            this.gvMx1returnableStoredQty.MinWidth = 80;
            this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
            this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
            this.gvMx1returnableStoredQty.Visible = true;
@@ -240,7 +240,7 @@
            this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1returnableReceivedQty.Caption = "可退收货数量";
            this.gvMx1returnableReceivedQty.FieldName = "returnableReceivedQty";
            this.gvMx1returnableReceivedQty.MinWidth = 100;
            this.gvMx1returnableReceivedQty.MinWidth = 80;
            this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
            this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
            this.gvMx1returnableReceivedQty.Visible = true;
@@ -253,7 +253,7 @@
            this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1totalReturnedQty.Caption = "总退货数量";
            this.gvMx1totalReturnedQty.FieldName = "totalReturnedQty";
            this.gvMx1totalReturnedQty.MinWidth = 100;
            this.gvMx1totalReturnedQty.MinWidth = 80;
            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
            this.gvMx1totalReturnedQty.Visible = true;
@@ -266,7 +266,7 @@
            this.gvMx1remainingStoredQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1remainingStoredQty.Caption = "剩余入库数量";
            this.gvMx1remainingStoredQty.FieldName = "remainingStoredQty";
            this.gvMx1remainingStoredQty.MinWidth = 100;
            this.gvMx1remainingStoredQty.MinWidth = 80;
            this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
            this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gvMx1remainingStoredQty.Visible = true;
@@ -279,7 +279,7 @@
            this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1totalStoredQty.Caption = "总已入库数量";
            this.gvMx1totalStoredQty.FieldName = "totalStoredQty";
            this.gvMx1totalStoredQty.MinWidth = 100;
            this.gvMx1totalStoredQty.MinWidth = 80;
            this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
            this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
            this.gvMx1totalStoredQty.Visible = true;
@@ -292,7 +292,7 @@
            this.gvMx1remainingReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1remainingReceivedQty.Caption = "剩余收货数量";
            this.gvMx1remainingReceivedQty.FieldName = "remainingReceivedQty";
            this.gvMx1remainingReceivedQty.MinWidth = 100;
            this.gvMx1remainingReceivedQty.MinWidth = 80;
            this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
            this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
            this.gvMx1remainingReceivedQty.Visible = true;
@@ -305,7 +305,7 @@
            this.gvMx1totalReceivedQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1totalReceivedQty.Caption = "总已收数量";
            this.gvMx1totalReceivedQty.FieldName = "totalReceivedQty";
            this.gvMx1totalReceivedQty.MinWidth = 100;
            this.gvMx1totalReceivedQty.MinWidth = 80;
            this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
            this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
            this.gvMx1totalReceivedQty.Visible = true;
@@ -474,7 +474,7 @@
            this.gvMx1pricingQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1pricingQty.Caption = "计价数量";
            this.gvMx1pricingQty.FieldName = "pricingQty";
            this.gvMx1pricingQty.MinWidth = 100;
            this.gvMx1pricingQty.MinWidth = 80;
            this.gvMx1pricingQty.Name = "gvMx1pricingQty";
            this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
            this.gvMx1pricingQty.Visible = true;
@@ -487,7 +487,7 @@
            this.gvMx1pricingUnit.AppearanceCell.Options.UseFont = true;
            this.gvMx1pricingUnit.Caption = "计价单位";
            this.gvMx1pricingUnit.FieldName = "pricingUnit";
            this.gvMx1pricingUnit.MinWidth = 100;
            this.gvMx1pricingUnit.MinWidth = 80;
            this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
            this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
            this.gvMx1pricingUnit.Visible = true;
@@ -500,7 +500,7 @@
            this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
            this.gvMx1inventoryUnit.Caption = "库存单位";
            this.gvMx1inventoryUnit.FieldName = "inventoryUnit";
            this.gvMx1inventoryUnit.MinWidth = 100;
            this.gvMx1inventoryUnit.MinWidth = 80;
            this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
            this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
            this.gvMx1inventoryUnit.Visible = true;
@@ -513,7 +513,7 @@
            this.gvMx1purchaseQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1purchaseQty.Caption = "采购数量";
            this.gvMx1purchaseQty.FieldName = "purchaseQty";
            this.gvMx1purchaseQty.MinWidth = 100;
            this.gvMx1purchaseQty.MinWidth = 80;
            this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
            this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gvMx1purchaseQty.Visible = true;
@@ -526,7 +526,7 @@
            this.gvMx1purchaseUnit.AppearanceCell.Options.UseFont = true;
            this.gvMx1purchaseUnit.Caption = "采购单位";
            this.gvMx1purchaseUnit.FieldName = "cgFname";
            this.gvMx1purchaseUnit.MinWidth = 100;
            this.gvMx1purchaseUnit.MinWidth = 80;
            this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
            this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gvMx1purchaseUnit.Visible = true;
@@ -579,6 +579,9 @@
            // 
            // gvMx1
            // 
            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx1.ColumnPanelRowHeight = 60;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_erpid,
            this.gvMx1salesOrderId,
@@ -645,11 +648,11 @@
            // 
            this.gridColumn1.Caption = "物料名称";
            this.gridColumn1.FieldName = "itemName";
            this.gridColumn1.MinWidth = 100;
            this.gridColumn1.MinWidth = 120;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 100;
            this.gridColumn1.Width = 120;
            // 
            // lb_supplier
            // 
@@ -1542,6 +1545,7 @@
            // 
            // txt_supplier
            // 
            this.txt_supplier.IsReadly = false;
            this.txt_supplier.KeyFile = "";
            this.txt_supplier.Location = new System.Drawing.Point(385, 13);
            this.txt_supplier.Margin = new System.Windows.Forms.Padding(0);