From a6f65537fd87ae065fe5cec62863ac4380d2a745 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 28 八月 2025 11:15:54 +0800
Subject: [PATCH] 销售退货单增加字段
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 141 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 2ecf0bc..88cf1c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -142,8 +142,8 @@
return;
txt_fstockid.getSuppler(orgId, _ucCk);
txt_inventoryOrg.SetIdOrCode(orgId);
- txt_salesDept.getSuppler(orgId,_ucBm);
- txt_returnCustomer.getSuppler(orgId,_ucKh);
+ txt_salesDept.getSuppler(orgId, _ucBm);
+ txt_returnCustomer.getSuppler(orgId, _ucKh);
};
//閿�鍞儴闂�
txt_salesDept.EditChanged += (s, e) =>
@@ -151,7 +151,7 @@
var dptId = txt_salesDept.GetId();
if (string.IsNullOrEmpty(dptId))
return;
- txt_saleDeptName.Text=(txt_salesDept.GetName());
+ txt_saleDeptName.Text = (txt_salesDept.GetName());
};
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -168,39 +168,92 @@
}
if (txt_fHasLinkRad.SelectedIndex == 0)
{
- var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
- //璧嬪�肩粰鏄庣粏琛�
- frm.UpdateParent += (ss, ee) =>
+ //鏈夋簮鍗曚箣閿�鍞嚭搴撳崟
+ if (txt_fHasLinkSource.SelectedIndex == 0)
{
- try
+ var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
{
- var lst = new List<string>();
- lst = ee.StringList;
- var _obj = lst;
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectFormTo",
- JsonConvert.SerializeObject(_obj));
- var dt = UtilityHelper.ReturnToList(strReturn);
- DataTable _newTable = dt.rtnData;
- DataTable _oldTable = (DataTable)gcMx1.DataSource;
- DataRow[] sourceRows = _newTable.Select();
- for (int i = 0; i < sourceRows.Length; i++)
+ try
{
- _oldTable.ImportRow(sourceRows[i]);
+ 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();
}
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = _oldTable;
- gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
- }
- catch (Exception ex)
+ 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) =>
{
- MessageBox.Show(ex.Message);
- }
- };
- frm.ShowDialog();
- return;
+ 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)
{
@@ -222,7 +275,7 @@
_row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
_row["xxDw"] = dym.xxDw;
_row["salesQuantity"] = dym.salesQuantity;
- _row["isFreeChk"]=dym.isFreeChk;
+ _row["isFreeChk"] = dym.isFreeChk;
_row["fhQuantity"] = dym.fhQuantity;
gvMx1.UpdateCurrentRow();
_Table.Rows.Add(_row);
@@ -252,7 +305,7 @@
setSrm();
};
}
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -403,6 +456,7 @@
txt_salesOrg.IsReadly = true;
txt_inventoryOrg.IsReadly = true;
txt_fHasLinkRad.ReadOnly = true;
+ txt_fHasLinkSource.ReadOnly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -472,16 +526,14 @@
return;
}
//杩欐棤婧愮被鍨嬬殑妫�楠宐eg
- if (_FIsLink == 1)
+ 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("璇烽�夋嫨閮ㄩ棬锛�");
@@ -495,7 +547,8 @@
djlx = _djlx,//鍗曟嵁绫诲瀷
inRemark = _FNote.Trim(),//澶囨敞
ckId = _ckId,
- FIsLink = txt_fHasLinkRad.SelectedIndex,
+ fIsLink = txt_fHasLinkRad.SelectedIndex,
+ fHasLinkSource = txt_fHasLinkSource.Text.Trim(),
//涓嬮潰鏄棤婧愮殑
salesOrg = _salesOrg,
inventoryOrg = _inventoryOrg,
@@ -592,7 +645,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 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
@@ -787,7 +844,7 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// 绉诲嚭鏄庣粏
/// </summary>
@@ -801,7 +858,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))
@@ -872,13 +929,13 @@
{
layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
}
else
{
layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
-
-
+ layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
}
}
--
Gitblit v1.9.3