This commit is contained in:
chi
2023-10-08 00:04:31 +09:00
parent 37f2fdf053
commit b6291f2bd0
32 changed files with 1610 additions and 691 deletions

View File

@@ -12,6 +12,7 @@ using NetOffice;
using Outlook = NetOffice.OutlookApi;
using NetOffice.OutlookApi.Enums;
using FEQ0000.Purchase;
using FCOMMON;
namespace FEQ0000
{
@@ -209,6 +210,14 @@ namespace FEQ0000
cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)";
}
if (tbManager.Text.isEmpty() == false)
{
cmd.CommandText += $" and purchase_manager like '%{tbManager.Text.Replace("'", "''")}%'";
}
if (tbAdmin.Text.isEmpty() == false)
{
cmd.CommandText += $" and purchase_admin like '%{tbAdmin.Text.Replace("'", "''")}%'";
}
if (cmbState.SelectedIndex != 0)
{
@@ -456,7 +465,15 @@ namespace FEQ0000
else
newdr.request = FCOMMON.info.Login.no;
repeat:
var t1 = DBM.getCodeByCode("65", "01");
var t2 = DBM.getCodeByCode("66", "01");
newdr.purchase_manager = t1.title;
newdr.purchase_admin = t2.title;
repeat:
bool repeat = false;
DialogResult dlg;