From 88f69448fd3fb65d437c0b258ea93a3055017abd Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 13:39:26 +0800
Subject: [PATCH] 退货申请
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index a19206e..d787e41 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -45,8 +45,14 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆閿�鍞崟
+ txt_salesId.getSuppler("", "");
this.txt_salesId.EditChanged += (s, e) =>
{
+ //鏈夋病鏈夊彂璐х粍缁�
+ string _fhOrg = txt_fStockOrgId.GetId();//鐩墠杩囨护渚涘簲缁勭粐
+ if (string.IsNullOrEmpty(_fhOrg))
+ return;
+ //鏈夋病鏈夐攢鍞鍗�
string _sqGuid = txt_salesId.GetId();
if (string.IsNullOrEmpty(_sqGuid))
return;
@@ -54,8 +60,7 @@
txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _fhOrg);
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -131,7 +136,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1, "fBillNo");
+ lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -239,9 +244,16 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string djlx = txt_fBillTypeID.Text.ToString();
- string FNote = txt_fNote.Text.ToString();
+ 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("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -260,6 +272,7 @@
djlx = djlx,//鍗曟嵁绫诲瀷
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
+ fhOrg = _fhOrg,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -460,7 +473,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "fBillNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -488,7 +501,7 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -550,7 +563,5 @@
}
}
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3