From e6ae7ae03b62f6c506b48b343ae5424de8734b3c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 10:15:39 +0800
Subject: [PATCH] 更新了仓库
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 114 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index bf9eeb1..c1e7960 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -32,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;
// 璁剧疆閿�鍞崟
@@ -56,7 +57,7 @@
txt_custName.Text = txt_salesOrderId.GetSalesCusName();
txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
- txt_fstockid.getSuppler(_xsOrgFid,_ucCk);
+ 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);
@@ -67,6 +68,7 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
@@ -83,14 +85,14 @@
ucBtnPrint1.guidKey = "";
string rowGuid = lbMxGuid.Text.Trim();
ucBtnPrint1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
txt_iCount_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
txt_psnQty_1.Focus();
@@ -105,10 +107,20 @@
}
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_psnQty_1.TextChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
+ };
+
+ radOut.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
@@ -137,7 +149,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();
}
@@ -247,7 +259,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
@@ -286,6 +298,7 @@
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("璇烽�夋嫨閿�鍞鍗曪紒");
@@ -311,6 +324,7 @@
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
ckId = ckId,
+ FIsLink = _fIsLink,//鏈夋棤婧愬崟
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -371,6 +385,7 @@
gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -398,7 +413,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
@@ -432,10 +447,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;
@@ -475,6 +495,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -492,6 +513,7 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
@@ -598,7 +620,11 @@
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;
@@ -639,7 +665,6 @@
}
}
-
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
if (e.FocusedRowHandle >= 0)
@@ -647,12 +672,67 @@
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();
+ txtWlid.Text = row["itemNo"].ToString();
+ txtWlgg.Text = row["itemModel"].ToString();
txtWlmc.Text = row["itemName"].ToString();
txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txtKdy.Text = row["kdy"].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 = "";
+ }
+ }
+
+ /// <summary>
+ /// 閲嶆墦
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
+ return;
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ mxGuid = mxGuid,
+ inType = "dhtm"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ "VArrivalBarcodeManager/DeleteBarcode",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
}
}
--
Gitblit v1.9.3