From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 195 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 149 insertions(+), 46 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 938e608..03e98f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -9,7 +10,6 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
@@ -31,6 +31,8 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -59,24 +61,74 @@
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
+ txt_SaleOrgId.Text = txt_salesId.GetSalesOrgFid();
+ };
+ //閫夋嫨闇�瑕佺殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_salesId.GetId()))
{
- 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;
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨閿�鍞鍗曪紒");
+ this.txt_salesId.Focus();
+ return;
}
- catch (Exception ex)
+ var frm = new Frm_SalesDeliverSelect(this.txt_salesId.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["salesDetailId"] = dym.salesDetailId;
+ _row["billNo"] = dym.billNo;
+ _row["itemNo"] = dym.itemNo;
+ _row["itemName"] = dym.itemName;
+ _row["itemModel"] = dym.itemModel;
+ _row["itemId"] = dym.itemId;
+ _row["dwXs"] = dym.dwXs;
+ _row["dwJj"] = dym.dwJj;
+ _row["jjSl"] = dym.jjSl;
+ _row["deliveryDate"] = dym.deliveryDate;
+ _row["xsSl"] = dym.xsSl;
+ _row["isFree"] = dym.isFree;
+ _row["hzlx"] = dym.hzlx;
+ _row["hz"] = dym.hz;
+ _row["xxbz"] = dym.xxbz;
+ _row["fhsx"] = dym.fhsx;
+ _row["fhxx"] = dym.fhxx;
+ _row["jsOrg"] = dym.jsOrg;
+ _row["gyOrg"] = dym.gyOrg;
+ _row["kcOrg"] = dym.kcOrg;
+ _row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
+ _row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
+ _row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
+ _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
+ _row["fEntrynote"] = dym.entryNote; ;
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
}
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -115,6 +167,28 @@
{
_filterList = e.FilterList;
getPageList(1);
+ }
+
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1, "billNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_XSCK{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
}
/// <summary>
@@ -294,6 +368,16 @@
MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["salesDetailId"].ToString()))
+ {
+ MsgHelper.ShowError("閿�鍞崟鐗╂枡鏄庣粏涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["depotId"].ToString()))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨鍙戣揣浠撳簱锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
@@ -301,6 +385,7 @@
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
Yjsj = (row["YjfhDate"].ToString()),
+ depotId = (row["depotId"].ToString()),
});
}
}
@@ -350,7 +435,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(" and a.FSaleOrgId in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
@@ -368,7 +453,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -442,6 +528,12 @@
}
}
+
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
+
/// <summary>
/// 璐㈠姟瀹℃牳
/// </summary>
@@ -498,14 +590,16 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
case 30:
strMsg = "璐㈠姟瀹℃牳";
break;
case 31:
strMsg = "璐㈠姟鍙嶅鏍�";
break;
- }
- ;
+ };
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
@@ -552,35 +646,12 @@
}
}
- private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
- {
- 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("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();
- }
-
+ /// <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,5 +692,37 @@
}
}
}
+ /// <summary>
+ /// 鏌ユ壘浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ var strOrgGuid = txt_SaleOrgId.Text.Trim();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨閿�鍞粍缁囷紒");
+ return;
+ }
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
+ gvMx1.BestFitColumns();
+ };
+ frm.ShowDialog();
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3