From 41e4e091da1149150501f5c07244c44053c0309a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 23 六月 2025 16:15:10 +0800
Subject: [PATCH] 重检方案
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs | 171 ++------------------------------------------------------
1 files changed, 7 insertions(+), 164 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
index 4aa4936..f72c7d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -15,7 +14,6 @@
{
string _webServiceName = "RkqcfaManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
- string _ucGys = "";//渚涘簲鍟�
public Frm_Cqfa()
{
InitializeComponent();
@@ -29,7 +27,6 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -43,47 +40,6 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //閫夋嫨闇�瑕佺殑鏄庣粏
- btnSelect.Click += (s, e) =>
- {
- //if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紒");
- // return;
- //}
- //var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId());
- ////璧嬪�肩粰鏄庣粏琛�
- //frm.UpdateParent += (ss, ee) =>
- //{
- // try
- // {
- // var lst = new List<string>();
- // lst = ee.StringList;
- // var _obj = lst;
- // var strReturn = UtilityHelper.HttpPost("",
- // _webServiceName + "SelectFormTo",
- // JsonConvert.SerializeObject(_obj));
- // var dt = UtilityHelper.ReturnToList(strReturn);
- // DataTable _newTable = dt.rtnData;
- // DataTable _oldTable = (DataTable)gcMx1.DataSource;
- // DataRow[] sourceRows = _newTable.Select();
- // for (int i = 0; i < sourceRows.Length; i++)
- // {
- // _oldTable.ImportRow(sourceRows[i]);
- // }
- // gcMx1.BindingContext = new BindingContext();
- // gcMx1.DataSource = _oldTable;
- // gcMx1.ForceInitialize();
- // gvMx1.BestFitColumns();
- // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- // }
- // catch (Exception ex)
- // {
- // MessageBox.Show(ex.Message);
- // }
- //};
- //frm.ShowDialog();
- };
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -244,12 +200,7 @@
txt_fabm.ReadOnly = true;
txt_fSubsidiary.Enabled = false;
}
- else
- {
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
- }
+
}
/// <summary>
/// 鏂板浜嬩欢
@@ -260,10 +211,6 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_fSubsidiary);
}
@@ -328,39 +275,7 @@
fabm = _fabm.Trim(),
bz = _bz.Trim(),
fSubsidiary = _fSubsidiary.Trim(),
- list = new List<dynamic>(),
};
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- {
- Guid _guid = UtilityHelper.ToGuid(row["id"].ToString());
- string _msl = row["sqNum"].ToString();
- if (string.IsNullOrEmpty(_msl))
- {
- MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
- return;
- }
- string _depotId = row["depotId"].ToString();
- if (string.IsNullOrEmpty(_depotId))
- {
- MsgHelper.ShowError("浠撳簱涓嶈兘涓虹┖锛�");
- return;
- }
- _obj.list.Add(new
- {
- Guid = _guid,
- AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
- Quantity = decimal.Parse(row["sqNum"].ToString()),
- Bz = row["remark"].ToString(),
- DepotId = row["depotId"].ToString(),
- });
- }
- }
try
{
var strJson = UtilityHelper.HttpPost("",
@@ -374,9 +289,7 @@
lbGuid.Text = _rtn.rtnData.outGuid;
txt_fabm.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
@@ -456,31 +369,8 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- _ucGys = dy.suppId;
lbGuid.Text = strGuid;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
- _ucGys = "";
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- }
- else
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -531,9 +421,11 @@
{
MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
else
@@ -544,54 +436,5 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
- /// <summary>
- /// 鍒犻櫎鏄庣粏
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- var rowhandle = gvMx1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx1.GetDataRow(rowhandle);
- var mxGuid = dr["id"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvMx1.DeleteRow(rowhandle);
- return;
- }
- var _obj = new
- {
- guid = lbGuid.Text.Trim(),
- mxGuid = mxGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelOrMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3