Develop/Gatedge.NewOrientLandMark.BOS
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0

Browse Source
This commit is contained in:
朱斌
2025-12-02 15:52:58 +08:00
parent 08a56e0434
commit 0a9574e209
7 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gatedge.K3Cloud.Utils/Model/K3Request/Query.cs
View File

@@ -21,7 +21,7 @@ namespace Gatedge.K3Cloud.Utils.Model.K3Request
/// 过滤条件 /// 过滤条件
/// </summary> /// </summary>
//public List<FilterItem>? FilterString { get; set; } //public List<FilterItem>? FilterString { get; set; }
public string? FilterString { get; set; } public List<FilterItem>? FilterString { get; set; }
/// <summary> /// <summary>
/// 排序字段 /// 排序字段
/// </summary> /// </summary>

14
Gatedge.K3Cloud.Utils/obj/Debug/net6.0/Gatedge.K3Cloud.Utils.csproj.FileListAbsolute.txt
View File

@@ -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\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\Gatedge.K3Cloud.Utils.pdb
D:\格致金蝶\澳门新东方置地\Gatedge.NewOrientLandMark.BOS\Gatedge.K3Cloud.Utils\obj\Debug\net6.0\ref\Gatedge.K3Cloud.Utils.dll 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

15
Gatedge.ScanCode/Controllers/AccountController.cs
View File

@@ -157,13 +157,14 @@ namespace Gatedge.ScanCode.Controllers
FormId = "SEC_User", FormId = "SEC_User",
FieldKeys = "FUserID,FName,FUserAccount,FOrgOrgId,FOrgOrgId.FNumber,FOrgOrgName", FieldKeys = "FUserID,FName,FUserAccount,FOrgOrgId,FOrgOrgId.FNumber,FOrgOrgName",
}; };
//FilterList filterString = new FilterList(); FilterList filterString = new FilterList();
//FilterItem FNameItem = new FilterItem("FUserAccount", "67", dataCenter.UserName, "0"); FilterItem FNameItem = new FilterItem("FUserAccount", "67", dataCenter.UserName, "0");
//filterString.AddFilterItem(FNameItem); filterString.AddFilterItem(FNameItem);
//queryParam.FilterString = filterString.GetFilterString(); queryParam.FilterString = filterString.GetFilterString();
queryParam.FilterString += @$"FUserAccount = '{dataCenter.UserName}'"; //queryParam.FilterString += @$"FUserAccount = '{dataCenter.UserName}'";
var resultList = client.ExecuteBillQuery(queryParam.ToString()); var requestInfo = queryParam.ToString();
var resultList = client.ExecuteBillQuery(requestInfo);
//var resultString = client.BillQuery(queryParam.ToString()); //var resultString = client.BillQuery(queryParam.ToString());
//// 包含ErrorCode认定为失败 //// 包含ErrorCode认定为失败
//if (resultString.Contains("ErrorCode")) //if (resultString.Contains("ErrorCode"))
@@ -180,7 +181,7 @@ namespace Gatedge.ScanCode.Controllers
// return AjaxResult.Error(500, "用户名没有组织权限，或用户名不存在！"); // return AjaxResult.Error(500, "用户名没有组织权限，或用户名不存在！");
//} //}
List<Dictionary<string, string>> result = new List<Dictionary<string, string>>(); List<Dictionary<string, string>> result = new List<Dictionary<string, string>>();
foreach(var item in resultList) foreach (var item in resultList)
{ {
Dictionary<string, string> ResultItem = new Dictionary<string, string>(); Dictionary<string, string> ResultItem = new Dictionary<string, string>();
ResultItem.Add("FUserID", item[0].ToString()); ResultItem.Add("FUserID", item[0].ToString());

2
Gatedge.ScanCode/Controllers/BarRecordController.cs
View File

@@ -66,7 +66,7 @@ namespace Gatedge.ScanCode.Controllers
FieldKeys = @"FID,FBillNO,FStatus,FOrgId,FCreatorId,FCreateDate,FErrorInfo,FIsPrinted,FBarCount,FBarSum,FMOInfo", FieldKeys = @"FID,FBillNO,FStatus,FOrgId,FCreatorId,FCreateDate,FErrorInfo,FIsPrinted,FBarCount,FBarSum,FMOInfo",
Limit = param.PageSize, Limit = param.PageSize,
StartRow = param.PageSize * (param.PageIndex - 1), StartRow = param.PageSize * (param.PageIndex - 1),
FilterString = "", //FilterString = "",
OrderString = "FCreateDate DESC" OrderString = "FCreateDate DESC"
}; };
//FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0"); //FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");

2
Gatedge.ScanCode/Controllers/ScanRecordsController.cs
View File

@@ -82,7 +82,7 @@ FErrorInfo,FSubmitLot,
FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,FIsPrinted", FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,FIsPrinted",
Limit = param.PageSize, Limit = param.PageSize,
StartRow = param.PageSize * (param.PageIndex - 1), StartRow = param.PageSize * (param.PageIndex - 1),
FilterString = "", //FilterString = "",
OrderString = "FCreateDate DESC" OrderString = "FCreateDate DESC"
}; };
//FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0"); //FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");

2
Gatedge.ScanCode/Controllers/SupportingInformationController.cs
View File

@@ -45,7 +45,7 @@ namespace Gatedge.ScanCode.Controllers
FieldKeys = "FEntryID,FNumber,FDataValue", FieldKeys = "FEntryID,FNumber,FDataValue",
Limit = 0, Limit = 0,
StartRow = 0, StartRow = 0,
FilterString = "" //FilterString = ""
}; };
// 已审核未禁用 // 已审核未禁用
//queryParam.FilterString.Add(new FilterItem() //queryParam.FilterString.Add(new FilterItem()

6
Gatedge.ScanCode/appsettings.Development.json
View File

@@ -20,12 +20,12 @@
"Kingdee": { "Kingdee": {
"Default": [ "Default": [
{ {
"AcctID": "691daf73ebf580", "AcctID": "69265c9384dc7a",
"AppID": "NewOrient_TEST_API", "AppID": "NewOrient_TEST_API",
"AppSec": "d0ed3330411243b0a823f00f8bd2f49a", "AppSec": "816eb1781925449b960c7c0f3459271e",
"UserName": "ERP1", "UserName": "ERP1",
"LCID": 3076, "LCID": 3076,
"ServerUrl": "http://127.0.0.1/k3cloud", "ServerUrl": "http://58.252.252.77/k3cloud",
"Timestamp": 300, "Timestamp": 300,
"OrgNumber": "100" "OrgNumber": "100"
} }