diff --git a/Gatedge.K3Cloud.Utils/Model/K3Request/Query.cs b/Gatedge.K3Cloud.Utils/Model/K3Request/Query.cs index 99d3fd7..06c807a 100644 --- a/Gatedge.K3Cloud.Utils/Model/K3Request/Query.cs +++ b/Gatedge.K3Cloud.Utils/Model/K3Request/Query.cs @@ -21,7 +21,7 @@ namespace Gatedge.K3Cloud.Utils.Model.K3Request /// 过滤条件 /// //public List? FilterString { get; set; } - public string? FilterString { get; set; } + public List? FilterString { get; set; } /// /// 排序字段 /// diff --git a/Gatedge.K3Cloud.Utils/obj/Debug/net6.0/Gatedge.K3Cloud.Utils.csproj.FileListAbsolute.txt b/Gatedge.K3Cloud.Utils/obj/Debug/net6.0/Gatedge.K3Cloud.Utils.csproj.FileListAbsolute.txt index 807ea2c..7d82fda 100644 --- a/Gatedge.K3Cloud.Utils/obj/Debug/net6.0/Gatedge.K3Cloud.Utils.csproj.FileListAbsolute.txt +++ b/Gatedge.K3Cloud.Utils/obj/Debug/net6.0/Gatedge.K3Cloud.Utils.csproj.FileListAbsolute.txt @@ -12,3 +12,17 @@ D:\格致金蝶\澳门新东方置地\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cl D:\格致金蝶\澳门新东方置地\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\refint\Gatedge.K3Cloud.Utils.dll D:\格致金蝶\澳门新东方置地\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.pdb D:\格致金蝶\澳门新东方置地\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\ref\Gatedge.K3Cloud.Utils.dll +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\bin\Debug\net6.0\Gatedge.K3Cloud.Utils.deps.json +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\bin\Debug\net6.0\Gatedge.K3Cloud.Utils.dll +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\bin\Debug\net6.0\Gatedge.K3Cloud.Utils.pdb +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\bin\Debug\net6.0\Kingdee.CDP.WebApi.SDK.dll +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.csproj.AssemblyReference.cache +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.GeneratedMSBuildEditorConfig.editorconfig +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.AssemblyInfoInputs.cache +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.AssemblyInfo.cs +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.csproj.CoreCompileInputs.cache +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge..A76F8AED.Up2Date +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.dll +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\refint\Gatedge.K3Cloud.Utils.dll +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\Gatedge.K3Cloud.Utils.pdb +E:\项目代码\澳门新东方\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\ref\Gatedge.K3Cloud.Utils.dll diff --git a/Gatedge.ScanCode/Controllers/AccountController.cs b/Gatedge.ScanCode/Controllers/AccountController.cs index ec5fef9..32fa517 100644 --- a/Gatedge.ScanCode/Controllers/AccountController.cs +++ b/Gatedge.ScanCode/Controllers/AccountController.cs @@ -157,13 +157,14 @@ namespace Gatedge.ScanCode.Controllers FormId = "SEC_User", FieldKeys = "FUserID,FName,FUserAccount,FOrgOrgId,FOrgOrgId.FNumber,FOrgOrgName", }; - //FilterList filterString = new FilterList(); - //FilterItem FNameItem = new FilterItem("FUserAccount", "67", dataCenter.UserName, "0"); - //filterString.AddFilterItem(FNameItem); - //queryParam.FilterString = filterString.GetFilterString(); + FilterList filterString = new FilterList(); + FilterItem FNameItem = new FilterItem("FUserAccount", "67", dataCenter.UserName, "0"); + filterString.AddFilterItem(FNameItem); + queryParam.FilterString = filterString.GetFilterString(); - queryParam.FilterString += @$"FUserAccount = '{dataCenter.UserName}'"; - var resultList = client.ExecuteBillQuery(queryParam.ToString()); + //queryParam.FilterString += @$"FUserAccount = '{dataCenter.UserName}'"; + var requestInfo = queryParam.ToString(); + var resultList = client.ExecuteBillQuery(requestInfo); //var resultString = client.BillQuery(queryParam.ToString()); //// 包含ErrorCode认定为失败 //if (resultString.Contains("ErrorCode")) @@ -180,7 +181,7 @@ namespace Gatedge.ScanCode.Controllers // return AjaxResult.Error(500, "用户名没有组织权限,或用户名不存在!"); //} List> result = new List>(); - foreach(var item in resultList) + foreach (var item in resultList) { Dictionary ResultItem = new Dictionary(); ResultItem.Add("FUserID", item[0].ToString()); diff --git a/Gatedge.ScanCode/Controllers/BarRecordController.cs b/Gatedge.ScanCode/Controllers/BarRecordController.cs index 5688ef8..e22e2cd 100644 --- a/Gatedge.ScanCode/Controllers/BarRecordController.cs +++ b/Gatedge.ScanCode/Controllers/BarRecordController.cs @@ -66,7 +66,7 @@ namespace Gatedge.ScanCode.Controllers FieldKeys = @"FID,FBillNO,FStatus,FOrgId,FCreatorId,FCreateDate,FErrorInfo,FIsPrinted,FBarCount,FBarSum,FMOInfo", Limit = param.PageSize, StartRow = param.PageSize * (param.PageIndex - 1), - FilterString = "", + //FilterString = "", OrderString = "FCreateDate DESC" }; //FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0"); diff --git a/Gatedge.ScanCode/Controllers/ScanRecordsController.cs b/Gatedge.ScanCode/Controllers/ScanRecordsController.cs index 90a3d3a..ec56340 100644 --- a/Gatedge.ScanCode/Controllers/ScanRecordsController.cs +++ b/Gatedge.ScanCode/Controllers/ScanRecordsController.cs @@ -82,7 +82,7 @@ FErrorInfo,FSubmitLot, FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,FIsPrinted", Limit = param.PageSize, StartRow = param.PageSize * (param.PageIndex - 1), - FilterString = "", + //FilterString = "", OrderString = "FCreateDate DESC" }; //FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0"); diff --git a/Gatedge.ScanCode/Controllers/SupportingInformationController.cs b/Gatedge.ScanCode/Controllers/SupportingInformationController.cs index c787a99..a7edf36 100644 --- a/Gatedge.ScanCode/Controllers/SupportingInformationController.cs +++ b/Gatedge.ScanCode/Controllers/SupportingInformationController.cs @@ -45,7 +45,7 @@ namespace Gatedge.ScanCode.Controllers FieldKeys = "FEntryID,FNumber,FDataValue", Limit = 0, StartRow = 0, - FilterString = "" + //FilterString = "" }; // 已审核未禁用 //queryParam.FilterString.Add(new FilterItem() diff --git a/Gatedge.ScanCode/appsettings.Development.json b/Gatedge.ScanCode/appsettings.Development.json index 948ed70..4f7dbad 100644 --- a/Gatedge.ScanCode/appsettings.Development.json +++ b/Gatedge.ScanCode/appsettings.Development.json @@ -20,12 +20,12 @@ "Kingdee": { "Default": [ { - "AcctID": "691daf73ebf580", + "AcctID": "69265c9384dc7a", "AppID": "NewOrient_TEST_API", - "AppSec": "d0ed3330411243b0a823f00f8bd2f49a", + "AppSec": "816eb1781925449b960c7c0f3459271e", "UserName": "ERP1", "LCID": 3076, - "ServerUrl": "http://127.0.0.1/k3cloud", + "ServerUrl": "http://58.252.252.77/k3cloud", "Timestamp": 300, "OrgNumber": "100" }