From 3ff3c816c74c077a320c4a9cb3094fb0b9fcc2c5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 16 十一月 2024 15:06:23 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 777eaf2..8f23f1d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -6,7 +6,6 @@
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -297,11 +296,12 @@
var _obj = new MesQmCheckitem
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- ItemId= long.Parse( _ItemId),
+ ItemId = long.Parse(_ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
Isenabled = txt_isenabled.Checked,
- Ftype= "1",
+ Ftype = "1",
+ Fversion =Gs.DevApp.ToolBox.UtilityHelper.ToLong( txt_fversion.Text.Trim()),
list = lst
};
try
@@ -341,7 +341,7 @@
itm.fileValue + "'");
var pgq = new PageQueryModel(curPage, pageSize,
- "create_date", "asc", "", _sbSqlWhere.ToString());
+ "a.create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -573,6 +573,7 @@
foreach (DataRow dr in dt.Rows)
{
rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
+ //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
//string ddddd = dr["SampleSizeName"].ToString();
}
}
@@ -592,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)"
@@ -631,20 +632,55 @@
ComboBoxEdit comboBox = sender as ComboBoxEdit;
if (comboBox != null)
{
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
string _val = _itm.Value.ToString();
string _txt = _itm.Text.ToString();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
- GridView myView = (gcMx1.MainView as GridView);
- int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
- myView.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
- myView.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
+
}
}
-
-
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelMx",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
#endregion
-
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3