Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-22 a985c4d4b80fbf3eb4abbe385adcd0536fd29eda

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

@@ -4,6 +4,7 @@
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
@@ -34,6 +35,10 @@
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            gridView1.FocusedRowChanged += (s, e) =>
            {
                UtilityHelper.SetCheckIco(s, picCheckBox, this, "foneChecked", "");
            };
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -263,7 +268,7 @@
        {
            toolBarMenu1.isSetBtn = false;
            string _ItemId = txt_ItemId.GetId()
;          if (string.IsNullOrEmpty(_ItemId))
; if (string.IsNullOrEmpty(_ItemId))
            {
                MsgHelper.Warning("请选择物料！");
                txt_ItemId.Focus();
@@ -287,7 +292,7 @@
                        Fstand = row["Fstand"].ToString(),
                        FacLevel = row["FacLevel"].ToString(),
                        FspecRequ = row["FspecRequ"].ToString(),
                        Memo  = row["memo"].ToString(),
                        Memo = row["memo"].ToString(),
                        FupAllow = row["FupAllow"].ToString(),
                        FdownAllow = row["FdownAllow"].ToString(),
                    });
@@ -301,7 +306,7 @@
                ItemNo = txt_itemNo.Text.Trim(),
                Isenabled = txt_isenabled.Checked,
                Ftype = "1",
                Fversion =Gs.DevApp.ToolBox.UtilityHelper.ToLong( txt_fversion.Text.Trim()),
                Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
                list = lst
            };
            try
@@ -346,7 +351,7 @@
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                  //  _webServiceName + "GetListPageIQC", json);
                //  _webServiceName + "GetListPageIQC", json);
                _webServiceName + "GetListPage", json);
                var dd =
                    UtilityHelper.ReturnToTablePage(strReturn);
@@ -390,7 +395,7 @@
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                   // _webServiceName + "GetModelIQC",
                         // _webServiceName + "GetModelIQC",
                         _webServiceName + "GetModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
@@ -593,7 +598,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)"
@@ -641,7 +646,7 @@
                gvMx1.UpdateCurrentRow();
                gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
                gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
              

            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)