From 7e2fe692d16412e0c20a433a81cb85a3cb39cb2b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 30 八月 2025 17:07:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 94 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 9d8b002..b73c4f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -25,6 +26,7 @@
public Frm_MesItemQtrk()
{
InitializeComponent();
+ split99.PanelVisibility = SplitPanelVisibility.Panel2;
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -182,7 +184,58 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
-
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_qt022.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨搴撳瓨缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_qt022.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍏ュ簱.ToString(), txt_qt022.GetId());
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ MessageBox.Show(lst.Count.ToString());
+ //DataTable _Table = (DataTable)gcMx1.DataSource;
+ //foreach (dynamic dym in lst)
+ //{
+ // DataRow _row = _Table.NewRow();
+ // _row["fSeq"] = dym.fSeq;
+ // _row["statStatus"] = "Y-鏄�";
+ // _row["collectionName"] = "绌�";
+ // _row["processNo"] = dym.processNo;
+ // _row["processName"] = dym.processName;
+ // _Table.Rows.Add(_row);
+ //}
+ //gcMx1.BindingContext = new BindingContext();
+ //gcMx1.DataSource = _Table;
+ //gcMx1.ForceInitialize();
+ //gvMx1.CloseEditor();
+ //gvMx1.PostEditor();
+ //gvMx1.UpdateCurrentRow();
+ //gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -384,6 +437,7 @@
string inHz = ucLookHuoZhu1.GetHzId();//璐т富
string inRkyy = txt_qt010.Text.Trim();//鍏ュ簱鍘熷洜
string kcCk = txt_qt008.GetId();//浠撳簱
+ string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
if (string.IsNullOrEmpty(kcZz))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -406,10 +460,10 @@
txt_qt003.Focus();
return;
}
- if (txt_qt019.SelectedIndex <= 0)
+ if (txt_qtlx.SelectedIndex <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
- txt_qt019.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍏ュ簱绫诲瀷锛�");
+ txt_qtlx.Focus();
return;
}
if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
@@ -418,12 +472,12 @@
txt_qt009.Focus();
return;
}
- //if (string.IsNullOrEmpty(kcCk))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�");
- // txt_qt008.Focus();
- // return;
- //}
+ if (string.IsNullOrEmpty(kcCk))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鏀舵枡浠撳簱锛乗n濡傛灉涓嶆槸銆愭姤搴熶粨銆戯紒\nQC鍙互閲嶆柊璁剧疆浠撳簱锛�");
+ txt_qt008.Focus();
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -437,6 +491,7 @@
hzlx = inHzlx,//璐т富绫诲瀷
inHz = inHz,//璐т富
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
+ qtlx = qtlx,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -502,7 +557,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.qt022 in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -543,6 +602,7 @@
/// <param name="strGuid"></param>
private void getModel(string strGuid)
{
+
gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
@@ -616,6 +676,11 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
+
+ if (txt_isIqc.Checked)
+ split99.PanelVisibility = SplitPanelVisibility.Panel2;
+ else
+ split99.PanelVisibility = SplitPanelVisibility.Both;
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -677,7 +742,7 @@
getModel(lbGuid.Text);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -797,7 +862,7 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
@@ -839,7 +904,8 @@
foreach (dynamic dym in lst)
{
if (stringBuilder.Length > 0)
- stringBuilder.Append("|");
+ // stringBuilder.Append("|");//|鍜寏宸茶鍗犵敤
+ stringBuilder.Append("&");
stringBuilder.Append(dym.dicTxt);
}
gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString());
--
Gitblit v1.9.3