From 5a59d052a17b52bb4dcd932ac6ecbde75da450e4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 04 三月 2025 17:37:35 +0800
Subject: [PATCH] erp
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 245 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 160 insertions(+), 85 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index b8d4e43..2aeade1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -29,7 +29,6 @@
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, "chkStatus", "", (value) =>
{
@@ -70,8 +69,46 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
-
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ this.ucBtnPrint1.btnDesignClick += (s, e) =>
+ {
+ ucBtnPrint1.rptParameter = "rpt_Xsth{}";
+ };
+ this.ucBtnPrint1.btnReportClick += (s, e) =>
+ {
+ ucBtnPrint1.guidKey = "";
+ string rowGuid = lbMxGuid.Text.Trim();
+ ucBtnPrint1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (lbMxGuid.Text.Trim().Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
+ + "," + ""
+ + "," + ""
+ + "," + txt_iCount_1.Text.Trim()
+ + "," + txt_psnQty_1.Text.Trim()
+ + "}";
+ };
}
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -238,86 +275,92 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- //toolBarMenu1.isSetBtn = false;
- //string djlx = txt_fBillTypeID.Text.ToString();
- //string FNote = txt_fNote.Text.ToString();
- //string _sqGuid = txt_salesId.GetId();
- //string _fhOrg = txt_fStockOrgId.GetId();
- //if (string.IsNullOrEmpty(_fhOrg))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戣揣缁勭粐锛�");
- // txt_fStockOrgId.Focus();
- // return;
- //}
- //if (txt_fBillTypeID.SelectedIndex < 0)
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- // txt_fBillTypeID.Focus();
- // return;
- //}
- //if (string.IsNullOrEmpty(_sqGuid))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
- // txt_salesId.Focus();
- // return;
- //}
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // djlx = djlx,//鍗曟嵁绫诲瀷
- // salesId = _sqGuid,//閿�鍞崟鍙�
- // inRemark = FNote.Trim(),//澶囨敞
- // fhOrg = _fhOrg,
- // list = new List<dynamic>(),
- //};
- //gvMx1.CloseEditor();
- //gvMx1.UpdateCurrentRow();
- //if (gvMx1.DataRowCount <= 0)
- //{
- // MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鐢宠鏄庣粏锛�");
- // return;
- //}
- //for (var i = 0; i < gvMx1.DataRowCount; i++)
- //{
- // var row = gvMx1.GetDataRow(i);
- // if (row != null)
- // {
- // Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
- // string _msl = row["fMustQty"].ToString();
- // if (string.IsNullOrEmpty(_msl))
- // {
- // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
- // return;
- // }
- // _obj.list.Add(new
- // {
- // Guid = _guid,
- // SalesDetailId = (row["salesDetailId"].ToString()),
- // Sqsl = (row["fMustQty"].ToString()),
- // Bz = (row["fEntrynote"].ToString()),
- // });
- // }
- //}
- //try
- //{
- // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // if (_rtn.rtnCode > 0)
- // {
- // lbGuid.Text = _rtn.rtnData.outGuid;
- // txt_billNo.Text = _rtn.rtnData.outNo;
- // toolBarMenu1.isSetBtn = true;
- // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
- // toolBarMenu1.currentAction = "";
- // }
- //}
- //catch (Exception ex)
- //{
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- //}
+ toolBarMenu1.isSetBtn = false;
+ string djlx = txt_billType.Text.ToString();
+ string FNote = txt_returnReason.Text.ToString();
+ string _sqGuid = txt_customerOrderNo.GetId();
+ if (string.IsNullOrEmpty(_sqGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
+ txt_customerOrderNo.Focus();
+ return;
+ }
+ if (txt_billType.SelectedIndex < 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_billType.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ djlx = djlx,//鍗曟嵁绫诲瀷
+ salesId = _sqGuid,//閿�鍞崟鍙�
+ inRemark = FNote.Trim(),//澶囨敞
+ list = new List<dynamic>(),
+ };
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ if (gvMx1.DataRowCount <= 0)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鐢宠鏄庣粏锛�");
+ return;
+ }
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
+ string _msl = row["sqQty"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ string _returnType = row["returnType"].ToString();
+ if (string.IsNullOrEmpty(_returnType))
+ {
+ MsgHelper.ShowError("绫诲瀷涓嶈兘涓虹┖锛�");
+ return;
+ }
+ string _returnDate = row["returnDate"].ToString();
+ if (string.IsNullOrEmpty(_returnType))
+ {
+ MsgHelper.ShowError("鏃ユ湡涓嶈兘涓虹┖锛�");
+ return;
+ }
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ deliveDetailGuid = (row["deliveDetailGuid"].ToString()),
+ Sqsl = (row["sqQty"].ToString()),
+ Bz = (row["note"].ToString()),
+ Thlx = (row["returnType"].ToString()),
+ Thrq = (row["returnDate"].ToString()),
+ });
+ }
+ }
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_billNo.Text = _rtn.rtnData.outNo;
+ toolBarMenu1.isSetBtn = true;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
/// 鏃ュ織
@@ -418,6 +461,23 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -509,11 +569,11 @@
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
//gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
- //gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
+ gvMx1.SetFocusedRowCellValue("materialName", SelectedDataRow["itemName"].ToString());
//gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
//gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
//gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
- gvMx1.SetFocusedRowCellValue("salesDetailId", SelectedDataRow["id"].ToString());
+ gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
}
@@ -558,6 +618,21 @@
}
}
-
+
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ lbMxGuid.Text = row["guid"].ToString();
+ ucBtnPrint1.guidKey = row["guid"].ToString();
+ //txtWlid.Text = row["qd002"].ToString();
+ //txtWlgg.Text = row["qd004"].ToString();
+ //txtWlmc.Text = row["qd003"].ToString();
+ //txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
+ //txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ //txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3