From f924cbebf1695c6323c1ed38f418dccd288fe1b9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 06 十一月 2024 14:45:27 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 278 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 191 insertions(+), 87 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index c9e591c..7737a7c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,21 +1,13 @@
-using DevExpress.DataAccess.Wizard.Model;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraLayout.Customization;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
+using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.Drawing;
-using System.IO;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -37,7 +29,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ gcMx1.MouseClick += GcMx1_MouseClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -54,33 +46,104 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
- //涓婁紶闄勪欢
- btnUpSelect.Click += BtnUpSelect_Click;
- btnUp.Click += BtnUp_Click;
- //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
gvMx2.OptionsFind.ShowSearchNavButtons = false;
gvMx2.OptionsView.ShowGroupPanel = false;
- _setIno();
+ gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ gvMx3.OptionsView.ShowGroupPanel = false;
+ txt_itemId.KeyFile = "id";
+ txt_itemId.EditChanged += (s, e) =>
+ {
+ txt_itemModel.Text = this.txt_itemId.GetModel();
+ txt_itemNo.Text = this.txt_itemId.GetCode();
+ };
txtJianYan.KeyDown += TxtJianYan_KeyDown;
this.btnLoad.Click += BtnLoad_Click;
+ ucUpFile1.UpChanged += UcUpFile1_UpChanged;
+ xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
}
+ private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ {
+ string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ getList12(rowGuid);
+ }
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇妫�楠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void BtnLoad_Click(object sender, EventArgs e)
{
if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛�"))
return;
+ string strGuid = lbGuid.Text.Trim();
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
-
+ /// <summary>
+ /// 杈撳叆妫�楠屼簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
{
+ int intHandle = this.gvMx1.FocusedRowHandle;
+ if (intHandle < 0)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
+ return;
+ }
if (e.KeyCode == Keys.Enter)
{
+ string guid5 = this.gvMx1.GetDataRow(intHandle)["guid"].ToString();
string _strCmd = txtJianYan.Text.Trim().ToUpper();
string _strOK = "OK";
string _strNG = "NG";
if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
return;
}
if (!_strCmd.Contains("-"))
@@ -104,7 +167,6 @@
int n;
if (int.TryParse(_str2, out n))
{
-
}
else
{
@@ -115,6 +177,35 @@
{
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;
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EdtModelDetail12",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -160,6 +251,11 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ /// <summary>
+ /// 鏃ュ織浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
@@ -169,7 +265,7 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
- /// 妫�楠�
+ ///妫�楠屼簨浠�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -182,7 +278,7 @@
lbGuid, txt_releaseNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -384,6 +480,8 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ ucUpFile1.parentGuid = lbGuid.Text.Trim();
+ getList12(dt.Rows[0]["guid"].ToString());
}
else
{
@@ -399,103 +497,69 @@
}
}
-
-
- #region 鏂囦欢涓婁紶
-
+
/// <summary>
- /// 閫夋嫨涓婁紶鏂囦欢
+ /// 閫夐」鍗″垏鎹�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void BtnUpSelect_Click(object sender, EventArgs e)
+ private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
{
- var openFileDialog = new OpenFileDialog();
- // 璁剧疆鍒濆鐩綍
- openFileDialog.InitialDirectory = "c:\\";
- // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
- // 璁剧疆鏍囬
- openFileDialog.Title = "閫夋嫨鏂囦欢";
- // 鏄剧ず瀵硅瘽妗�
- var result = openFileDialog.ShowDialog();
- // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔
- if (result == DialogResult.OK)
+ if (e.Page.Name == "xtraTabPage3")
{
- // 鑾峰彇閫変腑鐨勬枃浠惰矾寰�
- var filePath = openFileDialog.FileName;
- Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}");
- txtUpUrl.Text = filePath;
+ getFileList();
}
}
-
/// <summary>
- /// 纭畾涓婁紶
+ /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
+ private void UcUpFile1_UpChanged(object sender, EventArgs e)
{
- var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
- var address = WebApiUrl + "Upload/UploadFile";
- var filePath = txtUpUrl.Text.Trim();
- var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃
- await UploadFileAsync(apiUrl, filePath);
+ getFileList();
}
-
- private async Task UploadFileAsync(string url, string filePath)
+ private void getFileList()
{
- UcLoading _loading = new UcLoading();
- using (var httpClient = new HttpClient())
- using (var form = new MultipartFormDataContent())
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and parent_Guid='" + lbGuid.Text.Trim() + "'");
+ PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
{
- httpClient.DefaultRequestHeaders.Add("token",
- UtilityHelper.GetBasicAuthTicket());
- using (var fs = File.OpenRead(filePath))
- using (var streamContent = new StreamContent(fs))
+ string strReturn = UtilityHelper.HttpPost("", "MesFile/GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
{
- form.Add(streamContent, "file", Path.GetFileName(filePath));
- var response = await httpClient.PostAsync(url, form);
- var responseString =
- await response.Content.ReadAsStringAsync();
- MessageBox.Show(responseString);
+ DataTable dt = dd.rtnData.list;
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt;
+ gcMx3.ForceInitialize();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
}
}
- _loading.Close();
- }
-
- #endregion
-
- private void _setIno()
- {
- txt_itemId.KeyFile = "id";
- txt_itemId.EditChanged += (s, e) =>
+ catch (Exception ex)
{
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
- };
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
- /// 璇诲彇妫�楠岀粨鏋�
+ /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ /// <param name="guid5"></param>
+ private void getList12(string guid5)
{
- var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
- if (myDataRow == null) return;
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- guid = UtilityHelper.ToGuid(myDataRow["guid"].ToString()), //涓诲缓
- //id = myDataRow["id"].ToString(),
- id = -1,
- checkQyt = myDataRow["checkQyt"].ToString(),
- chkItem = myDataRow["fcheckItem"].ToString()
+ guid = UtilityHelper.ToGuid(guid5), //涓诲缓
};
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList12", JsonConvert.SerializeObject(_obj));
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -507,5 +571,45 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx3.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + "寮�鍙戜腑");
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3