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

1

Browse Source
This commit is contained in:
liqionghai
2025-11-21 10:19:46 +08:00
parent ebffeefc98
commit ff810cd931
16 changed files with 174 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,34 +82,34 @@ FErrorInfo,FSubmitLot,
FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,FIsPrinted",
Limit = param.PageSize,
StartRow = param.PageSize * (param.PageIndex - 1),
FilterString = new List<FilterItem>(),
FilterString = "",
OrderString = "FCreateDate DESC"
};
FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");
queryParam.FilterString.Add(userItem);
// 如果存在FormId，加到过滤条件中
if (param.BillId != null)
{
queryParam.FilterString.Add(new FilterItem("FBillId.FID", "67", param.BillId, "0"));
}
// 如果存在FormId，加到过滤条件中
if (param.BarCode != null)
{
queryParam.FilterString.Add(new FilterItem("FBarCode", "67", param.BarCode, "0"));
}
if (param.BillNo != null)
{
queryParam.FilterString.Add(new FilterItem("FBillNo", "67", param.BillNo, "0"));
}
if (param.Status != null)
{
queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
}
if (param.SubmitLot != null)
{
queryParam.FilterString.Add(new FilterItem("FSubmitLot", "67", param.SubmitLot, "0"));
}
queryParam.FilterString.Add(userItem);
//FilterItem userItem = new FilterItem("FCreatorId", "67", param.UserId, "0");
//queryParam.FilterString.Add(userItem);
//// 如果存在FormId，加到过滤条件中
//if (param.BillId != null)
//{
// queryParam.FilterString.Add(new FilterItem("FBillId.FID", "67", param.BillId, "0"));
//}
//// 如果存在FormId，加到过滤条件中
//if (param.BarCode != null)
//{
// queryParam.FilterString.Add(new FilterItem("FBarCode", "67", param.BarCode, "0"));
//}
//if (param.BillNo != null)
//{
// queryParam.FilterString.Add(new FilterItem("FBillNo", "67", param.BillNo, "0"));
//}
//if (param.Status != null)
//{
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
//}
//if (param.SubmitLot != null)
//{
// queryParam.FilterString.Add(new FilterItem("FSubmitLot", "67", param.SubmitLot, "0"));
//}
//queryParam.FilterString.Add(userItem);
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
_utils.InitCloudApi(loginInfo);
IScanRecordsService service = new ScanRecordsService(_utils);
@@ -183,12 +183,12 @@ FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,F
FormId = this._FormId,
FieldKeys = "FID",
};
FilterList filterString = new FilterList();
FilterItem userItem = new FilterItem("FCreatorId", "67", Param.UserId, "0");
filterString.AddFilterItem(userItem);
FilterItem formidItem = new FilterItem("FFromId", "67", Param.BillId, "0");
filterString.AddFilterItem(formidItem);
queryParam.FilterString = filterString.GetFilterString();
//FilterList filterString = new FilterList();
//FilterItem userItem = new FilterItem("FCreatorId", "67", Param.UserId, "0");
//filterString.AddFilterItem(userItem);
//FilterItem formidItem = new FilterItem("FFromId", "67", Param.BillId, "0");
//filterString.AddFilterItem(formidItem);
//queryParam.FilterString = filterString.GetFilterString();
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
_utils.InitCloudApi(loginInfo);
IScanRecordsService service = new ScanRecordsService(_utils);