Browse Source

修改

dev_DY_CC
郑勃旭 11 months ago
parent
commit
b63ef64487
  1. 4
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs
  2. 3
      be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json
  3. 1
      be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs
  4. 10
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs
  5. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs
  6. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs

4
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs

@ -149,7 +149,7 @@ public class AgentModule : AbpModule
public override void OnApplicationInitialization( public override void OnApplicationInitialization(
ApplicationInitializationContext context) ApplicationInitializationContext context)
{ {
context.AddBackgroundWorkerAsync<IncomingToWmsWorker>(); //context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>(); // context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
} }
} }

3
be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json

@ -3,6 +3,9 @@
"WSL": { "WSL": {
"commandName": "WSL2", "commandName": "WSL2",
"distributionName": "" "distributionName": ""
},
"配置文件 1": {
"commandName": "Project"
} }
} }
} }

1
be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/DocumentSettings/DocumentSettingAppService.cs

@ -35,6 +35,7 @@ public class DocumentSettingAppService
{ {
var type = input.Type; var type = input.Type;
var time = DateTime.ParseExact(input.Time, SharedConst.TimeFormat, CultureInfo.InvariantCulture); var time = DateTime.ParseExact(input.Time, SharedConst.TimeFormat, CultureInfo.InvariantCulture);
return await _documentManager.GenerateNumberAsync(type, time).ConfigureAwait(false); return await _documentManager.GenerateNumberAsync(type, time).ConfigureAwait(false);
} }
} }

10
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/ScrapNotes/ScrapNotePermissions.cs

@ -23,4 +23,14 @@ public static class ScrapNotePermissions
scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr)); scrapNotePermission.AddChild(Update, StorePermissionDefinitionProvider.L(StorePermissions.UpdateStr));
scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr)); scrapNotePermission.AddChild(Delete, StorePermissionDefinitionProvider.L(StorePermissions.DeleteStr));
} }
public static void AddProductScrapNotePermissions(this PermissionGroupDefinition permissionGroup)
{
_ = permissionGroup.AddPermission(ProductScrapNote, StorePermissionDefinitionProvider.L("ProductScrapNote"));
}
public static void AddWipScrapNotePermissions(this PermissionGroupDefinition permissionGroup)
{
_ = permissionGroup.AddPermission(WipScrapNote, StorePermissionDefinitionProvider.L("WipScrapNote"));
}
} }

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Permissions/StorePermissionDefinitionProvider.cs

@ -105,6 +105,9 @@ public class StorePermissionDefinitionProvider : PermissionDefinitionProvider
storeGroup.AddKittingPackagingNotePermission(); storeGroup.AddKittingPackagingNotePermission();
storeGroup.AddProductScrapNotePermissions();
storeGroup.AddWipScrapNotePermissions();
#region Jobs #region Jobs
storeGroup.AddPurchaseReceiptJobPermission(); storeGroup.AddPurchaseReceiptJobPermission();

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/CountJobs/CountJobAppService.cs

@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Castle.Components.DictionaryAdapter;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@ -243,7 +244,7 @@ public class CountJobAppService
public virtual async Task<List<CountJobDTO>> CreateWithConditionAsync(CountJobCreateRequestInput input) public virtual async Task<List<CountJobDTO>> CreateWithConditionAsync(CountJobCreateRequestInput input)
{ {
var entity = ObjectMapper.Map<CountJobCreateRequestInput, CountPlan>(input); var entity = ObjectMapper.Map<CountJobCreateRequestInput, CountPlan>(input);
var entityList = await _countJobManager.CreateWithConditionAsync(entity, input.PartCondition, input.LocCondition, input.StatusList).ConfigureAwait(false); var entityList = await _countJobManager.CreateWithConditionAsync(entity, input.PartCondition, input.LocCondition, input.StatusList).ConfigureAwait(false);
var dtoList = ObjectMapper.Map<List<CountJob>, List<CountJobDTO>>(entityList); var dtoList = ObjectMapper.Map<List<CountJob>, List<CountJobDTO>>(entityList);

Loading…
Cancel
Save