From 49bec810586be811fd5e841d0633ce9fb8b1871b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 13 五月 2025 15:56:14 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 218 +++++++++++++++++++++++-------------------------------
1 files changed, 94 insertions(+), 124 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 2d1a967..7e15eca 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,6 +18,7 @@
public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucItem = "";//鐗╂枡
private readonly string _webServiceName = "MesQmCheckitemManager/";
public string strType = "";//iqc type
public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
@@ -38,15 +39,23 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
+ txt_ftype.Text = strType;
if (strType == "iqc")
dfValue = 5;
- this.gvMx1.InitNewRow += (s, e) =>
+ //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
+ if (strType != "ipqc宸℃")
{
- this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
- int newIndex = gvMx1.DataRowCount + 1;
- this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
- };
+ gvMx1.Columns["stationName"].Visible = false;
+ }
+ //鏂拌鍒濆鍊�
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
+ int newIndex = gvMx1.DataRowCount + 1;
+ this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
+ };
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -64,29 +73,22 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
_setIno();
- btnSelect.Click += (s, e) =>
+ btnCopy.Click += (s, e) =>
{
- var frm = new SelectCheckDt("jyxm");
- frm.UpdateParent += (ss, ee) =>
+ if ((lbGuid.Text.Trim().Length < 10))
{
- var lst = ee.DynamicList;
- var json = JsonConvert.SerializeObject(lst);
- DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
- DataTable _oldTable = (DataTable)gridControl2.DataSource;
- DataRow[] sourceRows = _newTable.Select();
- for (int i = 0; i < sourceRows.Length; i++)
- {
- _oldTable.ImportRow(sourceRows[i]);
- }
- gridControl2.BindingContext = new BindingContext();
- gridControl2.DataSource = _oldTable;
- gridControl2.ForceInitialize();
- };
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+ return;
+ }
+ if ((txt_foneChecked.Checked == false))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+ return;
+ }
+ JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
frm.ShowDialog();
};
- btnSave.Click += BtnSave_Click;
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -135,14 +137,16 @@
_filterList = e.FilterList;
getPageList(1);
}
+
/// <summary>
- /// 鎵瑰噯
+ /// 鍙嶅鏍�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- _toolCk(2);
+ _toolCk(0);
}
/// <summary>
@@ -220,7 +224,6 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- gvList.Add(gridView2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
@@ -236,10 +239,8 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
- gridViews.Add(gridView2);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- xtraTabPageCopy.PageEnabled = false;
}
/// <summary>
@@ -350,6 +351,7 @@
FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ stationName = row["stationName"].ToString(),
});
}
}
@@ -360,7 +362,7 @@
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
Ftype = this.strType,
- Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
+ Fversion = 0,
list = lst
};
try
@@ -377,7 +379,6 @@
toolBarMenu1.isSetBtn = true;
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
- gridViews.Add(gridView2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -400,7 +401,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
_sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
@@ -423,7 +424,6 @@
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -442,7 +442,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -453,7 +456,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- xtraTabPageCopy.PageEnabled = !isEdit;
var _obj = new
{
guid = strGuid //涓诲缓
@@ -468,11 +470,12 @@
if (_rtn.rtnCode > 0)
{
var dy = _rtn.rtnData;
+ _ucItem = dy.itemId;
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy,
- isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ _ucItem = "";
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -488,7 +491,6 @@
{
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
- UtilityHelper.SetDefaultTable(gridControl2, gridView2);
}
else
{
@@ -512,6 +514,9 @@
{
case -1:
strMsg = "鍒犻櫎";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
break;
case 1:
strMsg = "瀹℃牳";
@@ -541,23 +546,28 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
+ if (_inFieldValue < 0 && _rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ }
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
- Form parentForm = this.FindForm();
- UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue > 0 ? "1" : "0");
}
- else
- {
- //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
- getPageList(this.pageBar1.CurrentPage);
- int rowHandle = gridView1.LocateByValue("guid", rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
}
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
@@ -573,9 +583,7 @@
string _orgId = txt_fSubsidiary.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_itemId.getSuppler(_orgId);
- //txt_gg.Text ="";
- //txt_itemNo.Text = "";
+ txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
};
txt_itemId.EditChanged += (s, e) =>
{
@@ -589,6 +597,7 @@
_getListJybz();
_getListJssp();
_getListJysp();
+ _getListStation();
}
/// <summary>
/// 璇诲彇妫�楠岄」鐩�
@@ -611,7 +620,32 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇妫�楠屽伐浣�
+ /// </summary>
+ private void _getListStation()
+ {
+ string _where = " and 1=1 and s_type='宸ヤ綅淇℃伅' and pid<>'00000000-0000-0000-0000-000000000000'";
+ var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ //tlMenu.KeyFieldName = "guid";
+ //tlMenu.ParentFieldName = "pid";
+ rptStation.Items.Add(dr["defectName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 璇诲彇妫�楠屽伐鍏�
/// </summary>
@@ -666,8 +700,8 @@
{
rptJSSP.Items.AddRange(new string[] {
"0.010---(AQL_0_0010)"
- , "0.015---(AQL_0_0015)"
- , "0.025---(AQL_0_0025)"
+ ,"0.015---(AQL_0_0015)"
+ ,"0.025---(AQL_0_0025)"
,"0.040---(AQL_0_0040)"
,"0.065---(AQL_0_0065)"
,"0.10---(AQL_0_010)"
@@ -718,6 +752,11 @@
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
}
}
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
@@ -755,74 +794,5 @@
}
}
#endregion
- /// <summary>
- /// 鍒犻櫎澶嶅埗椤�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- gridView2.CloseEditor();
- gridView2.UpdateCurrentRow();
- var rowhandle = gridView2.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gridView2.GetDataRow(rowhandle);
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- gridView2.DeleteRow(rowhandle);
- return;
- }
- }
- /// <summary>
- /// 鎻愪氦鐗╂枡澶嶅埗
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void BtnSave_Click(object sender, EventArgs e)
- {
- int _rows = gridView2.RowCount;
- if (_rows <= 0)
- {
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
- return;
- System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
- for (var i = 0; i < gridView2.DataRowCount; i++)
- {
- var row = gridView2.GetDataRow(i);
- if (_sbGuids.Length > 0)
- _sbGuids.Append(",");
- Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- _sbGuids.Append(_guid.ToString());
- }
- var _obj = new
- {
- sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- itemGuids = _sbGuids.ToString(),
- iqcType = this.strType,
- ypsl = this.dfValue
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.SetDefaultTable(gridControl2, gridView2);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
}
}
\ No newline at end of file
--
Gitblit v1.9.3