From b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:19:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs | 193 ++++++++----------------------------------------
1 files changed, 33 insertions(+), 160 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
index 57a80c4..e7f4fa1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -1,8 +1,6 @@
-锘縰sing DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -15,116 +13,21 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
- private string strType = "";//iqc,ipqc,fqc
- private string sourceGuid = "";//婧恎uid
+ public string strType = "";//iqc type
/// <summary>
///
/// </summary>
/// <param name="_sourceGuid"></param>
/// <param name="_strType"></param>
- public JyxmShow(string _sourceGuid, string _strType)
+ public JyxmShow(string strType)
{
InitializeComponent();
- strType = _strType;
- sourceGuid = _sourceGuid;
- this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
- this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); };
- this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.colChkInt.OptionsFilter.AllowAutoFilter = false;
- this.colChkInt.OptionsFilter.AllowFilter = false;
- this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
- this.pageBar1.setBar(false);
+ this.strType = strType;
+ this.Text = "閫夋嫨鐗╂枡-" + strType;
getPageList(1);
- getModel(_sourceGuid);
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMainCopy);
- UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
- btnIn.Click += (s, e) =>
- {
- gvMain.PostEditor();
- gvMain.UpdateCurrentRow();
- var list = new List<string>();
- DataTable _oldTable = (DataTable)gcMainCopy.DataSource;
- DataTable dt = this.gcMain.DataSource as DataTable;
- {
- foreach (DataRow dr in dt.Rows)
- {
- string checkBox = dr["chkInt"].ToString();
- if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
- {
- _oldTable.ImportRow(dr);
- }
- }
- }
- if (_oldTable.Rows.Count <= 0)
- {
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
- return;
- }
- gcMainCopy.BindingContext = new BindingContext();
- gcMainCopy.DataSource = _oldTable;
- gcMainCopy.ForceInitialize();
- gvMainCopy.BestFitColumns();
- };
- this.wizardControl1.FinishClick += (s, e) =>
- {
- int _rows = gvMainCopy.RowCount;
- if (_rows <= 0)
- {
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
- e.Cancel = true;
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
- {
- e.Cancel = true;
- return;
- }
- System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
- for (var i = 0; i < gvMainCopy.DataRowCount; i++)
- {
- var row = gvMainCopy.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(sourceGuid),
- itemGuids = _sbGuids.ToString(),
- iqcType = this.strType,
- };
- 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(gcMainCopy, gvMainCopy);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- };
- this.wizardControl1.NextClick += (s, e) =>
- {
- string pageText = e.Page.Text;
- if (pageText == "閫夋嫨鐗╂枡")
- {
- int _rows = gvMainCopy.RowCount;
- if (_rows <= 0)
- {
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
- e.Handled = true;
- return;
- }
- }
- };
+
}
#region 婧愮墿鏂欐暟鎹粦瀹�
@@ -152,9 +55,8 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;
+ gcMain.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and q.guid is null";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
try
@@ -192,73 +94,44 @@
#endregion
- private void getModel(string strGuid)
- {
- var _obj = new
- {
- guid = strGuid //涓诲缓
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn =
- UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- var dy = _rtn.rtnData;
- var gvList = new List<GridView>();
- gvList.Add(gvMx1);
- var _job = JObject.Parse(strJson);
- var array = new JArray();
- foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
- }
- else
- {
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
- UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
- }
- else
- {
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
/// <summary>
- /// 鍒犻櫎澶嶅埗椤�
+ /// 纭畾閫夋嫨
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void rptBtnDel_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- gvMainCopy.CloseEditor();
- gvMainCopy.UpdateCurrentRow();
- var rowhandle = gvMainCopy.FocusedRowHandle;
+ var rowhandle = gvMain.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
- var dr = gvMainCopy.GetDataRow(rowhandle);
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ var dr = gvMain.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
return;
- gvMainCopy.DeleteRow(rowhandle);
- return;
+ }
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = dr["guid"].ToString(),
+ itemId = dr["id"].ToString(),
+ itemName = dr["itemName"].ToString(),
+ itemNo = dr["itemNo"].ToString(),
+ itemModel = dr["itemModel"].ToString(),
+ fSubsidiary= dr["fSubsidiary"].ToString(),
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
}
}
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3