zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

master
赵新宇 2 weeks ago
parent
54bc505e00
commit
2ce2356a91
9 changed files with 27 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      API/TaskManager.EntityFramework/Repository/Repository.cs
  2. 2
      API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
  3. 7
      API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
  4. 3
      API/Wood.Service/Controllers/CherySupplierMrpMonthService.cs
  5. 5
      API/Wood.Service/Controllers/CherySupplierPoService.cs
  6. 16
      API/Wood.Service/Controllers/RecurringJobBaseController.cs
  7. 4
      API/Wood.Service/SystemManage/MessageService.cs
  8. 4
      API/Wood.Service/SystemManage/RoleService.cs

4
API/TaskManager.EntityFramework/Repository/Repository.cs
View File

@ -157,7 +157,7 @@ namespace TaskManager.EntityFramework.Repository
public class PagingParams public class PagingParams
{ {
private const int MaxPageSize = 10000; private const int MaxPageSize = 10000;
private int _pageSize = 10; private int _pageSize = 50;
public int PageNumber { get; set; } = 1; public int PageNumber { get; set; } = 1;
public int PageSize public int PageSize
@ -166,7 +166,7 @@ namespace TaskManager.EntityFramework.Repository
set => _pageSize = (value > MaxPageSize) ? MaxPageSize : value; set => _pageSize = (value > MaxPageSize) ? MaxPageSize : value;
} }
public string SortBy { get; set; } public string SortBy { get; set; }
public bool IsAscending { get; set; } = true; public bool IsAscending { get; set; } = false;
// 新增：过滤条件（键值对） // 新增：过滤条件（键值对）
public Dictionary<string, string> Filters { get; set; } = new(); public Dictionary<string, string> Filters { get; set; } = new();

2
API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -3,7 +3,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl> <_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\</_PublishTargetUrl>
<History>True|2025-07-03T01:24:39.8368797Z||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History> <History>True|2025-07-04T05:12:49.8129504Z||;True|2025-07-04T11:57:19.4307706+08:00||;True|2025-07-03T09:24:39.8368797+08:00||;True|2025-07-02T17:18:03.6042427+08:00||;True|2025-07-02T10:15:44.3531626+08:00||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

7
API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
View File

@ -28,6 +28,7 @@ namespace TaskManager.Controllers
{ {
if (plist.Count > 0) if (plist.Count > 0)
{ {
var requestDate = plist.First().RequestDate;
//List<SUPPLIER_CON_DATE> list = new List<SUPPLIER_CON_DATE>(); //List<SUPPLIER_CON_DATE> list = new List<SUPPLIER_CON_DATE>();
//plist.ForEach(p => //plist.ForEach(p =>
//{ //{
@ -130,6 +131,7 @@ namespace TaskManager.Controllers
itm.QuantityMeet30 = first.QuantityDemand30; itm.QuantityMeet30 = first.QuantityDemand30;
itm.QuantityMeet31 = first.QuantityDemand31; itm.QuantityMeet31 = first.QuantityDemand31;
itm.CreationTime = DateTime.Now; itm.CreationTime = DateTime.Now;
itm.RequestDate = requestDate;
} }
} }
@ -160,8 +162,8 @@ namespace TaskManager.Controllers
con.VentureSpecific = ""; con.VentureSpecific = "";
con.Measures = ""; con.Measures = "";
con.StartDate = p.StartDate; con.StartDate = p.StartDate;
con.QuantityMeet1 = p.QuantityDemand1 == null ? p.QuantityDemand1.Value : 0; con.QuantityMeet1 = p.QuantityDemand1 != null ? p.QuantityDemand1.Value : 0;
con.QuantityMeet2 = p.QuantityDemand2 == null ? p.QuantityDemand2.Value : 0; con.QuantityMeet2 = p.QuantityDemand2 != null ? p.QuantityDemand2.Value : 0;
con.QuantityMeet3 = p.QuantityDemand3; con.QuantityMeet3 = p.QuantityDemand3;
con.QuantityMeet4 = p.QuantityDemand4; con.QuantityMeet4 = p.QuantityDemand4;
con.QuantityMeet5 = p.QuantityDemand5; con.QuantityMeet5 = p.QuantityDemand5;
@ -192,6 +194,7 @@ namespace TaskManager.Controllers
con.QuantityMeet30 = p.QuantityDemand30; con.QuantityMeet30 = p.QuantityDemand30;
con.QuantityMeet31 = p.QuantityDemand31; con.QuantityMeet31 = p.QuantityDemand31;
con.CreationTime = DateTime.Now; con.CreationTime = DateTime.Now;
con.RequestDate = requestDate;
list.Add(con); list.Add(con);
} }

