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/Sales/Frm_SalesReturnNotice.cs | 612 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 496 insertions(+), 116 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 2aeade1..15210d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,4 +1,5 @@
-using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -16,6 +17,9 @@
{
string _webServiceName = "SalesReturnManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucCk = "";//浠撳簱
+ string _ucKh = "";//瀹㈡埛
+ string _ucBm = "";//閮ㄩ棬
public Frm_SalesReturnNotice()
{
InitializeComponent();
@@ -29,89 +33,336 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- // 璁剧疆閿�鍞崟
- txt_customerOrderNo.getSuppler("", "");
- this.txt_customerOrderNo.EditChanged += (s, e) =>
+ #region 鎵撳嵃鐩稿叧
+ //棰勮鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- //鏈夋病鏈夐攢鍞鍗�
- string _sqGuid = txt_customerOrderNo.GetId();
- if (string.IsNullOrEmpty(_sqGuid))
+ _print(0);
+ };
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbMxGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.閿�鍞��璐у叆搴撴.ToString());
+ string strCodeList = "";
+ string strAction = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ strAction = ee.Data;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
return;
- txt_returnCustomer.Text = txt_customerOrderNo.GetSalesCusName();
- txt_salesOrg.Text = txt_customerOrderNo.GetSalesOrgName();
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
- var json = JsonConvert.SerializeObject(_obj);
- try
+ if (strAction == "print")
{
- var strReturn = UtilityHelper.HttpPost("",
- "SalesManager/SelectFormFhMx", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ try
+ {
+ string rptParameter = "rpt_Xsth{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ };
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
};
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
+ //鎵撳嵃鑷姩璁＄畻
+ txt_psnQty_1.TextChanged += (s, e) =>
{
- ucBtnPrint1.rptParameter = "rpt_Xsth{}";
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
- this.ucBtnPrint1.btnReportClick += (s, e) =>
+ radOut.SelectedIndexChanged += (s, e) =>
{
- ucBtnPrint1.guidKey = "";
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
+ };
+ //鍏ㄩ儴鎵撳嵃
+ ucBtnPrintAll1.btnPrintClick += (s, e) =>
+ {
+ this.ucBtnPrintAll1.rptType = "";
+ this.ucBtnPrintAll1.mxList = null;
+ if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
+ MsgHelper.ShowError("鎻愮ず锛氭墦鍗板墠璇峰厛淇濆瓨鍗曟嵁锛�");
return;
}
- if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ getModel(lbGuid.Text.Trim());
+ List<dynamic> lst = new List<dynamic>();
+ DataTable dt = (DataTable)gcMx1.DataSource;
+ foreach (DataRow row in dt.Rows)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
+ string guid = row["guid"].ToString();
+ string psnQty = row["kdy"].ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ lst.Add(new
+ {
+ guid = guid,
+ kdy = psnQty,
+ });
+ }
+ if (lst.Count <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐨勭墿鏂欙紒");
return;
}
- if (lbMxGuid.Text.Trim().Length < 10)
+ this.ucBtnPrintAll1.rptType = "rpt_Xsth";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
+ #endregion
+ //閿�鍞粍缁�
+ txt_salesOrg.EditChanged += (s, e) =>
+ {
+ var orgId = txt_salesOrg.GetId();
+ if (string.IsNullOrEmpty(orgId))
+ return;
+ txt_fstockid.getSuppler(orgId, _ucCk);
+ txt_inventoryOrg.SetIdOrCode(orgId);
+ txt_salesDept.getSuppler(orgId, _ucBm);
+ txt_returnCustomer.getSuppler(orgId, _ucKh);
+ };
+ //閿�鍞儴闂�
+ txt_salesDept.EditChanged += (s, e) =>
+ {
+ var dptId = txt_salesDept.GetId();
+ if (string.IsNullOrEmpty(dptId))
+ return;
+ txt_saleDeptName.Text = (txt_salesDept.GetName());
+ };
+ //閫夋嫨闇�瑕佺殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_salesOrg.GetId()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨閿�鍞粍缁囷紒");
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + ""
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
+ if (string.IsNullOrEmpty(this.txt_returnCustomer.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨瀹㈡埛锛�");
+ return;
+ }
+ if (txt_fHasLinkRad.SelectedIndex == 0)
+ {
+ //鏈夋簮鍗曚箣閿�鍞嚭搴撳崟
+ if (txt_fHasLinkSource.SelectedIndex == 0)
+ {
+ var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["guid"] = dym.guid;
+ _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+ _row["itemId"] = dym.itemId;
+ _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+ _row["itemName"] = dym.itemName; //鐗╂枡鍚嶇О,
+ _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+ _row["xxDw"] = dym.xxDw;
+ _row["salesQuantity"] = dym.salesQuantity;
+ _row["isFreeChk"] = dym.isFreeChk;
+ _row["fhQuantity"] = dym.fhQuantity;
+ gvMx1.UpdateCurrentRow();
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ return;
+ }
+ //鏈夋簮鍗曚箣閿�鍞崟
+ else
+ {
+ var frm = new Frm_SalesReturnNoticeSelect2(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["guid"] = dym.guid;
+ _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+ _row["itemId"] = dym.itemId;
+ _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+ _row["itemName"] = dym.itemName; //鐗╂枡鍚嶇О,
+ _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+ _row["xxDw"] = dym.xxDw;
+ _row["salesQuantity"] = dym.salesQuantity;
+ _row["isFreeChk"] = dym.isFreeChk;
+ _row["fhQuantity"] = dym.fhQuantity;
+ gvMx1.UpdateCurrentRow();
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ return;
+ }
+ }
+ if (txt_fHasLinkRad.SelectedIndex == 1)
+ {
+ var frm2 = new Frm_SalesReturnNoticeSelectLink(this.txt_salesOrg.GetId());
+ frm2.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["guid"] = dym.guid;
+ _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+ _row["itemId"] = dym.itemId;
+ _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+ _row["itemName"] = dym.itemName; //鐗╂枡鍚嶇О,
+ _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+ _row["xxDw"] = dym.xxDw;
+ _row["salesQuantity"] = dym.salesQuantity;
+ _row["isFreeChk"] = dym.isFreeChk;
+ _row["fhQuantity"] = dym.fhQuantity;
+ gvMx1.UpdateCurrentRow();
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm2.ShowDialog();
+ return;
+ }
+ };
+ //婧愬崟浜嬩欢
+ txt_fHasLinkRad.SelectedIndex = 0;
+ setSrm();
+ txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
+ {
+ setSrm();
};
}
-
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type)
+ {
+ string rowGuid = lbMxGuid.Text.Trim();
+ ucBtnPrint1.guidKey = rowGuid;
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (lbMxGuid.Text.Trim().Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint1.rptParameter = "rpt_Xsth{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ + "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -134,7 +385,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -171,7 +422,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -189,18 +440,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)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -238,20 +490,28 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billno");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ setSrm();
+ txt_salesOrg.IsReadly = true;
+ txt_inventoryOrg.IsReadly = true;
+ txt_fHasLinkRad.ReadOnly = true;
+ txt_fHasLinkSource.ReadOnly = true;
+ txt_returnCustomer.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -264,9 +524,14 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ gridViews.Add(gvMx2);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_salesOrg);
+ string deftXqOrg = UtilityHelper.GetFirstOrg(txt_inventoryOrg);
+ setSrm();
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -276,30 +541,86 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string djlx = txt_billType.Text.ToString();
- string FNote = txt_returnReason.Text.ToString();
- string _sqGuid = txt_customerOrderNo.GetId();
- if (string.IsNullOrEmpty(_sqGuid))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
- txt_customerOrderNo.Focus();
- return;
- }
+ string _djlx = txt_billType.Text.ToString();
+ string _FNote = txt_returnReason.Text.ToString();
+ string _ckId = txt_fstockid.GetId();
+ int _FIsLink = txt_fHasLinkRad.SelectedIndex;
+ //涓嬮潰鏄棤婧愬崟鐢ㄥ埌鐨�
+ string _salesOrg = txt_salesOrg.GetId();
+ string _inventoryOrg = txt_inventoryOrg.GetId();
+ string _returnCustomer = txt_returnCustomer.GetId().ToString();
+ string _salesDept = txt_salesDept.GetId();
+ string _xsms = txt_xsms.Text.ToString();
if (txt_billType.SelectedIndex < 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
txt_billType.Focus();
return;
+ }
+ if (_FIsLink < 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨婧愬崟绫诲瀷锛�");
+ txt_fHasLinkRad.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_salesOrg))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞粍缁囷紒");
+ txt_salesOrg.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_returnCustomer))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�");
+ txt_returnCustomer.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_ckId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
+ txt_fstockid.Focus();
+ return;
+ }
+ //杩欐棤婧愮被鍨嬬殑妫�楠宐eg
+ if (_FIsLink == 1)
+ {
+ if (string.IsNullOrEmpty(_inventoryOrg))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀛樼粍缁囷紒");
+ txt_inventoryOrg.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_salesDept))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閮ㄩ棬锛�");
+ txt_salesDept.Focus();
+ return;
+ }
+ if (txt_xsms.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞ā寮忥紒");
+ txt_xsms.Focus();
+ return;
+ }
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- djlx = djlx,//鍗曟嵁绫诲瀷
- salesId = _sqGuid,//閿�鍞崟鍙�
- inRemark = FNote.Trim(),//澶囨敞
+ djlx = _djlx,//鍗曟嵁绫诲瀷
+ inRemark = _FNote.Trim(),//澶囨敞
+ ckId = _ckId,
+ fIsLink = txt_fHasLinkRad.SelectedIndex,
+ fHasLinkSource = txt_fHasLinkSource.Text.Trim(),
+ //涓嬮潰鏄棤婧愮殑
+ salesOrg = _salesOrg,
+ inventoryOrg = _inventoryOrg,
+ returnCustomer = _returnCustomer,
+ salesDept = _salesDept,
+ xsms = _xsms,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -311,7 +632,7 @@
var row = gvMx1.GetDataRow(i);
if (row != null)
{
- Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
string _msl = row["sqQty"].ToString();
if (string.IsNullOrEmpty(_msl))
{
@@ -338,6 +659,7 @@
Bz = (row["note"].ToString()),
Thlx = (row["returnType"].ToString()),
Thrq = (row["returnDate"].ToString()),
+ ItemId = (row["ItemId"].ToString()),
});
}
}
@@ -345,21 +667,25 @@
{
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_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
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);
}
}
/// <summary>
@@ -382,7 +708,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and xs.FID 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
@@ -392,16 +722,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- gridView1.BestFitColumns();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -416,10 +746,15 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
+ gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -439,10 +774,13 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucCk = dy.fstockid;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ gvList.Add(gvMx2);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ _ucCk = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -456,6 +794,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -473,6 +812,7 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
@@ -480,15 +820,23 @@
}
}
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>
@@ -525,13 +873,17 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -547,9 +899,9 @@
_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());
@@ -558,26 +910,20 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "chkStatus", "approvedBy", "approvedDate", picCheckBox, this, _inFieldValue.ToString());
}
+ 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)
- {
- SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
- DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
- //gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
- gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString());
- //gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
- //gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
- //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
- gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- }
+ /// <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;
@@ -586,7 +932,7 @@
if (e.Button.Index == 0)
{
var dr = gvMx1.GetDataRow(rowhandle);
- var mxGuid = dr["id"].ToString();
+ var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
if (string.IsNullOrEmpty(mxGuid))
@@ -607,17 +953,18 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
-
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
@@ -626,12 +973,45 @@
DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
lbMxGuid.Text = row["guid"].ToString();
ucBtnPrint1.guidKey = row["guid"].ToString();
- //txtWlid.Text = row["qd002"].ToString();
- //txtWlgg.Text = row["qd004"].ToString();
- //txtWlmc.Text = row["qd003"].ToString();
- //txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- //txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
+ txtWlid.Text = row["itemNo"].ToString();
+ txtWlgg.Text = row["itemModel"].ToString();
+ txtWlmc.Text = row["itemName"].ToString();
+ txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺
+ txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
+ }
+ else
+ {
+ lbMxGuid.Text = "";
+ ucBtnPrint1.guidKey = "";
+ txtWlid.Text = "";
+ txtWlgg.Text = "";
+ txtWlmc.Text = "";
+ txtQuantity.Text = "";
+ txt_yQty.Text = "";
+ txt_kQty.Text = "";
+ txt_psnQty_1.Text = "";
+ txt_iCount_1.Text = "";
+ }
+ }
+
+
+ private void setSrm()
+ {
+ int ddd = txt_fHasLinkRad.SelectedIndex;
+ if (ddd == 0)
+ {
+ layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
+ else
+ {
+ layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
}
}
}
--
Gitblit v1.9.3