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 | 483 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 399 insertions(+), 84 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 7c093f1..a32f95e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -18,9 +19,9 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
string _ucKh = "";//棰嗘枡瀹㈡埛
string _ucBm = "";//棰嗘枡閮ㄩ棬
- string _ucCk = "";//鍙戞枡浠撳簱
string _ucHzlx = "";//璐т富绫诲瀷
string _ucHz = "";//璐т富
+ string _ucGys = "";//渚涘簲鍟�
public Frm_MesItemQt()
{
InitializeComponent();
@@ -40,7 +41,9 @@
toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
- this.toolBarMenu1.getXmlConfig();
+ 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) =>
{
@@ -64,35 +67,206 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
- txt_qt008.getSuppler(_orgId, _ucCk);
- 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;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + 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 _orgId = txt_qt023.GetId();
+ SelectDaa frm = new SelectDaa(_orgId);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ 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) =>
+ {
+ string kcZz = txt_qt023.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨搴撳瓨缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_qt023.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍑哄簱.ToString());
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["qd002"] = dym.itemNo;
+ _row["qd003"] = dym.itemName;
+ _row["qd004"] = dym.itemModel;
+ _row["qd009dw"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["qd007"] = dym.sl;
+ _row["qd010"] = dym.bz;
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ _row["depotName"] = dym.depotName;
+ _row["depotId"] = dym.depotId;
+ _row["kcQty"] = dym.kcQty;
+ _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
+ #region 2025-08-27 澧炲姞濮斿渚涘簲鍟�
+ txt_qtlx.SelectedIndexChanged += (s, e) =>
+ {
+ int idx = txt_qtlx.SelectedIndex;
+ if (idx == 7)
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ }
+ else
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ txt_wwgys.SetIdOrCode("");
+ }
+ };
+ #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)
{
@@ -168,7 +342,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -186,17 +360,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -233,7 +409,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -248,6 +424,10 @@
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
ucLookHuoZhu1.Enabled = true;
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_qt023.IsReadly = true;
+ //txt_qt024.IsReadly = true;
+ ucLookHuoZhu1.Enabled = false;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -263,6 +443,9 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
+ //string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -277,55 +460,68 @@
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();//搴撳瓨鏂瑰悜
- string inFlck = txt_qt008.GetId();//鍙戞枡浠撳簱
+ string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
+ string wwgys = txt_wwgys.GetId();
if (string.IsNullOrEmpty(inOrgId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
txt_qt023.Focus();
return;
}
if (string.IsNullOrEmpty(inHzlx))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富绫诲瀷锛�");
return;
}
if (string.IsNullOrEmpty(inHz))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (txt_qt019.SelectedIndex <= 0)
+ //if (string.IsNullOrEmpty(inLyOrg))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
+ // txt_qt024.Focus();
+ // return;
+ //}
+ if (txt_qtlx.SelectedIndex <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍑哄簱绫诲瀷锛�");
+ txt_qtlx.Focus();
return;
}
- if (string.IsNullOrEmpty(inFlck))
+ //杩欐槸闈炲澶栫殑闃插憜
+ if (txt_qtlx.SelectedIndex != 7)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
- txt_qt008.Focus();
- return;
+ if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓嶄负銆�7:鏃犳簮鍗曞澶栭��鏂欍��,璇蜂笉瑕侀�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
}
- if (string.IsNullOrEmpty(inLyOrg))
+ //杩欐槸濮斿鐨勯槻鍛�
+ if (txt_qtlx.SelectedIndex == 7)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨棰嗙敤缁勭粐锛�");
- txt_qt024.Focus();
- return;
- }
- if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
- return;
- }
- if (txt_qt020.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
- txt_qt020.Focus();
- return;
+ if (string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,璇烽�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(inLyCus))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,涓嶇敤閫夋嫨瀹㈡埛锛�");
+ return;
+ }
}
var _obj = new
{
@@ -339,7 +535,9 @@
inLyCus = inLyCus,//棰嗙敤瀹㈡埛
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
- inFlck = inFlck,//鍙戞枡浠撳簱
+ inSource = txt_qt035.EditValue,//宸ュ崟鍙�
+ qtlx = qtlx,
+ wwgys = wwgys,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -362,12 +560,19 @@
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ string _depotId = row["depotId"].ToString();
+ if (string.IsNullOrEmpty(_depotId))
+ {
+ MsgHelper.ShowError("浠撳簱涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
ItemId = (row["itemId"].ToString()),
Sqsl = (row["qd007"].ToString()),
Bz = (row["qd010"].ToString()),
+ DepotId = row["depotId"].ToString(),
});
}
}
@@ -375,9 +580,9 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_qtck.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -388,10 +593,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -402,7 +609,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.qt023 in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -418,7 +629,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -438,6 +650,11 @@
}
}
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -445,7 +662,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -461,18 +678,22 @@
dynamic dy = _rtn.rtnData;
_ucKh = dy.qt013;
_ucBm = dy.qt009;
- _ucCk = dy.qt008;
_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);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
_ucKh = "";
_ucBm = "";
- _ucCk = "";
_ucHzlx = "";
_ucHz = "";
+ _ucGys = "";
ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -495,15 +716,24 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <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>
@@ -586,7 +816,7 @@
{
_toolCk(41);
}
-
+
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
@@ -601,6 +831,9 @@
break;
case 0:
strMsg = "鍙嶅鏍�";
+ break;
+ case 2:
+ strMsg = "瀹岀粨";
break;
case 20:
strMsg = "鍞悗瀹℃牳";
@@ -620,18 +853,18 @@
case 41:
strMsg = "閲囪喘鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
var _obj = new
{
guid = rowGuid,
@@ -643,23 +876,31 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
@@ -668,10 +909,24 @@
gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("qd009dw", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
- }
+ gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
+ gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
+ gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
+
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ /// <summary>
+ /// 鍒犻櫎鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -701,15 +956,75 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
+
+ /// <summary>
+ /// 鏌ユ壘浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ if (string.IsNullOrEmpty(strItemId))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ return;
+ }
+ var strOrgGuid = txt_qt023.GetId();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨搴撳瓨缁勭粐锛�");
+ return;
+ }
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
+ gvMx1.BestFitColumns();
+ };
+ 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