1
This commit is contained in:
@@ -20,7 +20,8 @@ namespace Gatedge.K3Cloud.Utils.Model.K3Request
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 过滤条件
|
/// 过滤条件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<FilterItem>? FilterString { get; set; }
|
//public List<FilterItem>? FilterString { get; set; }
|
||||||
|
public string? FilterString { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 排序字段
|
/// 排序字段
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -151,33 +151,34 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
lcid: kingdeeOption.LCID,
|
lcid: kingdeeOption.LCID,
|
||||||
orgNum: kingdeeOption.OrgNumber
|
orgNum: kingdeeOption.OrgNumber
|
||||||
);
|
);
|
||||||
|
client.LoginByAppSecret(kingdeeOption.AcctID, kingdeeOption.UserName, kingdeeOption.AppID, kingdeeOption.AppSec, kingdeeOption.LCID);
|
||||||
Query queryParam = new Query()
|
Query queryParam = new Query()
|
||||||
{
|
{
|
||||||
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}'";
|
||||||
|
var result = client.ExecuteBillQuery(queryParam.ToString());
|
||||||
|
//var resultString = client.BillQuery(queryParam.ToString());
|
||||||
|
//// 包含ErrorCode认定为失败
|
||||||
|
//if (resultString.Contains("ErrorCode"))
|
||||||
|
//{
|
||||||
|
// var errorResult = JsonSerializer.Deserialize<KingdeeResult>(resultString);
|
||||||
|
// var responseStatus = errorResult?.Result?.ResponseStatus;
|
||||||
|
// Exception error = new K3CloudException("查看单据列表出错", responseStatus);
|
||||||
|
// throw error;
|
||||||
|
//}
|
||||||
|
|
||||||
var resultString = client.BillQuery(queryParam.ToString());
|
//List<dynamic>? result = JsonSerializer.Deserialize<List<dynamic>>(resultString);
|
||||||
// 包含ErrorCode认定为失败
|
//if (result?.Count == 0)
|
||||||
if (resultString.Contains("ErrorCode"))
|
//{
|
||||||
{
|
// return AjaxResult.Error(500, "用户名没有组织权限,或用户名不存在!");
|
||||||
var errorResult = JsonSerializer.Deserialize<KingdeeResult>(resultString);
|
//}
|
||||||
var responseStatus = errorResult?.Result?.ResponseStatus;
|
|
||||||
Exception error = new K3CloudException("查看单据列表出错", responseStatus);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<dynamic>? result = JsonSerializer.Deserialize<List<dynamic>>(resultString);
|
|
||||||
if (result?.Count == 0)
|
|
||||||
{
|
|
||||||
return AjaxResult.Error(500, "用户名没有组织权限,或用户名不存在!");
|
|
||||||
}
|
|
||||||
|
|
||||||
return AjaxResult.Success(result);
|
return AjaxResult.Success(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,41 +66,41 @@ 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 = new List<FilterItem>(),
|
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");
|
||||||
queryParam.FilterString.Add(userItem);
|
//queryParam.FilterString.Add(userItem);
|
||||||
if (param.IsSubmit == null)
|
//if (param.IsSubmit == null)
|
||||||
{
|
//{
|
||||||
if (param.Status != null)
|
// if (param.Status != null)
|
||||||
{
|
// {
|
||||||
queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
if (param.IsSubmit == false)
|
//if (param.IsSubmit == false)
|
||||||
{
|
//{
|
||||||
|
|
||||||
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "1", "0"));
|
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "1", "0"));
|
||||||
|
|
||||||
}
|
//}
|
||||||
if (param.IsSubmit == true)
|
//if (param.IsSubmit == true)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "2", "1")
|
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "2", "1")
|
||||||
{
|
// {
|
||||||
Left = "((",
|
// Left = "((",
|
||||||
Right = ")"
|
// Right = ")"
|
||||||
});
|
// });
|
||||||
queryParam.FilterString.Add(new FilterItem("FStatus", "29", "3", "0")
|
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", "3", "0")
|
||||||
{
|
// {
|
||||||
Left = "(",
|
// Left = "(",
|
||||||
Right = "))"
|
// Right = "))"
|
||||||
});
|
// });
|
||||||
}
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
queryParam.FilterString.Add(userItem);
|
//queryParam.FilterString.Add(userItem);
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
IBarRecordService service = new BarRecordService(_utils);
|
IBarRecordService service = new BarRecordService(_utils);
|
||||||
|
|||||||
@@ -51,15 +51,15 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
Limit = Param.PageSize,
|
Limit = Param.PageSize,
|
||||||
StartRow = Param.PageSize * (Param.PageIndex - 1),
|
StartRow = Param.PageSize * (Param.PageIndex - 1),
|
||||||
};
|
};
|
||||||
// 已审核未禁用
|
//// 已审核未禁用
|
||||||
FilterList filterString = new FilterList().AddAuditedItems().AddNotCancelItems("FForbidStatus");
|
//FilterList filterString = new FilterList().AddAuditedItems().AddNotCancelItems("FForbidStatus");
|
||||||
if (Param.QueryString != string.Empty && Param.QueryString != null)
|
//if (Param.QueryString != string.Empty && Param.QueryString != null)
|
||||||
{
|
//{
|
||||||
FilterItem NamefilterItem = new FilterItem("(", "FNAME", "17", Param.QueryString, "", "1");
|
// FilterItem NamefilterItem = new FilterItem("(", "FNAME", "17", Param.QueryString, "", "1");
|
||||||
FilterItem NumberfilterItem = new FilterItem("", "FNUMBER", "17", Param.QueryString, ")", "0");
|
// FilterItem NumberfilterItem = new FilterItem("", "FNUMBER", "17", Param.QueryString, ")", "0");
|
||||||
filterString.AddFilterItem(NamefilterItem).AddFilterItem(NumberfilterItem);
|
// filterString.AddFilterItem(NamefilterItem).AddFilterItem(NumberfilterItem);
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
// queryParam.FilterString = filterString.GetFilterString();
|
||||||
}
|
//}
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
var data = _utils.QueryList(queryParam);
|
var data = _utils.QueryList(queryParam);
|
||||||
|
|||||||
@@ -41,13 +41,13 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
//Limit = Param.PageSize,
|
//Limit = Param.PageSize,
|
||||||
//StartRow = Param.PageSize * (Param.PageIndex - 1),
|
//StartRow = Param.PageSize * (Param.PageIndex - 1),
|
||||||
};
|
};
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
if (Param.QueryString != string.Empty && Param.QueryString != null)
|
//if (Param.QueryString != string.Empty && Param.QueryString != null)
|
||||||
{
|
//{
|
||||||
FilterItem filterItem = new FilterItem("FNumber", "17", Param.QueryString, "0");
|
// FilterItem filterItem = new FilterItem("FNumber", "17", Param.QueryString, "0");
|
||||||
filterString.AddFilterItem(filterItem);
|
// filterString.AddFilterItem(filterItem);
|
||||||
}
|
//}
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
|
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
|
|||||||
@@ -82,34 +82,34 @@ 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 = new List<FilterItem>(),
|
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");
|
||||||
queryParam.FilterString.Add(userItem);
|
//queryParam.FilterString.Add(userItem);
|
||||||
// 如果存在FormId,加到过滤条件中
|
//// 如果存在FormId,加到过滤条件中
|
||||||
if (param.BillId != null)
|
//if (param.BillId != null)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FBillId.FID", "67", param.BillId, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FBillId.FID", "67", param.BillId, "0"));
|
||||||
}
|
//}
|
||||||
// 如果存在FormId,加到过滤条件中
|
//// 如果存在FormId,加到过滤条件中
|
||||||
if (param.BarCode != null)
|
//if (param.BarCode != null)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FBarCode", "67", param.BarCode, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FBarCode", "67", param.BarCode, "0"));
|
||||||
}
|
//}
|
||||||
if (param.BillNo != null)
|
//if (param.BillNo != null)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FBillNo", "67", param.BillNo, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FBillNo", "67", param.BillNo, "0"));
|
||||||
}
|
//}
|
||||||
if (param.Status != null)
|
//if (param.Status != null)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FStatus", "29", param.Status, "0"));
|
||||||
}
|
//}
|
||||||
if (param.SubmitLot != null)
|
//if (param.SubmitLot != null)
|
||||||
{
|
//{
|
||||||
queryParam.FilterString.Add(new FilterItem("FSubmitLot", "67", param.SubmitLot, "0"));
|
// queryParam.FilterString.Add(new FilterItem("FSubmitLot", "67", param.SubmitLot, "0"));
|
||||||
}
|
//}
|
||||||
queryParam.FilterString.Add(userItem);
|
//queryParam.FilterString.Add(userItem);
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
IScanRecordsService service = new ScanRecordsService(_utils);
|
IScanRecordsService service = new ScanRecordsService(_utils);
|
||||||
@@ -183,12 +183,12 @@ FResultBillId.FID,FResultBillId.FName,FResultBillNo,FResultId,FResultIsChecked,F
|
|||||||
FormId = this._FormId,
|
FormId = this._FormId,
|
||||||
FieldKeys = "FID",
|
FieldKeys = "FID",
|
||||||
};
|
};
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
FilterItem userItem = new FilterItem("FCreatorId", "67", Param.UserId, "0");
|
//FilterItem userItem = new FilterItem("FCreatorId", "67", Param.UserId, "0");
|
||||||
filterString.AddFilterItem(userItem);
|
//filterString.AddFilterItem(userItem);
|
||||||
FilterItem formidItem = new FilterItem("FFromId", "67", Param.BillId, "0");
|
//FilterItem formidItem = new FilterItem("FFromId", "67", Param.BillId, "0");
|
||||||
filterString.AddFilterItem(formidItem);
|
//filterString.AddFilterItem(formidItem);
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
IScanRecordsService service = new ScanRecordsService(_utils);
|
IScanRecordsService service = new ScanRecordsService(_utils);
|
||||||
|
|||||||
@@ -54,19 +54,19 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
Limit = Param.PageSize,
|
Limit = Param.PageSize,
|
||||||
StartRow = Param.PageSize * (Param.PageIndex - 1),
|
StartRow = Param.PageSize * (Param.PageIndex - 1),
|
||||||
};
|
};
|
||||||
// 已审核未禁用
|
//// 已审核未禁用
|
||||||
FilterList filterString = new FilterList().AddAuditedItems().AddNotCancelItems("FForbidStatus");
|
//FilterList filterString = new FilterList().AddAuditedItems().AddNotCancelItems("FForbidStatus");
|
||||||
if (Param.QueryString != string.Empty && Param.QueryString != null)
|
//if (Param.QueryString != string.Empty && Param.QueryString != null)
|
||||||
{
|
//{
|
||||||
FilterItem NamefilterItem = new FilterItem("(", "FNAME", "17", Param.QueryString, "", "1");
|
// FilterItem NamefilterItem = new FilterItem("(", "FNAME", "17", Param.QueryString, "", "1");
|
||||||
FilterItem NumberfilterItem = new FilterItem("", "FNUMBER", "17", Param.QueryString, ")", "0");
|
// FilterItem NumberfilterItem = new FilterItem("", "FNUMBER", "17", Param.QueryString, ")", "0");
|
||||||
//过滤名称和编码
|
// //过滤名称和编码
|
||||||
filterString.AddFilterItem(NamefilterItem).AddFilterItem(NumberfilterItem);
|
// filterString.AddFilterItem(NamefilterItem).AddFilterItem(NumberfilterItem);
|
||||||
}
|
//}
|
||||||
// 过滤组织
|
//// 过滤组织
|
||||||
FilterItem FOrgItem = new FilterItem("FUseOrgId.FNumber", "67", User.FindFirstValue("orgNum"), "0");
|
//FilterItem FOrgItem = new FilterItem("FUseOrgId.FNumber", "67", User.FindFirstValue("orgNum"), "0");
|
||||||
filterString.AddFilterItem(FOrgItem);
|
//filterString.AddFilterItem(FOrgItem);
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
IStockService service = new StockService(_utils);
|
IStockService service = new StockService(_utils);
|
||||||
|
|||||||
@@ -56,19 +56,19 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
FormId = "BD_FLEXVALUES",
|
FormId = "BD_FLEXVALUES",
|
||||||
FieldKeys = "FEntity_FEntryId,FID,FNUMBER,FNAME,FFlexValueNumber,FFlexValueName",
|
FieldKeys = "FEntity_FEntryId,FID,FNUMBER,FNAME,FFlexValueNumber,FFlexValueName",
|
||||||
};
|
};
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
if (Param.QueryString != string.Empty && Param.QueryString != null)
|
//if (Param.QueryString != string.Empty && Param.QueryString != null)
|
||||||
{
|
//{
|
||||||
FilterItem filterItem = new FilterItem("FFlexValueName", "17", Param.QueryString, "0");
|
// FilterItem filterItem = new FilterItem("FFlexValueName", "17", Param.QueryString, "0");
|
||||||
filterString.AddFilterItem(filterItem);
|
// filterString.AddFilterItem(filterItem);
|
||||||
}
|
//}
|
||||||
for (int i = 0; i < stockFlexItem.GetArrayLength(); i++)
|
//for (int i = 0; i < stockFlexItem.GetArrayLength(); i++)
|
||||||
{
|
//{
|
||||||
//循环追加过滤条件仓位集ID,0:并且,1;或者
|
// //循环追加过滤条件仓位集ID,0:并且,1;或者
|
||||||
FilterItem fbillnoItem = new FilterItem("FID", "67", stockFlexItem[i].GetProperty("FlexId_Id").ToString(), "1");
|
// FilterItem fbillnoItem = new FilterItem("FID", "67", stockFlexItem[i].GetProperty("FlexId_Id").ToString(), "1");
|
||||||
filterString.AddFilterItem(fbillnoItem);
|
// filterString.AddFilterItem(fbillnoItem);
|
||||||
}
|
//}
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
var data = _utils.QueryList(queryParam);
|
var data = _utils.QueryList(queryParam);
|
||||||
return AjaxResult.Success(data).AddBillId(_FormId);
|
return AjaxResult.Success(data).AddBillId(_FormId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,18 +45,18 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
FieldKeys = "FEntryID,FNumber,FDataValue",
|
FieldKeys = "FEntryID,FNumber,FDataValue",
|
||||||
Limit = 0,
|
Limit = 0,
|
||||||
StartRow = 0,
|
StartRow = 0,
|
||||||
FilterString = new List<FilterItem>()
|
FilterString = ""
|
||||||
};
|
};
|
||||||
// 已审核未禁用
|
// 已审核未禁用
|
||||||
queryParam.FilterString.Add(new FilterItem()
|
//queryParam.FilterString.Add(new FilterItem()
|
||||||
{
|
//{
|
||||||
Left = "",
|
// Left = "",
|
||||||
FieldName = "FId.FNumber",
|
// FieldName = "FId.FNumber",
|
||||||
Compare = "67",
|
// Compare = "67",
|
||||||
Value = "01",
|
// Value = "01",
|
||||||
Right = "",
|
// Right = "",
|
||||||
Logic = "",
|
// Logic = "",
|
||||||
});
|
//});
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
_utils.InitCloudApi(loginInfo);
|
_utils.InitCloudApi(loginInfo);
|
||||||
ISupportingInformationService service = new SupportingInformationService(_utils);
|
ISupportingInformationService service = new SupportingInformationService(_utils);
|
||||||
|
|||||||
@@ -48,9 +48,9 @@ namespace Gatedge.ScanCode.Controllers
|
|||||||
FieldKeys = "FID",
|
FieldKeys = "FID",
|
||||||
OrderString = "FID desc"
|
OrderString = "FID desc"
|
||||||
};
|
};
|
||||||
// 已审核
|
//// 已审核
|
||||||
FilterList filterString = new FilterList().AddAuditedItems();
|
//FilterList filterString = new FilterList().AddAuditedItems();
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
var loginInfo = User.GetLoginInfoByClaimsPrincipal();
|
||||||
// 需要获取具有BOS权限的用户
|
// 需要获取具有BOS权限的用户
|
||||||
var k3Apiutil = _utils.GetDefaultK3CloudApiUtil(loginInfo);
|
var k3Apiutil = _utils.GetDefaultK3CloudApiUtil(loginInfo);
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||||
<OutputType>Library</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -65,19 +65,19 @@ namespace Gatedge.ScanCode.Services
|
|||||||
FieldKeys = "FID,FBarCode",
|
FieldKeys = "FID,FBarCode",
|
||||||
|
|
||||||
};
|
};
|
||||||
// 过滤
|
//// 过滤
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
// 添加过滤条件// 条码
|
//// 添加过滤条件// 条码
|
||||||
filterString.AddFilterItem(new FilterItem()
|
//filterString.AddFilterItem(new FilterItem()
|
||||||
{
|
//{
|
||||||
Left = "",
|
// Left = "",
|
||||||
FieldName = "FBarCode",
|
// FieldName = "FBarCode",
|
||||||
Compare = "67",
|
// Compare = "67",
|
||||||
Value = barCode,
|
// Value = barCode,
|
||||||
Right = "",
|
// Right = "",
|
||||||
Logic = "0"
|
// Logic = "0"
|
||||||
});
|
//});
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
|
|
||||||
var data = this.List(queryParam);
|
var data = this.List(queryParam);
|
||||||
if (data.List.Count == 0)
|
if (data.List.Count == 0)
|
||||||
|
|||||||
@@ -74,10 +74,10 @@ namespace Gatedge.ScanCode.Services
|
|||||||
Limit = 2000,
|
Limit = 2000,
|
||||||
StartRow = 0,
|
StartRow = 0,
|
||||||
};
|
};
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
FilterItem filterItem = new FilterItem("FBarCode", "67", barCode, "0");
|
//FilterItem filterItem = new FilterItem("FBarCode", "67", barCode, "0");
|
||||||
filterString.AddFilterItem(filterItem);
|
//filterString.AddFilterItem(filterItem);
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
return List(queryParam);
|
return List(queryParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -212,10 +212,10 @@ namespace Gatedge.ScanCode.Services
|
|||||||
Limit = 2000,
|
Limit = 2000,
|
||||||
StartRow = 0,
|
StartRow = 0,
|
||||||
};
|
};
|
||||||
FilterList filterString = new FilterList();
|
//FilterList filterString = new FilterList();
|
||||||
FilterItem filterItem = new FilterItem("FBarCode", "67", barCode, "0");
|
//FilterItem filterItem = new FilterItem("FBarCode", "67", barCode, "0");
|
||||||
filterString.AddFilterItem(filterItem);
|
//filterString.AddFilterItem(filterItem);
|
||||||
queryParam.FilterString = filterString.GetFilterString();
|
//queryParam.FilterString = filterString.GetFilterString();
|
||||||
return List(queryParam);
|
return List(queryParam);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -19,48 +19,14 @@
|
|||||||
// 金蝶第三方设置
|
// 金蝶第三方设置
|
||||||
"Kingdee": {
|
"Kingdee": {
|
||||||
"Default": [
|
"Default": [
|
||||||
// 本地
|
|
||||||
{
|
{
|
||||||
"AcctID": "68d01db42795be",
|
"AcctID": "691daf73ebf580",
|
||||||
"AppID": "324230_369J07sG0qD51Zzo426Py9yMTMQVWrPE",
|
"AppID": "NewOrient_TEST_API",
|
||||||
"AppSec": "3fc411a6b17644479ac8683e0a5751cc",
|
"AppSec": "d0ed3330411243b0a823f00f8bd2f49a",
|
||||||
"UserName": "demo",
|
"UserName": "ERP1",
|
||||||
"LCID": 2052,
|
"LCID": 3076,
|
||||||
"ServerUrl": "http://127.0.0.1/K3Cloud",
|
"ServerUrl": "http://58.252.252.77/k3cloud",
|
||||||
"Timestamp": 30,
|
"Timestamp": 300,
|
||||||
"OrgNumber": "100"
|
|
||||||
},
|
|
||||||
//珠海市汇威精密制造有限公司
|
|
||||||
{
|
|
||||||
"AcctID": "6324278eedcfa7",
|
|
||||||
"AppID": "317092_64cBxYhL1pG87f8G1+1PSbTvVs4WWNqs",
|
|
||||||
"AppSec": "77b7decc97aa4147a5c631f0dff13a08",
|
|
||||||
"UserName": "lbr",
|
|
||||||
"LCID": 2052,
|
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
|
||||||
"Timestamp": 30,
|
|
||||||
"OrgNumber": "100"
|
|
||||||
},
|
|
||||||
// 汇威测试20250801
|
|
||||||
{
|
|
||||||
"AcctID": "688c36d57dd18c",
|
|
||||||
"AppID": "319753_Td5I16kEQmD56X9o263P26+GVrQ/xsOO",
|
|
||||||
"AppSec": "f7dc83340a1048a19f6b4b5c8e948a3b",
|
|
||||||
"UserName": "lbr",
|
|
||||||
"LCID": 2052,
|
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
|
||||||
"Timestamp": 30,
|
|
||||||
"OrgNumber": "100"
|
|
||||||
},
|
|
||||||
// 汇威测试20251020
|
|
||||||
{
|
|
||||||
"AcctID": "68f749a8680a64",
|
|
||||||
"AppID": "326327_xYdCT6uOyrk57Z8E6+2M68/vQuRUTOnO",
|
|
||||||
"AppSec": "8b99a7bdc19b445ea3ffc0e91f9f9d78",
|
|
||||||
"UserName": "lbr",
|
|
||||||
"LCID": 2052,
|
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
|
||||||
"Timestamp": 30,
|
|
||||||
"OrgNumber": "100"
|
"OrgNumber": "100"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -21,37 +21,14 @@
|
|||||||
// 金蝶第三方设置
|
// 金蝶第三方设置
|
||||||
"Kingdee": {
|
"Kingdee": {
|
||||||
"Default": [
|
"Default": [
|
||||||
//珠海市汇威精密制造有限公司
|
|
||||||
{
|
{
|
||||||
"AcctID": "6324278eedcfa7",
|
"AcctID": "691daf73ebf580",
|
||||||
"AppID": "317092_64cBxYhL1pG87f8G1+1PSbTvVs4WWNqs",
|
"AppID": "NewOrient_TEST_API",
|
||||||
"AppSec": "77b7decc97aa4147a5c631f0dff13a08",
|
"AppSec": "d0ed3330411243b0a823f00f8bd2f49a",
|
||||||
"UserName": "lbr",
|
"UserName": "ERP1",
|
||||||
"LCID": 2052,
|
"LCID": 3076,
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
"ServerUrl": "http://58.252.252.77/k3cloud",
|
||||||
"Timestamp": 30,
|
"Timestamp": 300,
|
||||||
"OrgNumber": "100"
|
|
||||||
},
|
|
||||||
// 汇威测试20250801
|
|
||||||
{
|
|
||||||
"AcctID": "688c36d57dd18c",
|
|
||||||
"AppID": "319753_Td5I16kEQmD56X9o263P26+GVrQ/xsOO",
|
|
||||||
"AppSec": "f7dc83340a1048a19f6b4b5c8e948a3b",
|
|
||||||
"UserName": "lbr",
|
|
||||||
"LCID": 2052,
|
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
|
||||||
"Timestamp": 30,
|
|
||||||
"OrgNumber": "100"
|
|
||||||
},
|
|
||||||
// 汇威测试20251020
|
|
||||||
{
|
|
||||||
"AcctID": "68f749a8680a64",
|
|
||||||
"AppID": "326327_xYdCT6uOyrk57Z8E6+2M68/vQuRUTOnO",
|
|
||||||
"AppSec": "8b99a7bdc19b445ea3ffc0e91f9f9d78",
|
|
||||||
"UserName": "lbr",
|
|
||||||
"LCID": 2052,
|
|
||||||
"ServerUrl": "http://61.145.228.58:9656/k3cloud",
|
|
||||||
"Timestamp": 30,
|
|
||||||
"OrgNumber": "100"
|
"OrgNumber": "100"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user