From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 203 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 163 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 41a19c8..a32f95e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -41,6 +41,8 @@
toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
@@ -65,49 +67,76 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
- //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- };
- //閫夋嫨棰嗙敤缁勭粐
- txt_qt024.EditChanged += (s, e) =>
- {
- string _orgId = txt_qt024.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
+ ucLookHuoZhu1.SetHzId(_ucHz);
+ _bindLookSearch(txt_qt035.Text.Trim(), "","");
txt_qt013.getSuppler(_orgId, _ucKh);
- txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_qt009.getSuppler(_orgId, _ucBm, " len(a.departmentcode)>2 ");
txt_wwgys.getSuppler(_orgId, _ucGys);
};
+ //閫夋嫨棰嗙敤缁勭粐2025骞�-10-24宸茶绂佺敤锛屼负鑰冭檻鎬ц兘锛屽垹闄�
+ //txt_qt024.EditChanged += (s, e) =>
+ //{
+ // string _orgId = txt_qt024.GetId();
+ // if (string.IsNullOrEmpty(_orgId))
+ // return;
+ // txt_qt013.getSuppler(_orgId, _ucKh);
+ // txt_qt009.getSuppler(_orgId, _ucBm);
+ // txt_wwgys.getSuppler(_orgId, _ucGys);
+ //};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
{
- string strSrmNo = "";
- SelectDaa frm = new SelectDaa();
+ string _orgId = txt_qt023.GetId();
+ SelectDaa frm = new SelectDaa(_orgId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
- strSrmNo = lst[0].guid;
+ string strSrmNo = lst[0].guid;
+ string strGdlx = lst[0].gdlx;
+ string strGdlxWlid = lst[0].gdlxWlid;
txt_qt035.Text = strSrmNo;
+ _bindLookSearch(txt_qt035.Text.Trim(), strGdlx, strGdlxWlid);
+ #region 閫夋嫨宸ュ崟鍚庡甫鍑轰笅闈㈢殑鐗╂枡 2025-09-27
+ //try
+ //{
+ // var _obj = new
+ // {
+ // strDaaNo = strSrmNo,//涓诲缓
+ // };
+ // var strReturn = UtilityHelper.HttpPost("",
+ // "WomdaaManager/SelectDaaMx",
+ // JsonConvert.SerializeObject(_obj));
+ // var dt = UtilityHelper.ReturnToList(strReturn);
+ // DataTable _newTable = dt.rtnData;
+ // DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ // foreach (DataRow dddddd in _newTable.Rows)
+ // {
+ // DataRow _row = _oldTable.NewRow();
+ // _row["qd002"] = dddddd["itemNo"].ToString();
+ // _row["qd003"] = dddddd["itemName"].ToString();
+ // _row["qd004"] = dddddd["itemModel"].ToString();
+ // _row["qd009dw"] = dddddd["dwName"].ToString();
+ // _row["itemId"] = dddddd["itemId"].ToString();
+ // _row["depotName"] = dddddd["depotName"].ToString();
+ // _row["depotId"] = dddddd["depotId"].ToString();
+ // _row["kcQty"] = dddddd["kcQty"].ToString();
+ // _oldTable.Rows.Add(_row);
+ // }
+ // gcMx1.BindingContext = new BindingContext();
+ // gcMx1.DataSource = _oldTable;
+ // gcMx1.ForceInitialize();
+ // gvMx1.BestFitColumns();
+ // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show(ex.Message);
+ //}
+ #endregion
};
frm.ShowDialog();
};
-
#region 2025-08-27 澶嶅埗beg
btnCopyXls.Click += (s, e) =>
{
@@ -181,6 +210,62 @@
}
};
#endregion
+ }
+
+
+
+ /// <summary>
+ /// 鏉ユ簮鏄庣粏闄愬埗锛�
+ /// </summary>
+ /// <param name="strGdlx">宸ュ崟绫诲瀷锛屽鏋滄槸缁翠慨锛屾牴鎹墿鏂欐壘</param>
+ private void _bindLookSearch(string daaNo, string strGdlx,string gdlxWlid)
+ {
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + txt_qt023.GetId() + "'");
+ if (daaNo.Trim().Length > 0)
+ {
+ if (strGdlx == "W-缁翠慨杩斿伐" || strGdlx == "C-鎷嗘満杩斿伐")
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAA daa left join WOMDAB dab on daa.guid=dab.daaGuid ");
+ sbWhere.Append(" where daa.guid=( select top 1 ddddd.guid as dddddGuid from WOMDAA ddddd where ddddd.daa002='"+ gdlxWlid + "' and ddddd.daa025 in('F-閲忎骇','S-璇曚骇') order by ddddd.daa001 desc )");
+ sbWhere.Append(" )");
+ }
+ else {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAB dab where dab.dab001 = '" + txt_qt035.Text.Trim() + "'");
+ sbWhere.Append(" )");
+ }
+ }
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = rtn.rtnData.list;
+ //濡傛灉娌℃湁锛屽啀璇讳竴閬�
+ if (dt == null || dt.Rows.Count <= 1)
+ {
+ _bindLookSearch("","", "");
+ }
+ else
+ {
+ this.gridView2.IndicatorWidth = 60;
+ this.gridView2.CustomDrawRowIndicator += (ss, ee) =>
+ {
+ if (ee.Info.IsRowIndicator && ee.RowHandle >= 0)
+ ee.Info.DisplayText = (ee.RowHandle + 1).ToString();
+ };
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -341,7 +426,7 @@
}
//2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
txt_qt023.IsReadly = true;
- txt_qt024.IsReadly = true;
+ //txt_qt024.IsReadly = true;
ucLookHuoZhu1.Enabled = false;
}
/// <summary>
@@ -360,7 +445,7 @@
ucLookHuoZhu1.Enabled = true;
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
- string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
+ //string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -375,7 +460,8 @@
string inHz = ucLookHuoZhu1.GetHzId();//璐т富
string inRkyy = txt_qt010.Text.Trim();//鍘熷洜
string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷
- string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ // string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ string inLyOrg = inOrgId;//棰嗙敤缁勭粐绛変簬搴撳瓨缁勭粐
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
@@ -397,12 +483,12 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (string.IsNullOrEmpty(inLyOrg))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
- txt_qt024.Focus();
- return;
- }
+ //if (string.IsNullOrEmpty(inLyOrg))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
+ // txt_qt024.Focus();
+ // return;
+ //}
if (txt_qtlx.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍑哄簱绫诲瀷锛�");
@@ -595,6 +681,10 @@
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
_ucGys = dy.wwgys;//濮斿渚涘簲鍟�
+ // ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -634,7 +724,16 @@
}
}
-
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -733,6 +832,9 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
case 20:
strMsg = "鍞悗瀹℃牳";
break;
@@ -791,7 +893,6 @@
int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
}
-
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -903,5 +1004,27 @@
};
frm.ShowDialog();
}
+
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_QTCK{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3