From 5c26ea4c8c813ea85acf68fa07e180a12c748f33 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 七月 2025 14:21:01 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 111 ++++++++++++++++++++++---------------------------------
1 files changed, 45 insertions(+), 66 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 78f5ba8..226ff69 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -16,6 +16,7 @@
{
string _webServiceName = "SalesReturnManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucCk = "";//鍙戞枡浠撳簱
public Frm_SalesReturnNotice()
{
InitializeComponent();
@@ -31,17 +32,18 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
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;
// 璁剧疆閿�鍞崟
@@ -54,6 +56,8 @@
return;
txt_custName.Text = txt_salesOrderId.GetSalesCusName();
txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
+ string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
+ txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
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);
@@ -64,48 +68,12 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- };
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
- {
- ucBtnPrint1.rptParameter = "rpt_Xsth{}";
- };
- this.ucBtnPrint1.btnReportClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (string.IsNullOrEmpty(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()
- + "," + ""
- + "," + ""
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
};
}
@@ -134,7 +102,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();
}
@@ -244,7 +212,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
@@ -282,6 +250,8 @@
string djlx = txt_billType.Text.ToString();
string FNote = txt_returnReason.Text.ToString();
string _sqGuid = txt_salesOrderId.GetId();
+ string ckId = txt_fstockid.GetId();
+ int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
if (string.IsNullOrEmpty(_sqGuid))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
@@ -294,15 +264,24 @@
txt_billType.Focus();
return;
}
+ if (string.IsNullOrEmpty(ckId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_fstockid.Focus();
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
djlx = djlx,//鍗曟嵁绫诲瀷
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
+ ckId = ckId,
+ FIsLink = _fIsLink,//鏈夋棤婧愬崟
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -348,9 +327,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_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -359,11 +338,14 @@
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>
@@ -386,7 +368,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -402,7 +384,7 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -420,10 +402,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;
@@ -443,11 +430,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);
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"])
@@ -461,6 +450,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -478,6 +468,7 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
@@ -575,15 +566,20 @@
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
- gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
- gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
//gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString());
gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
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;
@@ -621,23 +617,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- }
- }
-
-
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- if (e.FocusedRowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- lbMxGuid.Text = row["guid"].ToString();
- ucBtnPrint1.guidKey = row["guid"].ToString();
- txtWlid.Text = row["itemId"].ToString();
- txtWlgg.Text = row["itemNo"].ToString();
- txtWlmc.Text = row["itemName"].ToString();
- txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
}
}
--
Gitblit v1.9.3