3
API/Wood.Service/Controllers/CherySupplierMrpMonthService.cs
View File

@ -46,6 +46,7 @@ namespace TaskManager.Controllers
{ {
if (plist.Count > 0) if (plist.Count > 0)
{ {
var requestDate = plist.FirstOrDefault()?.RequestDate;
//List<SUPPLIER_CON_MMRP> list = new List<SUPPLIER_CON_MMRP>(); //List<SUPPLIER_CON_MMRP> list = new List<SUPPLIER_CON_MMRP>();
//plist.ForEach(p => //plist.ForEach(p =>
//{ //{
@ -112,6 +113,7 @@ namespace TaskManager.Controllers
itm.QuantityMeet11 = first.QuantityDemand11; itm.QuantityMeet11 = first.QuantityDemand11;
itm.QuantityMeet12 = first.QuantityDemand12; itm.QuantityMeet12 = first.QuantityDemand12;
itm.CreationTime = DateTime.Now; itm.CreationTime = DateTime.Now;
itm.RequestDate = requestDate;
} }
} }
@ -155,6 +157,7 @@ namespace TaskManager.Controllers
con.QuantityMeet11 = p.QuantityDemand11; con.QuantityMeet11 = p.QuantityDemand11;
con.QuantityMeet12 = p.QuantityDemand12; con.QuantityMeet12 = p.QuantityDemand12;
con.CreationTime = DateTime.Now; con.CreationTime = DateTime.Now;
con.RequestDate = requestDate;
list.Add(con); list.Add(con);
} }
_jobDbContext.BulkInsert(list); _jobDbContext.BulkInsert(list);

5
API/Wood.Service/Controllers/CherySupplierPoService.cs
View File

@ -23,6 +23,7 @@ namespace TaskManager.Controllers
{ {
if (plist.Count > 0) if (plist.Count > 0)
{ {
var requestDate= plist.FirstOrDefault().RequestDate;
//List<SUPPLIER_CON_PO> list = new List<SUPPLIER_CON_PO>(); //List<SUPPLIER_CON_PO> list = new List<SUPPLIER_CON_PO>();
//plist.ForEach(p => //plist.ForEach(p =>
//{ //{
@ -67,6 +68,7 @@ namespace TaskManager.Controllers
itm.Measures = ""; itm.Measures = "";
itm.CreationTime = DateTime.Now; itm.CreationTime = DateTime.Now;
itm.RequestDate = requestDate;
} }
} }
@ -91,12 +93,13 @@ namespace TaskManager.Controllers
con.SupplierCode = "8EG"; con.SupplierCode = "8EG";
con.PurchaseOrder = p.PurchaseOrder; con.PurchaseOrder = p.PurchaseOrder;
con.SerialNumber = p.SerialNumber; con.SerialNumber = p.SerialNumber;
con.QuantityMeet = p.QuantityDelivery == null ? p.QuantityDelivery.Value : 0; con.QuantityMeet = p.QuantityDelivery != null ? p.QuantityDelivery.Value : 0;
con.FeedbackResults = "0"; con.FeedbackResults = "0";
con.VentureType = ""; con.VentureType = "";
con.VentureSpecific = ""; con.VentureSpecific = "";
con.Measures = ""; con.Measures = "";
con.CreationTime = DateTime.Now; con.CreationTime = DateTime.Now;
con.RequestDate=requestDate; ;
list.Add(con); list.Add(con);
} }
_jobDbContext.BulkInsert(list); _jobDbContext.BulkInsert(list);

