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 | 246 ++++++++++++++++++++++++-------------------------
1 files changed, 120 insertions(+), 126 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 316e6ca..8d6cd74 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -1,7 +1,4 @@
-using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -10,7 +7,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -18,7 +14,7 @@
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "MesInvItemMovesManager/";
+ string _webServiceName = "SalesDeliverManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_SalesDeliver()
{
@@ -33,48 +29,55 @@
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;
- //璁剧疆鐢宠缁勭粐
- //this.txt_fapporgid.EditChanged += (s, e) =>
- //{
- // string _sqGuid = txt_fapporgid.GetId();
- // if (string.IsNullOrEmpty(_sqGuid))
- // return;
- // System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- // sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
- // var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- // var json = JsonConvert.SerializeObject(_obj);
- // try
- // {
- // var strReturn = UtilityHelper.HttpPost("",
- // "MesItemsManager/GetListSelect", json);
- // var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- // var dt = rtn.rtnData.list;
- // this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //};
+ //璁剧疆閿�鍞崟
+ txt_salesId.getSuppler("", "");
+ this.txt_salesId.EditChanged += (s, e) =>
+ {
+ string _sqGuid = txt_salesId.GetId();
+ if (string.IsNullOrEmpty(_sqGuid))
+ return;
+ 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(), _sqGuid);
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "SalesManager/SelectFormMx", json);
+ 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);
}
@@ -97,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();
}
@@ -131,7 +134,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1, "fBillNo");
+ lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -207,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>
@@ -227,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);
}
@@ -239,57 +242,31 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //string djlx = txt_fBillTypeID.Text.ToString();
- //string ywlx = txt_fBusinessType.Text.ToString();
- //string dbfx = txt_fTransferDirect.Text.ToString();
- //string sqOrg = txt_fapporgid.GetId();
- //string dblx = txt_ftranstype.Text.ToString();
- //string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
- //string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
- //if (txt_fBillTypeID.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- // txt_fBillTypeID.Focus();
- // return;
- //}
- //if (txt_fTransferDirect.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
- // txt_fTransferDirect.Focus();
- // return;
- //}
- //if (string.IsNullOrEmpty(sqOrg))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
- // txt_fapporgid.Focus();
- // return;
- //}
- //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
- // txt_fOwnerTypeIdHead.Focus();
- // return;
- //}
- //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
- // txt_fOwnerTypeInIdHead.Focus();
- // return;
- //}
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // djlx = djlx,//鍗曟嵁绫诲瀷
- // ywlx = ywlx,//涓氬姟绫诲瀷
- // dbfx = dbfx,//璋冩嫧鏂瑰悜
- // sqOrg = sqOrg,//瀹¤缁勭粐
- // dblx = dblx,//璋冩嫧绫诲瀷
- // dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
- // drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
- // inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
- // list = new List<dynamic>(),
- //};
+ string djlx = txt_fBillTypeID.Text.ToString();
+ string FNote = txt_fNote.Text.ToString();
+ string _sqGuid = txt_salesId.GetId();
+ if (txt_fBillTypeID.SelectedIndex < 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_fBillTypeID.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_sqGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞崟锛�");
+ txt_salesId.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ djlx = djlx,//鍗曟嵁绫诲瀷
+ salesId = _sqGuid,//閿�鍞崟鍙�
+ inRemark = FNote.Trim(),//澶囨敞
+ list = new List<dynamic>(),
+ };
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -302,42 +279,43 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
- string _msl = row["shNum"].ToString();
+ string _msl = row["fMustQty"].ToString();
if (string.IsNullOrEmpty(_msl))
{
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
- //_obj.list.Add(new
- //{
- // Guid = _guid,
- // ItemId = (row["itemId"].ToString()),
- // Sqsl = (row["shNum"].ToString()),
- // Bz = (row["remark"].ToString()),
- // dczz = (row["dcOrgGuid"].ToString()),
- // dcck = (row["dcCkGuid"].ToString()),
- // drzz = (row["drOrgGuid"].ToString()),
- // drck = (row["drCkGuid"].ToString()),
- // dchz = (row["dcHzGuid"].ToString()),
- // drhz = (row["drHzGuid"].ToString()),
- //});
+ 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()),
+ });
}
}
try
{
- //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)
- //{
- // 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);
- // toolBarMenu1.currentAction = "";
- //}
+ 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)
+ {
+ 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.layoutMx1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
}
catch (Exception ex)
{
@@ -364,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
@@ -374,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;//褰撳墠椤�
@@ -424,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"])
@@ -438,6 +416,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -493,7 +472,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "fBillNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -521,7 +500,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -534,14 +513,30 @@
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
+ 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("itemId", SelectedDataRow["id"].ToString());
- gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].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)
{
@@ -582,6 +577,5 @@
}
}
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3