From b77cf0b90deead4446855bd01d5b5931d045ed5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 17:39:49 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index a19206e..c48c20e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -45,6 +45,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆閿�鍞崟
+ txt_salesId.getSuppler("", "");
this.txt_salesId.EditChanged += (s, e) =>
{
string _sqGuid = txt_salesId.GetId();
@@ -54,8 +55,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(), _sqGuid);
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -70,7 +70,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -131,7 +130,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,8 +238,8 @@
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();
if (txt_fBillTypeID.SelectedIndex < 0)
{
@@ -250,7 +249,7 @@
}
if (string.IsNullOrEmpty(_sqGuid))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞崟锛�");
txt_salesId.Focus();
return;
}
@@ -287,6 +286,7 @@
SalesDetailId = (row["salesDetailId"].ToString()),
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
+ Yjsj = (row["YjfhDate"].ToString()),
});
}
}
@@ -460,7 +460,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 +488,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 +550,5 @@
}
}
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3