16
API/Wood.Service/Controllers/RecurringJobBaseController.cs
View File

@ -121,16 +121,16 @@ namespace TaskManager.Controllers
} }
//string jsonContent = System.IO.File.ReadAllText("日物料需求计划.json"); //string jsonContent = System.IO.File.ReadAllText("日物料需求计划.json");
//string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json"); ////string jsonContent = System.IO.File.ReadAllText("M+6月物料需求计划1.json");
////string jsonContent = System.IO.File.ReadAllText("采购订单.json"); //////string jsonContent = System.IO.File.ReadAllText("采购订单.json");
////// string jsonContent = System.IO.File.ReadAllText("过焊装未过总装.json"); //////// string jsonContent = System.IO.File.ReadAllText("过焊装未过总装.json");
////// string jsonContent = System.IO.File.ReadAllText("计划协议.json"); //////// string jsonContent = System.IO.File.ReadAllText("计划协议.json");
//////string jsonContent = System.IO.File.ReadAllText("奇瑞RDC共享库存.json"); ////////string jsonContent = System.IO.File.ReadAllText("奇瑞RDC共享库存.json");
//////string jsonContent4 = System.IO.File.ReadAllText("日MRP状态监控.json"); ////////string jsonContent4 = System.IO.File.ReadAllText("日MRP状态监控.json");
//////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json"); ////////string jsonContent = System.IO.File.ReadAllText("整车月度生产计划1.json");
////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json"); //////string jsonContent = System.IO.File.ReadAllText("过涂装未过总装.json");
//return jsonContent; //return jsonContent;

4
API/Wood.Service/SystemManage/MessageService.cs
View File

@ -172,9 +172,11 @@ namespace Wood.Service.SystemManage
/// <returns></returns> /// <returns></returns>
public override async Task Delete(BaseIdListParam param) public override async Task Delete(BaseIdListParam param)
{ {
if (param.Ids.Any()) if (param.Ids.Any())
{ {
await _repository.FakeDeleteAsync(it => param.Ids.Contains(it.Id)); await _repository.FakeDeleteAsync(it => param.Ids.Contains(it.Id));
await _userMessageRepository.DeleteAsync(it => param.Ids.Contains(it.MessageId)); await _userMessageRepository.DeleteAsync(it => param.Ids.Contains(it.MessageId));
} }
} }

4
API/Wood.Service/SystemManage/RoleService.cs
View File

@ -82,12 +82,8 @@ namespace Wood.Service.SystemManage
{ {
await _roleRepository.InsertAsync(entity.Adapt<RoleEntity>()); await _roleRepository.InsertAsync(entity.Adapt<RoleEntity>());
//var firstEntity=await _roleRepository.GetFirstAsync(p => p.RoleName == entity.RoleName); //var firstEntity=await _roleRepository.GetFirstAsync(p => p.RoleName == entity.RoleName);
var getentity=await _roleRepository.GetFirstAsync(p => p.RoleName == entity.RoleName); var getentity=await _roleRepository.GetFirstAsync(p => p.RoleName == entity.RoleName);
await _menuAuthorizeRepository.InsertRangeAsync( await _menuAuthorizeRepository.InsertRangeAsync(
entity.Menus.Select(it => new MenuAuthorizeEntity() { RoleId = getentity.Id, MenuId = it }).ToList() entity.Menus.Select(it => new MenuAuthorizeEntity() { RoleId = getentity.Id, MenuId = it }).ToList()
); );

Write Preview
Loading…
Cancel
Save