From 48c9e2692ee60cdb6c1c4a297791a5bdcdc698c4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 18:15:54 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 129 ++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 49 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 0d6d267..1ffc9cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -29,8 +29,9 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ // Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, this.panelControl3, splitContainerControl1.Panel1, label1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -44,9 +45,9 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆鐢宠缁勭粐
- this.txt_sqOrg.EditChanged += (s, e) =>
+ this.txt_fapporgid.EditChanged += (s, e) =>
{
- string _sqGuid = txt_sqOrg.GetId();
+ string _sqGuid = txt_fapporgid.GetId();
if (string.IsNullOrEmpty(_sqGuid))
return;
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
@@ -126,7 +127,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billno, gridView1, "billno");
+ lbGuid, txt_fBillNo, gridView1, "fBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -170,7 +171,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim());
else
{
@@ -193,7 +194,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "billno");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -234,51 +235,54 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string djlx=txt_djlx.SelectedText.ToString();
- string ywlx=txt_ywlx.SelectedText.ToString();
- string dbfx=txt_ftransferdirect.SelectedText.ToString();
- string sqOrg = txt_sqOrg.GetId();
- string dblx = txt_dblx.SelectedText.ToString();
- string dchzlx=txt_dchzlx.SelectedText.ToString();
- string drhzlx=txt_drhzlx.SelectedText.ToString();
- if (txt_djlx.SelectedIndex<=0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_djlx.Focus();
- return;
- }
- if (txt_ftransferdirect.SelectedIndex <= 0)
+ 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();
+ txt_fTransferDirect.Focus();
return;
}
if (string.IsNullOrEmpty(sqOrg))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
- txt_sqOrg.Focus();
+ txt_fapporgid.Focus();
return;
}
- if (txt_dchzlx.SelectedIndex <= 0)
+ if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
- txt_dchzlx.Focus();
+ txt_fOwnerTypeIdHead.Focus();
return;
}
- if (txt_drhzlx.SelectedIndex <= 0)
+ if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
- txt_drhzlx.Focus();
+ txt_fOwnerTypeInIdHead.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- //inCkId = _inCkId,//鍑轰粨
- //inRkId = _inRkId,//鍏ュ簱
- inDjlx = txt_djlx.Text.Trim(),//鍗曟嵁绫诲瀷
- inDbfx = txt_ftransferdirect.Text.Trim(),//璋冩嫧鏂瑰悜
- inRemark = txt_remark.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>(),
};
gvMx1.CloseEditor();
@@ -300,12 +304,48 @@
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
+ {
+ MsgHelper.ShowError("璋冨嚭缁勭粐涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
+ {
+ MsgHelper.ShowError("璋冨嚭浠撳簱涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
+ {
+ MsgHelper.ShowError("璋冨叆缁勭粐涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
+ {
+ MsgHelper.ShowError("璋冨叆浠撳簱涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
+ {
+ MsgHelper.ShowError("璋冨嚭璐т富涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
+ {
+ 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()),
});
}
}
@@ -317,7 +357,7 @@
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData.outGuid;
- txt_billno.Text = _rtn.rtnData.outNo;
+ txt_fBillNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -340,7 +380,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billno, gridView1);
+ lbGuid, txt_fBillNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -479,7 +519,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -507,7 +547,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "shState", "shBy", "shDate", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -522,7 +562,8 @@
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
- gvMx1.SetFocusedRowCellValue("itemMpdel", SelectedDataRow["itemModel"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+ gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
@@ -600,11 +641,6 @@
if (rowhandle < 0)
return;
var dr = gvMx1.GetDataRow(rowhandle);
- if (dr["dcOrgGuid"] == null)
- {
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
- return;
- };
var strOrgGuid = dr["dcOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
@@ -685,15 +721,10 @@
if (rowhandle < 0)
return;
var dr = gvMx1.GetDataRow(rowhandle);
- if (dr["drOrgGuid"] == null)
- {
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
- return;
- };
var strOrgGuid = dr["drOrgGuid"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
- MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
return;
};
SelectCk frm = new SelectCk(strOrgGuid);
@@ -749,7 +780,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- int _drhzlx = txt_drhzlx.SelectedIndex;
+ int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
if (_drhzlx <= 0)
{
MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
@@ -776,7 +807,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- int _drhzlx = txt_dchzlx.SelectedIndex;
+ int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
if (_drhzlx <= 0)
{
MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
--
Gitblit v1.9.3