From 81c71369f5e61917324c427b35cc5849b3aaa136 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 24 二月 2025 11:07:29 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 26359d1..8c38d79 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("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -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,41 +235,41 @@
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)
+ 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_djlx.Focus();
+ txt_fBillTypeID.Focus();
return;
}
- if (txt_ftransferdirect.SelectedIndex <= 0)
+ 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
@@ -281,7 +282,7 @@
dblx = dblx,//璋冩嫧绫诲瀷
dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
- inRemark = txt_remark.Text.Trim(),//澶囨敞
+ inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -309,12 +310,12 @@
ItemId = (row["itemId"].ToString()),
Sqsl = (row["shNum"].ToString()),
Bz = (row["remark"].ToString()),
- dczz = (row["dcOrg"].ToString()),
- dcck = (row["dcCk"].ToString()),
- drzz = (row["drOrg"].ToString()),
- drck = (row["drCk"].ToString()),
- dchz = (row["dcHz"].ToString()),
- drhz = (row["drHz"].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()),
});
}
}
@@ -326,7 +327,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);
@@ -349,7 +350,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billno, gridView1);
+ lbGuid, txt_fBillNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -488,7 +489,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("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -516,7 +517,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)
@@ -531,7 +532,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();
@@ -758,7 +760,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- int _drhzlx = txt_drhzlx.SelectedIndex;
+ int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
if (_drhzlx <= 0)
{
MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
@@ -785,7 +787,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