From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 94 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index d787e41..8d6cd74 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -29,38 +29,36 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- // Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, this.panelControl3, splitContainerControl1.Panel1, label1);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
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_salesId.getSuppler("", "");
this.txt_salesId.EditChanged += (s, e) =>
{
- //鏈夋病鏈夊彂璐х粍缁�
- string _fhOrg = txt_fStockOrgId.GetId();//鐩墠杩囨护渚涘簲缁勭粐
- if (string.IsNullOrEmpty(_fhOrg))
- return;
- //鏈夋病鏈夐攢鍞鍗�
string _sqGuid = txt_salesId.GetId();
if (string.IsNullOrEmpty(_sqGuid))
return;
- txt_fSalesManID.Text = txt_salesId.GetSalesUserName();
- txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
- txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
+ txt_fSalesManIDTxt.Text = txt_salesId.GetSalesUserName();
+ txt_fCustomerIDTxt.Text = txt_salesId.GetSalesCusName();
+ txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
+ txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
+ txt_shf.Text = txt_salesId.GetSalesShf();
+ txt_shName.Text = txt_salesId.GetSalesShfName();
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _fhOrg);
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -69,17 +67,17 @@
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);
}
};
-
}
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);
}
@@ -102,7 +100,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();
}
@@ -212,13 +210,13 @@
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);
+ UtilityHelper.ChangeEnableByControl(layoutMx1.Controls, true, gvList);
}
}
/// <summary>
@@ -232,7 +230,7 @@
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);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
@@ -247,13 +245,6 @@
string djlx = txt_fBillTypeID.Text.ToString();
string FNote = txt_fNote.Text.ToString();
string _sqGuid = txt_salesId.GetId();
- string _fhOrg = txt_fStockOrgId.GetId();
- if (string.IsNullOrEmpty(_fhOrg))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戣揣缁勭粐锛�");
- txt_fStockOrgId.Focus();
- return;
- }
if (txt_fBillTypeID.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -262,7 +253,7 @@
}
if (string.IsNullOrEmpty(_sqGuid))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞崟锛�");
txt_salesId.Focus();
return;
}
@@ -272,10 +263,10 @@
djlx = djlx,//鍗曟嵁绫诲瀷
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
- fhOrg = _fhOrg,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -294,12 +285,18 @@
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["YjfhDate"].ToString()))
+ {
+ MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
SalesDetailId = (row["salesDetailId"].ToString()),
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
+ Yjsj = (row["YjfhDate"].ToString()),
});
}
}
@@ -315,8 +312,9 @@
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);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -344,7 +342,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
@@ -354,16 +352,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;//褰撳墠椤�
@@ -404,7 +402,7 @@
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);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -418,6 +416,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -514,16 +513,31 @@
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
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["id"].ToString());
- //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
gvMx1.SetFocusedRowCellValue("salesDetailId", SelectedDataRow["id"].ToString());
+ gvMx1.SetFocusedRowCellValue("billNo", SelectedDataRow["billNo"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+ gvMx1.SetFocusedRowCellValue("dwXs", SelectedDataRow["xxdw"].ToString());
+ gvMx1.SetFocusedRowCellValue("dwJj", SelectedDataRow["jjdw"].ToString());
+ gvMx1.SetFocusedRowCellValue("jjSl", SelectedDataRow["priceUnitQty"].ToString());
+ gvMx1.SetFocusedRowCellValue("deliveryDate", SelectedDataRow["deliveryDate"].ToString());
+ gvMx1.SetFocusedRowCellValue("xsSl", SelectedDataRow["qty"].ToString());
+ gvMx1.SetFocusedRowCellValue("isFree", SelectedDataRow["isFree"].ToString());
+ gvMx1.SetFocusedRowCellValue("hzlx", SelectedDataRow["hzlx"].ToString());
+ gvMx1.SetFocusedRowCellValue("hz", SelectedDataRow["hz"].ToString());
+ gvMx1.SetFocusedRowCellValue("xxbz", SelectedDataRow["xxbz"].ToString());
+ gvMx1.SetFocusedRowCellValue("fhsx", SelectedDataRow["fhsx"].ToString());
+ gvMx1.SetFocusedRowCellValue("fhxx", SelectedDataRow["fhxx"].ToString());
+ gvMx1.SetFocusedRowCellValue("jsOrg", SelectedDataRow["jsOrg"].ToString());
+ gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString());
+ gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString());
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
}
+
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
--
Gitblit v1.9.3