From aaed24ecaacb9a0cef8d95570bc89df94df42977 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 三月 2025 14:34:28 +0800
Subject: [PATCH] 受托
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 95ca2bb..5ea585e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -13,10 +13,10 @@
{
public partial class Frm_MesShouTui : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "MesCgthSqManager/";
+ string _webServiceName = "MesShouTuiManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
string _ucCk = "";//鍙戞枡浠撳簱
- string _ucGys = "";//渚涘簲鍟�
+ string _ucKh = "";//瀹㈡埛
public Frm_MesShouTui()
{
InitializeComponent();
@@ -32,7 +32,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isCheck", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -46,23 +46,30 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//閫夋嫨搴撳瓨缁勭粐锛堜粨搴撳拰渚涘簲鍟嗭級
- txt_thOrgId.EditChanged += (s, e) =>
+ txt_fStockOrgId.EditChanged += (s, e) =>
{
- var orgId = txt_thOrgId.GetId();
+ var orgId = txt_fStockOrgId.GetId();
if (string.IsNullOrEmpty(orgId))
return;
- txt_suppId.getSuppler(orgId, _ucGys);
- txt_depotId.getSuppler(orgId, _ucCk);
+ txt_fCustId.getSuppler(orgId, _ucKh);
+ txt_fStockId.getSuppler(orgId, _ucCk);
};
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
+ if (string.IsNullOrEmpty(this.txt_fStockOrgId.GetId()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨缁勭粐锛�");
+ this.txt_fStockOrgId.Focus();
return;
}
- var frm = new SelectMesCgthSq(this.txt_suppId.GetId(), this.txt_thOrgId.GetId(), (txt_isOut.Checked == true ? 1 : 0).ToString());
+ if (string.IsNullOrEmpty(this.txt_fCustId.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨瀹㈡埛锛�");
+ this.txt_fCustId.Focus();
+ return;
+ }
+ var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fIsLink.SelectedIndex.ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -294,48 +301,43 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- var _ckId = txt_depotId.GetId(); //浠撳簱缂栧彿 depots_code
- var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
- string _orgId = txt_thOrgId.GetId();
+ var _ckId = txt_fStockId.GetId();
+ var _khId = txt_fCustId.GetId();
+ string _orgId = txt_fStockOrgId.GetId();
+
if (string.IsNullOrEmpty(_orgId))
{
MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
- txt_thOrgId.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_gysId))
- {
- MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
- txt_suppId.Focus();
+ txt_fStockOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_ckId))
{
MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotId.Focus();
+ txt_fStockId.Focus();
return;
}
- if (txt_returnMethod.SelectedIndex <= 0)
+ if (string.IsNullOrEmpty(_ckId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�");
+ txt_fCustId.Focus();
+ return;
+ }
+ if (txt_fReturnStyle.SelectedIndex <= 0)
{
MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
- txt_returnMethod.Focus();
- return;
- }
- if (txt_returnType.SelectedIndex <= 0)
- {
- MsgHelper.Warning("璇烽�夋嫨閫�鏂欏師鍥狅紒");
- txt_returnType.Focus();
+ txt_fReturnStyle.Focus();
return;
}
var _obj = new
{
Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
+ KcZz = _orgId,
Remark = txt_remark.Text.Trim(), //澶囨敞
- SuppId = int.Parse(_gysId), //渚涘簲鍟�
- DepotId = int.Parse(_ckId),//浠撳簱
- FType = txt_isOut.Checked == true ? 1 : 0, //0=閲囪喘锛�1=濮斿
- Fmrmode = txt_returnMethod.Text,//閫�鏂欐柟寮�
- Reason = txt_returnType.Text,//閫�鏂欏師鍥�
+ CusId = int.Parse(_khId),
+ DepotId = int.Parse(_ckId),
+ FIsLink = txt_fIsLink.SelectedIndex == 0 ? "Y" : "N",
+ FReturnStyle = txt_fReturnStyle.Text,//閫�鏂欐柟寮�
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -350,8 +352,8 @@
var row = gvMx1.GetDataRow(i);
if (row != null)
{
- Guid _guid = UtilityHelper.ToGuid(row["id"].ToString());
- string _msl = row["sqNum"].ToString();
+ Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ string _msl = row["fQty"].ToString();
if (string.IsNullOrEmpty(_msl))
{
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
@@ -360,9 +362,11 @@
_obj.list.Add(new
{
Guid = _guid,
- AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
- Quantity = decimal.Parse(row["sqNum"].ToString()),
+ AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
+ Quantity = decimal.Parse(row["fQty"].ToString()),
Bz = row["remark"].ToString(),
+ ItemId = row["itemId"].ToString(),
+ FStockStatusId = row["fStockStatusId"].ToString(),
});
}
}
@@ -453,13 +457,13 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- _ucGys = dy.suppId;
- _ucCk = dy.depotId;
+ _ucKh = dy.fCustId;
+ _ucCk = dy.fStockId;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
- _ucGys = "";
+ _ucKh = "";
_ucCk = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -534,7 +538,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
--
Gitblit v1.9.3