From c4f46e49677576ac7f1a74feee547b3238c0eeaf Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 19 十一月 2025 16:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 2e9d92d..03e98f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -10,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
@@ -33,6 +32,7 @@
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) =>
@@ -61,8 +61,8 @@
txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
txt_shf.Text = txt_salesId.GetSalesShf();
txt_shName.Text = txt_salesId.GetSalesShfName();
+ txt_SaleOrgId.Text = txt_salesId.GetSalesOrgFid();
};
-
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
{
@@ -88,11 +88,12 @@
_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["xsSl"] = dym.xsSl;
_row["isFree"] = dym.isFree;
_row["hzlx"] = dym.hzlx;
_row["hz"] = dym.hz;
@@ -102,6 +103,11 @@
_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();
@@ -110,7 +116,7 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
- gridView1.BestFitColumns();
+ gvMx1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
catch (Exception ex)
@@ -121,6 +127,8 @@
frm.ShowDialog();
};
}
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -365,6 +373,11 @@
MsgHelper.ShowError("閿�鍞崟鐗╂枡鏄庣粏涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["depotId"].ToString()))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨鍙戣揣浠撳簱锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
@@ -372,6 +385,7 @@
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
Yjsj = (row["YjfhDate"].ToString()),
+ depotId = (row["depotId"].ToString()),
});
}
}
@@ -514,6 +528,12 @@
}
}
+
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
+
/// <summary>
/// 璐㈠姟瀹℃牳
/// </summary>
@@ -570,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");
@@ -624,7 +646,12 @@
}
}
-
+
+ /// <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;
@@ -665,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