From b2c6ce78c7c95c37f9c3e9ea11e86a7af7b0d3fd Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 05 十一月 2025 09:35:30 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 25
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IBasicService/IDailySequenceService.cs | 19
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_DTO/Allocate/AllocateDto.cs | 139 +++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IAllocateService/IAllocateService.cs | 18
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 7
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IAllocateService/WIDESEA_IAllocateService.csproj | 14
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/DT_DailySequence.cs | 35
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/MaterialUnitService.cs | 168 ++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/DailySequenceService.cs | 245 ++++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 3
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer.sln | 33
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs | 379 +++++----
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs | 67 +
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 463 +++++------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 88 +
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs | 8
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs | 8
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj | 1
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs | 126 +++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 233 ++++++
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 4
项目代码/WMS无仓储版/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm | 0
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterialUnitService.cs | 6
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_ AllocateOrder.cs | 18
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 2
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 24
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs | 40
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 2
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 35
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/WIDESEA_AllocateService.csproj | 15
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 8
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_AllocateOrderDetail.cs | 12
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs | 4
38 files changed, 1,783 insertions(+), 466 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
index 693c3d5..3697e54 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
index 5b3e2a2..ec63771 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shm"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
index 331d108..7509215 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-wal"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
index 51dcca2..05b5665 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
index 0af9ce3..1c21c60 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shm"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
index ec8b5bb..ba67a4e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-wal"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs"
new file mode 100644
index 0000000..0f3e492
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IAllocateService;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Allocate;
+
+namespace WIDESEA_AllocateService
+{
+
+ public partial class AllocateService : ServiceBase<Dt_AllocateOrder, IRepository<Dt_AllocateOrder>>, IAllocateService
+ {
+ public AllocateService(IRepository<Dt_AllocateOrder> BaseDal) : base(BaseDal)
+ {
+ }
+
+ public IRepository<Dt_AllocateOrder> Repository => BaseDal;
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/WIDESEA_AllocateService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/WIDESEA_AllocateService.csproj"
new file mode 100644
index 0000000..fe117a5
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_AllocateService/WIDESEA_AllocateService.csproj"
@@ -0,0 +1,15 @@
+锘�<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
+ <ProjectReference Include="..\WIDESEA_IAllocateService\WIDESEA_IAllocateService.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/DailySequenceService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/DailySequenceService.cs"
new file mode 100644
index 0000000..6d287d8
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/DailySequenceService.cs"
@@ -0,0 +1,245 @@
+锘縰sing Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using SqlSugar;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_IBasicService;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Basic;
+
+namespace WIDESEA_BasicService
+{
+ public class DailySequenceService : ServiceBase<DT_DailySequence, IRepository<DT_DailySequence>>, IDailySequenceService
+ {
+ private readonly ILogger<DailySequenceService> _logger;
+ private readonly IMemoryCache _cache;
+
+ private readonly SemaphoreSlim _lock = new(1, 1);
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ public DailySequenceService(IRepository<DT_DailySequence> BaseDal, ILogger<DailySequenceService> logger, IMemoryCache cache, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ {
+ _logger = logger;
+ _cache = cache;
+ _unitOfWorkManage = unitOfWorkManage;
+ }
+
+ public IRepository<DT_DailySequence> Repository => BaseDal;
+
+
+ public async Task<int> GetNextSequenceAsync()
+ {
+ return await GetNextSequenceAsync("MESBarcode");
+ }
+ public async Task<int> GetNextSequence2Async(string sequenceKey)
+ {
+ var today = DateTime.Today;
+ var cacheKey = $"DailySequence_{sequenceKey}_{today:yyyyMMdd}";
+
+
+ await _lock.WaitAsync();
+ try
+ {
+ // 鍏堟鏌ョ紦瀛�
+ if (_cache.TryGetValue(cacheKey, out int currentValue))
+ {
+ currentValue++;
+ _cache.Set(cacheKey, currentValue, TimeSpan.FromHours(24));
+ return currentValue;
+ }
+
+ // 缂撳瓨涓病鏈夛紝浠庢暟鎹簱鑾峰彇鎴栧垱寤�
+ var result= await Repository.Db.Ado.UseTranAsync(async () =>
+ {
+ // 娓呯悊鏄ㄥぉ鐨勮褰�
+ var yesterday = today.AddDays(-1);
+ await Repository.Db.Deleteable<DT_DailySequence>()
+ .Where(x => x.SequenceDate == yesterday && x.SequenceKey == sequenceKey)
+ .ExecuteCommandAsync();
+
+ // 鏌ユ壘鎴栧垱寤轰粖澶╃殑璁板綍
+ var sequence = await Repository.Db.Queryable<DT_DailySequence>()
+ .Where(x => x.SequenceDate == today && x.SequenceKey == sequenceKey)
+ .With(SqlWith.UpdLock)
+ .FirstAsync();
+
+ int nextValue;
+ if (sequence == null)
+ {
+ sequence = new DT_DailySequence
+ {
+ SequenceDate = today,
+ SequenceKey = sequenceKey,
+ CurrentValue = 1,
+
+ };
+ await Repository.Db.Insertable(sequence).ExecuteReturnEntityAsync();
+ nextValue = 1;
+ }
+ else
+ {
+ nextValue = sequence.CurrentValue + 1;
+ sequence.CurrentValue = nextValue;
+
+ await Repository.Db.Updateable(sequence).ExecuteCommandAsync();
+ }
+
+ // 璁剧疆缂撳瓨
+ _cache.Set(cacheKey, nextValue, TimeSpan.FromHours(24));
+ return nextValue;
+ });
+ return result.Data;
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "鑾峰彇搴忓垪鍙峰け璐ワ紝SequenceKey: {SequenceKey}", sequenceKey);
+ throw;
+ }
+ finally
+ {
+ _lock.Release();
+ }
+ }
+
+ public async Task<int> GetNextSequenceAsync(string sequenceKey)
+ {
+ var today = DateTime.Today;
+ var cacheKey = $"DailySequence_{sequenceKey}_{today:yyyyMMdd}";
+
+
+ await _lock.WaitAsync();
+ try
+ {
+ // 妫�鏌ョ紦瀛樹腑鏄惁鏈変粖澶╃殑搴忓垪鍊�
+ if (!_cache.TryGetValue(cacheKey, out int currentValue))
+ {
+ // 缂撳瓨涓病鏈夛紝浠庢暟鎹簱鑾峰彇鎴栧垱寤�
+ currentValue = await GetOrCreateSequenceFromDatabase(today, sequenceKey);
+ // 璁剧疆缂撳瓨锛岃繃鏈熸椂闂翠负浠婂ぉ缁撴潫
+ var _cacheOptions = new MemoryCacheEntryOptions
+ {
+ AbsoluteExpiration = today.AddDays(1)
+ };
+ _cache.Set(cacheKey, currentValue, _cacheOptions);
+ return currentValue;
+ }
+
+ // 缂撳瓨涓瓨鍦紝閫掑骞舵洿鏂扮紦瀛�
+ currentValue++;
+ var cacheOptions = new MemoryCacheEntryOptions
+ {
+ AbsoluteExpiration = today.AddDays(1)
+ };
+ _cache.Set(cacheKey, currentValue, cacheOptions);
+
+ // 寮傛鏇存柊鍒版暟鎹簱
+ _ = Task.Run(async () =>
+ {
+ try
+ {
+ await UpdateSequenceInDatabase(today, sequenceKey, currentValue);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogWarning(ex, "寮傛鏇存柊搴忓垪鍒版暟鎹簱澶辫触锛孲equenceKey: {SequenceKey}", sequenceKey);
+ }
+ });
+
+ return currentValue;
+ }
+ finally
+ {
+ _lock.Release();
+ }
+ }
+ private async Task<int> GetOrCreateSequenceFromDatabase(DateTime date, string sequenceKey)
+ {
+ var result= await Repository.Db.Ado.UseTranAsync(async () =>
+ {
+ var sequence = await Repository.Db.Queryable<DT_DailySequence>()
+ .Where(x => x.SequenceDate == date && x.SequenceKey == sequenceKey)
+ .With(SqlWith.UpdLock)
+ .FirstAsync();
+
+ if (sequence == null)
+ {
+ sequence = new DT_DailySequence
+ {
+ SequenceDate = date,
+ SequenceKey = sequenceKey,
+ CurrentValue = 1,
+
+ };
+ await Repository.Db.Insertable(sequence).ExecuteReturnEntityAsync();
+ return 1;
+ }
+ else
+ {
+ var nextValue = sequence.CurrentValue + 1;
+ sequence.CurrentValue = nextValue;
+
+ await Repository.Db.Updateable(sequence).ExecuteCommandAsync();
+ return nextValue;
+ }
+ }) ;
+ return result.Data;
+ }
+
+ private async Task UpdateSequenceInDatabase(DateTime date, string sequenceKey, int value)
+ {
+ var sequence = await Repository.Db.Queryable<DT_DailySequence>()
+ .Where(x => x.SequenceDate == date && x.SequenceKey == sequenceKey)
+ .FirstAsync();
+
+ if (sequence != null)
+ {
+ sequence.CurrentValue = value;
+
+ await Repository.Db.Updateable(sequence).ExecuteCommandAsync();
+ }
+ else
+ {
+ // 濡傛灉鏁版嵁搴撹褰曚笉瀛樺湪锛屽垯鍒涘缓
+ sequence = new DT_DailySequence
+ {
+ SequenceDate = date,
+ SequenceKey = sequenceKey,
+ CurrentValue = value,
+
+ };
+ await Repository.Db.Insertable(sequence).ExecuteCommandAsync();
+ }
+ }
+
+ public async Task CleanOldSequencesAsync(int keepDays = 30)
+ {
+ try
+ {
+ var deleteBefore = DateTime.Today.AddDays(-keepDays);
+ var deletedCount = await Repository.Db.Deleteable<DT_DailySequence>()
+ .Where(x => x.SequenceDate < deleteBefore)
+ .ExecuteCommandAsync();
+
+ for (int i = 1; i < keepDays; i++) {
+ var cacheKey = $"DailySequence_MESBarcode_{DateTime.Now.AddDays(-i):yyyyMMdd}";
+ _cache.Remove(cacheKey);
+ }
+
+
+ _logger.LogInformation("娓呯悊浜� {Count} 鏉� {Days} 澶╁墠鐨勫簭鍒楄褰�", deletedCount, keepDays);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "娓呯悊鏃у簭鍒楄褰曞け璐�");
+ throw;
+ }
+ }
+ }
+
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
index 5bc2bc6..2f3acff 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ESSApiService.cs"
@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Text.Json;
+using System.Threading;
using System.Threading.Tasks;
using WIDESEA_DTO.Basic;
using WIDESEA_IBasicService;
@@ -27,10 +28,17 @@
/// </summary>
public async Task MoveContainerAsync(MoveContainerRequest request)
{
- var url = "conveyor/moveContainer";
+ try
+ {
+ var url = "conveyor/moveContainer";
- var result = await PostAsync<MoveContainerRequest, ApiResponse<string>>(url, request);
-
+ var result = await PostAsync<MoveContainerRequest, ApiResponse<string>>(url, request);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation("瀹瑰櫒娴佸姩澶辫触: " + ex.Message);
+
+ }
}
/// <summary>
@@ -40,21 +48,30 @@
/// <returns></returns>
public async Task<bool> CreateTaskAsync(TaskModel request)
{
- _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(request));
- var url = "task/create";
-
- var result = await PostAsync<TaskModel, ApiResponse<TasksData>>(url, request);
- if (result != null && result.Code == 0)
+ try
{
- return true;
+ _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(request));
+ var url = "task/create";
+
+ var result = await PostAsync<TaskModel, ApiResponse<TasksData>>(url, request);
+ if (result != null && result.Code == 0)
+ {
+ return true;
+ }
+ return false;
}
- return false;
+ catch (Exception ex)
+ {
+ _logger.LogInformation("鍒涘缓浠诲姟澶辫触: " + ex.Message);
+ return false;
+ }
}
private async Task<TResponse> PostAsync<TRequest, TResponse>(string url, TRequest request)
{
+
string json = JsonConvert.SerializeObject(request, new JsonSerializerSettings
{
ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
@@ -67,13 +84,14 @@
using var response = await _client.PostAsync(url, content);
string body = await response.Content.ReadAsStringAsync();
- _logger.LogInformation($"ESSAPI post : {_client.BaseAddress} {url} {body}" );
+ _logger.LogInformation($"ESSAPI post : {_client.BaseAddress} {url} {body}");
if (!response.IsSuccessStatusCode)
{
throw new HttpRequestException(body);
}
return JsonConvert.DeserializeObject<TResponse>(body);
+
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
index 11c7c4e..5ddfe87 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
@@ -1,4 +1,5 @@
-锘縰sing NetTaste;
+锘縰sing Microsoft.Extensions.Logging;
+using NetTaste;
using Newtonsoft.Json;
using Org.BouncyCastle.Ocsp;
using SqlSugar.Extensions;
@@ -21,13 +22,15 @@
private readonly ISupplierInfoService _supplierInfoService;
private readonly IMaterialUnitService _materialUnitService;
private readonly IMaterielInfoService _materielInfoService;
+ private readonly ILogger<ErpApiService> _logger;
- public ErpApiService(IHttpClientFactory httpClientFactory, ISupplierInfoService supplierInfoService, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService)
+ public ErpApiService(IHttpClientFactory httpClientFactory, ISupplierInfoService supplierInfoService, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, ILogger<ErpApiService> logger)
{
_httpClientFactory = httpClientFactory;
_supplierInfoService = supplierInfoService;
_materialUnitService = materialUnitService;
_materielInfoService = materielInfoService;
+ _logger = logger;
}
/// <summary>
@@ -36,10 +39,19 @@
/// <returns></returns>
public async Task<string> GetTokenAsync()
{
- var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
- var response = await PostAsync<TokenRequest, TokenResponse>("auth/getAccessToken", request, includeToken: false);
- var _token = response?.data?.access_token;
- return _token ?? "";
+ try
+ {
+ var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
+ var response = await PostAsync<TokenRequest, TokenResponse>("auth/getAccessToken", request, includeToken: false);
+ var _token = response?.data?.access_token;
+ return _token ?? "";
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation("ErpApiService GetTokenAsync澶辫触: " + ex.Message);
+ return "";
+ }
}
@@ -50,49 +62,57 @@
/// <returns></returns>
public async Task GetSuppliersAsync(string vendorCode = null)
{
- var req = new SupplierRequest { vendorCode = vendorCode };
- var result = await PostAsync<SupplierRequest, SupplierResponse>("erp/getVendorInfo", req, includeToken: true);
- if (result != null && result.data != null && result.data.Any())
+ try
{
- var dblists = _supplierInfoService.Repository.QueryData();
- var excepts = dblists.Select(O => O.SupplierCode).Except(result.data.Select(o => o.vendorCode));
- foreach (var except in excepts)
+ var req = new SupplierRequest { vendorCode = vendorCode };
+ var result = await PostAsync<SupplierRequest, SupplierResponse>("erp/getVendorInfo", req, includeToken: true);
+ if (result != null && result.data != null && result.data.Any())
{
- var first = dblists.FirstOrDefault(o => o.SupplierCode == except);
- if (first != null)
+ var dblists = _supplierInfoService.Repository.QueryData();
+ var excepts = dblists.Select(O => O.SupplierCode).Except(result.data.Select(o => o.vendorCode));
+ foreach (var except in excepts)
{
- _supplierInfoService.Repository.DeleteData(first);
- }
- }
- foreach (var item in result.data)
- {
- var first = dblists.FirstOrDefault(o => o.SupplierCode == item.vendorCode);
- if (first != null)
- {
- first.SupplierCode = item.vendorCode;
- first.SupplierName = item.vendorName;
- first.SupplierShortName = item.vendorShortName;
- first.Status = item.effective.ObjToInt();
- first.CreateDate = item.createDate.ObjToDate();
- first.ModifyDate = item.modifyDate.ObjToDate();
- _supplierInfoService.Repository.UpdateData(first);
- }
- else
- {
- Dt_SupplierInfo dt_SupplierInfo = new()
+ var first = dblists.FirstOrDefault(o => o.SupplierCode == except);
+ if (first != null)
{
- SupplierCode = item.vendorCode,
- SupplierName = item.vendorName,
- SupplierShortName = item.vendorShortName,
- Status = item.effective.ObjToInt(),
- CreateDate = item.createDate.ObjToDate(),
- Creater = "ERP",
- Modifier = "ERP",
- ModifyDate = item.modifyDate.ObjToDate()
- };
- _supplierInfoService.Repository.AddData(dt_SupplierInfo);
+ _supplierInfoService.Repository.DeleteData(first);
+ }
+ }
+ foreach (var item in result.data)
+ {
+ var first = dblists.FirstOrDefault(o => o.SupplierCode == item.vendorCode);
+ if (first != null)
+ {
+ first.SupplierCode = item.vendorCode;
+ first.SupplierName = item.vendorName;
+ first.SupplierShortName = item.vendorShortName;
+ first.Status = item.effective.ObjToInt();
+ first.CreateDate = item.createDate.ObjToDate();
+ first.ModifyDate = item.modifyDate.ObjToDate();
+ _supplierInfoService.Repository.UpdateData(first);
+ }
+ else
+ {
+ Dt_SupplierInfo dt_SupplierInfo = new()
+ {
+ SupplierCode = item.vendorCode,
+ SupplierName = item.vendorName,
+ SupplierShortName = item.vendorShortName,
+ Status = item.effective.ObjToInt(),
+ CreateDate = item.createDate.ObjToDate(),
+ Creater = "ERP",
+ Modifier = "ERP",
+ ModifyDate = item.modifyDate.ObjToDate()
+ };
+ _supplierInfoService.Repository.AddData(dt_SupplierInfo);
+ }
}
}
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation("ErpApiService GetSuppliersAsync澶辫触: " + ex.Message);
+
}
}
@@ -104,160 +124,175 @@
/// <returns></returns>
public async Task GetMaterialUnitAsync(string itemNo = null)
{
- var req = new MaterialUnitRequest { itemNo = itemNo };
- var result = await PostAsync<MaterialUnitRequest, MaterialUnitResponse>("erp/getMaterialUnit", req, true);
- if (result != null && result.data != null && result.data.Any())
+ try
{
- var dblists = _materialUnitService.Repository.QueryData();
- var excepts = dblists.Select(O => O.ItemNo).Except(result.data.Select(o => o.itemNo));
- foreach (var except in excepts)
+ var req = new MaterialUnitRequest { itemNo = itemNo };
+ var result = await PostAsync<MaterialUnitRequest, MaterialUnitResponse>("erp/getMaterialUnit", req, true);
+ if (result != null && result.data != null && result.data.Any())
{
- var first = dblists.FirstOrDefault(o => o.ItemNo == except);
- if (first != null)
+ var dblists = _materialUnitService.Repository.QueryData();
+ var excepts = dblists.Select(O => O.ItemNo).Except(result.data.Select(o => o.itemNo));
+ foreach (var except in excepts)
{
- _materialUnitService.Repository.DeleteData(first);
- }
- }
- foreach (var item in result.data)
- {
- var first = dblists.FirstOrDefault(o => o.ItemNo == item.itemNo);
- if (first != null)
- {
- first.ItemNo = item.itemNo;
- first.ProductName = item.productName;
- first.FromUom = item.fromUom;
- first.ToUom = item.toUom;
- first.Ratio = item.ratio.ObjToDecimal();
- first.Creater = "ERP";
- first.Modifier = "ERP";
- first.CreateDate = item.createDate.ObjToDate();
- first.ModifyDate = item.modifyDate.ObjToDate();
- _materialUnitService.Repository.UpdateData(first);
- }
- else
- {
- Dt_MaterialUnit dt_MaterialUnit = new()
+ var first = dblists.FirstOrDefault(o => o.ItemNo == except);
+ if (first != null)
{
- ItemNo = item.itemNo,
- ProductName = item.productName,
- FromUom = item.fromUom,
- ToUom = item.toUom,
- Ratio = item.ratio.ObjToDecimal(),
- CreateDate = item.createDate.ObjToDate(),
- Creater = "ERP",
- Modifier = "ERP",
- ModifyDate = item.modifyDate.ObjToDate()
- };
- _materialUnitService.Repository.AddData(dt_MaterialUnit);
+ _materialUnitService.Repository.DeleteData(first);
+ }
+ }
+ foreach (var item in result.data)
+ {
+ var first = dblists.FirstOrDefault(o => o.ItemNo == item.itemNo);
+ if (first != null)
+ {
+ first.ItemNo = item.itemNo;
+ first.ProductName = item.productName;
+ first.FromUom = item.fromUom;
+ first.ToUom = item.toUom;
+ first.Ratio = item.ratio.ObjToDecimal();
+ first.Creater = "ERP";
+ first.Modifier = "ERP";
+ first.CreateDate = item.createDate.ObjToDate();
+ first.ModifyDate = item.modifyDate.ObjToDate();
+ _materialUnitService.Repository.UpdateData(first);
+ }
+ else
+ {
+ Dt_MaterialUnit dt_MaterialUnit = new()
+ {
+ ItemNo = item.itemNo,
+ ProductName = item.productName,
+ FromUom = item.fromUom,
+ ToUom = item.toUom,
+ Ratio = item.ratio.ObjToDecimal(),
+ CreateDate = item.createDate.ObjToDate(),
+ Creater = "ERP",
+ Modifier = "ERP",
+ ModifyDate = item.modifyDate.ObjToDate()
+ };
+ _materialUnitService.Repository.AddData(dt_MaterialUnit);
+ }
}
}
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation("ErpApiService GetMaterialUnitAsync 澶辫触: " + ex.Message);
+
}
}
public async Task GetMaterialInfoAsync(MaterialRequest materialRequest)
{
- var first = WIDESEA_Core.Helper.AppSettings.GetValue("FirstMaterialSync").ObjToBool();
- if (first)
+ try
{
- var _token = await GetTokenAsync();
- for (int i = 1; i < 400; i++)
+ var first = WIDESEA_Core.Helper.AppSettings.GetValue("FirstMaterialSync").ObjToBool();
+ if (first)
{
- materialRequest.pageNum = i;
+ var _token = await GetTokenAsync();
+ for (int i = 1; i < 400; i++)
+ {
+ materialRequest.pageNum = i;
+ materialRequest.pageSize = 5000;
+ var result = await PostAsync<MaterialRequest, MaterialResponse>("erp/getMaterialInfo", materialRequest, _token, true);
+ if (result != null && result.data != null && result.data.Any())
+ {
+ foreach (var item in result.data)
+ {
+ Dt_MaterielInfo dt_MaterielInfo = new Dt_MaterielInfo()
+ {
+ MaterielModel = item.productModel,
+ MaterielCode = item.itemNo,
+ MaterielName = item.productName,
+ MaterielSpec = item.spec,
+ productTypeDesc = item.productTypeDesc,
+ productFamilyName = item.productFamilyName,
+ productFamilyShortName = item.productFamilyShortName,
+ plcode = item.plcode,
+ pl = item.pl,
+ drawingNo = item.drawingNo,
+ mversion = item.mversion,
+ warehouseName = item.warehouseName,
+ usageUOM = item.usageUOM,
+ purchaseUOM = item.purchaseUOM,
+ inventoryUOM = item.inventoryUOM,
+ CreateDate = item.createDate.ObjToDate(),
+ ModifyDate = item.modifyDate.ObjToDate(),
+ };
+ _materielInfoService.Repository.AddData(dt_MaterielInfo);
+ }
+ }
+ }
+ }
+ else
+ {
+ materialRequest.modifyDateStart = DateTime.Now.AddDays(-1).Date.ToString("yyyy-MM-dd") + " 00:00:01";
+ materialRequest.modifyDateEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm") + ":01";
+ materialRequest.pageNum = 1;
materialRequest.pageSize = 5000;
- var result = await PostAsync<MaterialRequest, MaterialResponse>("erp/getMaterialInfo", materialRequest, _token, true);
+
+ var result = await PostAsync<MaterialRequest, MaterialResponse>("erp/getMaterialInfo", materialRequest, true, true);
if (result != null && result.data != null && result.data.Any())
{
foreach (var item in result.data)
{
- Dt_MaterielInfo dt_MaterielInfo = new Dt_MaterielInfo()
+ var dbfirst = _materielInfoService.Repository.QueryData(x => x.MaterielModel == item.productModel && x.MaterielCode == item.itemNo).FirstOrDefault();
+ if (dbfirst != null)
{
- MaterielModel = item.productModel,
- MaterielCode = item.itemNo,
- MaterielName = item.productName,
- MaterielSpec = item.spec,
- productTypeDesc = item.productTypeDesc,
- productFamilyName = item.productFamilyName,
- productFamilyShortName = item.productFamilyShortName,
- plcode = item.plcode,
- pl = item.pl,
- drawingNo = item.drawingNo,
- mversion = item.mversion,
- warehouseName = item.warehouseName,
- usageUOM = item.usageUOM,
- purchaseUOM = item.purchaseUOM,
- inventoryUOM = item.inventoryUOM,
- CreateDate = item.createDate.ObjToDate(),
- ModifyDate = item.modifyDate.ObjToDate(),
- };
- _materielInfoService.Repository.AddData(dt_MaterielInfo);
+ dbfirst.MaterielModel = item.productModel;
+ dbfirst.MaterielCode = item.itemNo;
+ dbfirst.MaterielName = item.productName;
+ dbfirst.MaterielSpec = item.spec;
+ dbfirst.productTypeDesc = item.productTypeDesc;
+ dbfirst.productFamilyName = item.productFamilyName;
+ dbfirst.productFamilyShortName = item.productFamilyShortName;
+ dbfirst.plcode = item.plcode;
+ dbfirst.pl = item.pl;
+ dbfirst.drawingNo = item.drawingNo;
+ dbfirst.mversion = item.mversion;
+ dbfirst.warehouseName = item.warehouseName;
+ dbfirst.usageUOM = item.usageUOM;
+ dbfirst.purchaseUOM = item.purchaseUOM;
+ dbfirst.inventoryUOM = item.inventoryUOM;
+ dbfirst.CreateDate = item.createDate.ObjToDate();
+ dbfirst.ModifyDate = item.modifyDate.ObjToDate();
+ _materielInfoService.Repository.UpdateData(dbfirst);
+ }
+ else
+ {
+ Dt_MaterielInfo dt_MaterielInfo = new Dt_MaterielInfo()
+ {
+ MaterielModel = item.productModel,
+ MaterielCode = item.itemNo,
+ MaterielName = item.productName,
+ MaterielSpec = item.spec,
+ productTypeDesc = item.productTypeDesc,
+ productFamilyName = item.productFamilyName,
+ productFamilyShortName = item.productFamilyShortName,
+ plcode = item.plcode,
+ pl = item.pl,
+ drawingNo = item.drawingNo,
+ mversion = item.mversion,
+ warehouseName = item.warehouseName,
+ usageUOM = item.usageUOM,
+ purchaseUOM = item.purchaseUOM,
+ inventoryUOM = item.inventoryUOM,
+ CreateDate = item.createDate.ObjToDate(),
+ ModifyDate = item.modifyDate.ObjToDate(),
+ };
+ _materielInfoService.Repository.AddData(dt_MaterielInfo);
+ }
+
}
}
}
+
}
- else
+ catch (Exception ex)
{
- materialRequest.modifyDateStart = DateTime.Now.AddDays(-1).Date.ToString("yyyy-MM-dd") + " 00:00:01";
- materialRequest.modifyDateEnd = DateTime.Now.ToString("yyyy-MM-dd HH:mm")+ ":01";
- materialRequest.pageNum = 1;
- materialRequest.pageSize = 5000;
+ _logger.LogInformation("ErpApiService GetMaterialInfoAsync 澶辫触: " + ex.Message);
- var result = await PostAsync<MaterialRequest, MaterialResponse>("erp/getMaterialInfo", materialRequest, true, true);
- if (result != null && result.data != null && result.data.Any())
- {
- foreach (var item in result.data)
- {
- var dbfirst = _materielInfoService.Repository.QueryData(x => x.MaterielModel == item.productModel && x.MaterielCode == item.itemNo).FirstOrDefault();
- if (dbfirst != null)
- {
- dbfirst.MaterielModel = item.productModel;
- dbfirst.MaterielCode = item.itemNo;
- dbfirst.MaterielName = item.productName;
- dbfirst.MaterielSpec = item.spec;
- dbfirst.productTypeDesc = item.productTypeDesc;
- dbfirst.productFamilyName = item.productFamilyName;
- dbfirst.productFamilyShortName = item.productFamilyShortName;
- dbfirst.plcode = item.plcode;
- dbfirst.pl = item.pl;
- dbfirst.drawingNo = item.drawingNo;
- dbfirst.mversion = item.mversion;
- dbfirst.warehouseName = item.warehouseName;
- dbfirst.usageUOM = item.usageUOM;
- dbfirst.purchaseUOM = item.purchaseUOM;
- dbfirst.inventoryUOM = item.inventoryUOM;
- dbfirst.CreateDate = item.createDate.ObjToDate();
- dbfirst.ModifyDate = item.modifyDate.ObjToDate();
- _materielInfoService.Repository.UpdateData(dbfirst);
- }
- else
- {
- Dt_MaterielInfo dt_MaterielInfo = new Dt_MaterielInfo()
- {
- MaterielModel = item.productModel,
- MaterielCode = item.itemNo,
- MaterielName = item.productName,
- MaterielSpec = item.spec,
- productTypeDesc = item.productTypeDesc,
- productFamilyName = item.productFamilyName,
- productFamilyShortName = item.productFamilyShortName,
- plcode = item.plcode,
- pl = item.pl,
- drawingNo = item.drawingNo,
- mversion = item.mversion,
- warehouseName = item.warehouseName,
- usageUOM = item.usageUOM,
- purchaseUOM = item.purchaseUOM,
- inventoryUOM = item.inventoryUOM,
- CreateDate = item.createDate.ObjToDate(),
- ModifyDate = item.modifyDate.ObjToDate(),
- };
- _materielInfoService.Repository.AddData(dt_MaterielInfo);
- }
-
- }
- }
}
-
-
}
private async Task<TResponse> PostAsync<TRequest, TResponse>(string url, TRequest request, string _token, bool isNullSerialize = false)
@@ -314,7 +349,7 @@
}
else
{
- json = JsonConvert.SerializeObject(request );
+ json = JsonConvert.SerializeObject(request);
}
var content = new StringContent(json, Encoding.UTF8, "application/json");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
index fec512a..f946d44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
@@ -18,12 +19,13 @@
public class InvokeMESService : IInvokeMESService
{
private readonly IHttpClientFactory _httpClientFactory;
-
+ private readonly ILogger<InvokeMESService> _logger;
private string UserName = "12312";
private string Password = "1";
- public InvokeMESService(IHttpClientFactory httpClientFactory)
+ public InvokeMESService(IHttpClientFactory httpClientFactory, ILogger<InvokeMESService> logger)
{
_httpClientFactory = httpClientFactory;
+ _logger = logger;
}
public async Task FeedbackInbound(string url, FeedbackInboundRequestModel model)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index 7ef52bc..7675711 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -281,8 +281,8 @@
Depth = depth,
};
- locationInfo.LocationCode = $"HAI-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(2, '0')} ";
- locationInfo.LocationName = $"HAI{locationInfo.RoadwayNo}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞� ";
+ locationInfo.LocationCode = $"HAI-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(2, '0')}";
+ locationInfo.LocationName = $"HAI{locationInfo.RoadwayNo}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞�";
//locationInfo.LocationCode = $"{locationInfo.RoadwayNo}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterialUnitService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterialUnitService.cs"
index cd8417b..14c2945 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterialUnitService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/MaterialUnitService.cs"
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing Microsoft.Extensions.Logging;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -13,12 +14,173 @@
{
public class MaterialUnitService : ServiceBase<Dt_MaterialUnit, IRepository<Dt_MaterialUnit>>, IMaterialUnitService
{
+ private readonly ILogger<MaterialUnitService> _logger;
public IRepository<Dt_MaterialUnit> Repository => BaseDal;
- public MaterialUnitService(IRepository<Dt_MaterialUnit> BaseDal) : base(BaseDal)
+
+ public IRepository<Dt_MaterielInfo> _materielInfoRepository;
+ public MaterialUnitService(IRepository<Dt_MaterialUnit> BaseDal, ILogger<MaterialUnitService> logger, IRepository<Dt_MaterielInfo> materielInfoRepository) : base(BaseDal)
{
+ _logger = logger;
+ _materielInfoRepository = materielInfoRepository;
+ }
+ /// <summary>
+ /// 鍗曚綅杞崲
+ /// </summary>
+ public async Task<decimal> ConvertAsync(string materialCode, decimal quantity, string fromUnit, string toUnit)
+ {
+ if (string.IsNullOrEmpty(materialCode))
+ throw new ArgumentException("鐗╂枡缂栧彿涓嶈兘涓虹┖");
+
+ if (string.IsNullOrEmpty(fromUnit) || string.IsNullOrEmpty(toUnit))
+ throw new ArgumentException("鍗曚綅涓嶈兘涓虹┖");
+
+ // 濡傛灉鍗曚綅鐩稿悓锛岀洿鎺ヨ繑鍥�
+ if (fromUnit.Equals(toUnit, StringComparison.OrdinalIgnoreCase))
+ return quantity;
+
+ var ratio = await GetConversionRatioAsync(materialCode, fromUnit, toUnit);
+
+ if (ratio == null)
+ {
+ _logger.LogWarning($"鏈壘鍒扮墿鏂� {materialCode} 浠� {fromUnit} 鍒� {toUnit} 鐨勫崟浣嶈浆鎹㈠叧绯�");
+ throw new InvalidOperationException($"鏈壘鍒扮墿鏂� {materialCode} 浠� {fromUnit} 鍒� {toUnit} 鐨勫崟浣嶈浆鎹㈠叧绯�");
+ }
+
+ return quantity * ratio.Value;
}
-
+ /// <summary>
+ /// 閲囪喘鍗曚綅杞簱瀛樺崟浣�
+ /// </summary>
+ public async Task<decimal> ConvertPurchaseToStockAsync(string materialCode, decimal quantity)
+ {
+ // 鑾峰彇鐗╂枡淇℃伅
+ var material = await _materielInfoRepository.Db.Queryable<Dt_MaterielInfo>()
+ .Where(x => x.MaterielCode == materialCode)
+ .FirstAsync();
+
+ if (material == null)
+ {
+ throw new ArgumentException($"鏈壘鍒扮墿鏂欑紪鍙�: {materialCode}");
+ }
+
+ return await ConvertAsync(materialCode, quantity, material.purchaseUOM, material.inventoryUOM);
+ }
+
+ /// <summary>
+ /// 棰嗘枡鍗曚綅杞簱瀛樺崟浣�
+ /// </summary>
+ public async Task<decimal> ConvertIssueToStockAsync(string materialCode, decimal quantity)
+ {
+ // 鑾峰彇鐗╂枡淇℃伅
+ var material = await _materielInfoRepository.Db.Queryable<Dt_MaterielInfo>()
+ .Where(x => x.MaterielCode == materialCode)
+ .FirstAsync();
+
+ if (material == null)
+ {
+ throw new ArgumentException($"鏈壘鍒扮墿鏂欑紪鍙�: {materialCode}");
+ }
+
+ return await ConvertAsync(materialCode, quantity, material.usageUOM, material.inventoryUOM);
+ }
+ /// <summary>
+ /// 鑾峰彇鍗曚綅杞崲姣旂巼
+ /// </summary>
+ public async Task<decimal?> GetConversionRatioAsync(string materialCode, string fromUnit, string toUnit)
+ {
+ // 灏濊瘯鐩存帴鏌ユ壘杞崲鍏崇郴
+ var conversion = await Repository.Db.Queryable<Dt_MaterialUnit>()
+ .Where(x => x.ItemNo == materialCode &&
+ x.FromUom == fromUnit &&
+ x.ToUom == toUnit)
+ .FirstAsync();
+
+ if (conversion != null)
+ {
+ return conversion.Ratio;
+ }
+
+ // 灏濊瘯鏌ユ壘鍙嶅悜杞崲鍏崇郴锛堝彇鍊掓暟锛�
+ var reverseConversion = await Repository.Db.Queryable<Dt_MaterialUnit>()
+ .Where(x => x.ItemNo == materialCode &&
+ x.FromUom == toUnit &&
+ x.ToUom == fromUnit)
+ .FirstAsync();
+
+ if (reverseConversion != null)
+ {
+ return 1 / reverseConversion.Ratio;
+ }
+
+ // 灏濊瘯閫氳繃涓棿鍗曚綅锛堝簱瀛樺崟浣嶏級杩涜杞崲
+ var material = await _materielInfoRepository.Db.Queryable<Dt_MaterielInfo>()
+ .Where(x => x.MaterielCode == materialCode)
+ .FirstAsync();
+
+ if (material != null)
+ {
+ var stockUnit = material.inventoryUOM;
+
+ // 濡傛灉鐩爣鍗曚綅宸茬粡鏄簱瀛樺崟浣嶏紝鐩存帴鏌ユ壘婧愬崟浣嶅埌搴撳瓨鍗曚綅鐨勮浆鎹�
+ if (toUnit.Equals(stockUnit, StringComparison.OrdinalIgnoreCase))
+ {
+ var toStockRatio = await GetDirectRatioAsync(materialCode, fromUnit, stockUnit);
+ if (toStockRatio != null) return toStockRatio;
+ }
+
+ // 濡傛灉婧愬崟浣嶆槸搴撳瓨鍗曚綅锛岀洿鎺ユ煡鎵惧簱瀛樺崟浣嶅埌鐩爣鍗曚綅鐨勮浆鎹�
+ if (fromUnit.Equals(stockUnit, StringComparison.OrdinalIgnoreCase))
+ {
+ var fromStockRatio = await GetDirectRatioAsync(materialCode, stockUnit, toUnit);
+ if (fromStockRatio != null) return fromStockRatio;
+ }
+
+ // 閫氳繃搴撳瓨鍗曚綅杩涜闂存帴杞崲锛歠romUnit -> stockUnit -> toUnit
+ var ratio1 = await GetDirectRatioAsync(materialCode, fromUnit, stockUnit);
+ var ratio2 = await GetDirectRatioAsync(materialCode, stockUnit, toUnit);
+
+ if (ratio1 != null && ratio2 != null)
+ {
+ return ratio1 * ratio2;
+ }
+ }
+
+ return null;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐩存帴杞崲姣旂巼锛堝寘鍚鍚戝拰鍙嶅悜鏌ユ壘锛�
+ /// </summary>
+ private async Task<decimal?> GetDirectRatioAsync(string materialCode, string fromUnit, string toUnit)
+ {
+ // 姝ｅ悜鏌ユ壘
+ var conversion = await Repository.Db.Queryable<Dt_MaterialUnit>()
+ .Where(x => x.ItemNo == materialCode &&
+ x.FromUom == fromUnit &&
+ x.ToUom == toUnit)
+ .FirstAsync();
+
+ if (conversion != null)
+ {
+ return conversion.Ratio;
+ }
+
+ // 鍙嶅悜鏌ユ壘
+ var reverseConversion = await Repository.Db.Queryable<Dt_MaterialUnit>()
+ .Where(x => x.ItemNo == materialCode &&
+ x.FromUom == toUnit &&
+ x.ToUom == fromUnit)
+ .FirstAsync();
+
+ if (reverseConversion != null)
+ {
+ return 1 / reverseConversion.Ratio;
+ }
+
+ return null;
+ }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
index fec2fb8..d26cf55 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
@@ -23,6 +23,7 @@
[Description("閿佸畾")]
Lock = 1,
+
/// <summary>
/// 鏈夎揣閿佸畾
/// </summary>
@@ -40,11 +41,10 @@
/// </summary>
[Description("鏈夎揣")]
InStock = 100,
-
/// <summary>
- /// 澶ф墭鐩橀攣瀹�
+ /// 绌烘墭鐩�
/// </summary>
- [Description("澶ф墭鐩橀攣瀹�")]
- PalletLock = 99
+ [Description("绌烘墭鐩�")]
+ Pallet = 99
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
index 904222d..2c53935 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InboundOrderMenu.cs"
@@ -90,4 +90,71 @@
[Description("鍏朵粬鍏ュ簱鍗�")]
Other = 130
}
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷鏋氫妇
+ /// </summary>
+ public enum DocumentType
+ {
+ /// <summary>
+ /// 閲囪喘鍏ュ簱鍗�
+ /// </summary>
+ [Description("閲囪喘鍏ュ簱")]
+ PurchaseInbound = 11,
+
+ /// <summary>
+ /// 鏉傛敹鍗�
+ /// </summary>
+ [Description("鏉傛敹鍗�")]
+ MiscellaneousReceipt = 12,
+
+ /// <summary>
+ /// 鐢熶骇閫�鏂欏崟
+ /// </summary>
+ [Description("鐢熶骇閫�鏂欏崟")]
+ ProductionReturn = 13,
+
+ /// <summary>
+ /// 澶栧崗閫�鏂欏崟
+ /// </summary>
+ [Description("澶栧崗閫�鏂欏崟")]
+ OutsourcingReturn = 14,
+
+ /// <summary>
+ /// 閿�鍞��搴撳崟
+ /// </summary>
+ [Description("閿�鍞��搴撳崟")]
+ SalesReturn = 15,
+
+ /// <summary>
+ /// 宸ュ崟棰嗘枡鍗�
+ /// </summary>
+ [Description("宸ュ崟棰嗘枡鍑哄簱鍗�")]
+ WorkOrderPicking = 21,
+
+ /// <summary>
+ /// 鏉傚彂鍗�
+ /// </summary>
+ [Description("鏉傚彂鍗�")]
+ MiscellaneousIssue = 22,
+
+ /// <summary>
+ /// 閫�璐у崟
+ /// </summary>
+ [Description("閫�璐у崟")]
+ ReturnGoods = 23,
+
+ /// <summary>
+ /// 閿�鍞嚭搴撳崟
+ /// </summary>
+ [Description("閿�鍞嚭搴撳崟")]
+ SalesOutbound = 24,
+
+ /// <summary>
+ /// 澶栧崗棰嗘枡鐢宠鍗�
+ /// </summary>
+ [Description("澶栧崗棰嗘枡鐢宠鍗�")]
+ OutsourcingPickingRequest = 25
+ }
+
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index 787e08a..915ded7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -7,6 +7,41 @@
namespace WIDESEA_Common.TaskEnum
{
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public enum TaskType
+ {
+ /// <summary>
+ /// 缁勭洏
+ /// </summary>
+ [Description("缁勭洏")]
+ SetPlate = 0,
+
+ /// <summary>
+ /// 鍏ュ簱
+ /// </summary>
+ [Description("鍏ュ簱")]
+ EnterDepot = 1,
+
+ /// <summary>
+ /// 鍑哄簱
+ /// </summary>
+ [Description("鍑哄簱")]
+ OutDepot = 2,
+
+ /// <summary>
+ /// 绉诲簱
+ /// </summary>
+ [Description("绉诲簱")]
+ TransferDepot = 3,
+
+ /// <summary>
+ /// 鎼繍
+ /// </summary>
+ [Description("鎼繍")]
+ Delivery = 5,
+ }
public enum TaskTypeEnum
{
/// <summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Allocate/AllocateDto.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Allocate/AllocateDto.cs"
new file mode 100644
index 0000000..d658ab2
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_DTO/Allocate/AllocateDto.cs"
@@ -0,0 +1,139 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_DTO.Allocate
+{
+
+ /// <summary>
+ ///
+ /// </summary>
+ [JsonObject(MemberSerialization.OptIn)]
+ public class AllocateDto
+ {
+ /// <summary>
+ /// 璇锋眰缂栫爜
+ /// </summary>
+ [JsonProperty("reqCode")]
+ public string ReqCode { get; set; }
+
+ /// <summary>
+ /// 璇锋眰鏃堕棿
+ /// </summary>
+ [JsonProperty("reqTime")]
+ public DateTime ReqTime { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟缂栧彿
+ /// </summary>
+ [JsonProperty("orderNo")]
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ /// </summary>
+ [JsonProperty("business_type")]
+ public string BusinessType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍒嗘壒
+ /// </summary>
+ [JsonProperty("isBatch")]
+ public bool IsBatch { get; set; }
+
+ /// <summary>
+ /// 鍘傚尯浠ｇ爜
+ /// </summary>
+ [JsonProperty("factoryArea")]
+ public string FactoryArea { get; set; }
+
+ /// <summary>
+ /// 鎿嶄綔绫诲瀷
+ /// </summary>
+ [JsonProperty("operationType")]
+ public int OperationType { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟璇︽儏鍒楄〃
+ /// </summary>
+ [JsonProperty("details")]
+ public List<AllocateDtoDetail> Details { get; set; }
+ }
+
+ /// <summary>
+ /// 璁㈠崟璇︽儏
+ /// </summary>
+ [JsonObject(MemberSerialization.OptIn)]
+ public class AllocateDtoDetail
+ {
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [JsonProperty("warehouseCode")]
+ public string WarehouseCode { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonProperty("materialCode")]
+ public string MaterialCode { get; set; }
+
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [JsonProperty("lineNo")]
+ public string LineNo { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [JsonProperty("qty")]
+ public decimal Qty { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [JsonProperty("unit")]
+ public string Unit { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鍒楄〃
+ /// </summary>
+ [JsonProperty("barcodes")]
+ public List<BarcodeInfo>? Barcodes { get; set; }
+ }
+
+ /// <summary>
+ /// 鏉＄爜淇℃伅
+ /// </summary>
+ [JsonObject(MemberSerialization.OptIn)]
+ public class BarcodeInfo
+ {
+ /// <summary>
+ /// 鏉＄爜
+ /// </summary>
+ [JsonProperty("barcode")]
+ public string Barcode { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [JsonProperty("batchNo")]
+ public string BatchNo { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [JsonProperty("qty")]
+ public decimal Qty { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [JsonProperty("unit")]
+ public string Unit { get; set; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/IAllocateService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/IAllocateService.cs"
new file mode 100644
index 0000000..57dc5fe
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/IAllocateService.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Allocate;
+
+namespace WIDESEA_IAllocateService
+{
+
+ public interface IAllocateService : IService<Dt_AllocateOrder>
+ {
+ IRepository<Dt_AllocateOrder> Repository { get; }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/WIDESEA_IAllocateService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/WIDESEA_IAllocateService.csproj"
new file mode 100644
index 0000000..17d93c8
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IAllocateService/WIDESEA_IAllocateService.csproj"
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEA_Core\WIDESEA_Core.csproj" />
+ <ProjectReference Include="..\WIDESEA_Model\WIDESEA_Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IDailySequenceService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IDailySequenceService.cs"
new file mode 100644
index 0000000..53b6745
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IDailySequenceService.cs"
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseRepository;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Basic;
+
+namespace WIDESEA_IBasicService
+{
+ public interface IDailySequenceService : IService<DT_DailySequence>
+ {
+ IRepository<DT_DailySequence> Repository { get; }
+
+ Task<int> GetNextSequenceAsync();
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterialUnitService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterialUnitService.cs"
index 2cc53eb..68eb274 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterialUnitService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterialUnitService.cs"
@@ -13,5 +13,11 @@
public interface IMaterialUnitService : IService<Dt_MaterialUnit>
{
IRepository<Dt_MaterialUnit> Repository { get; }
+
+ Task<decimal> ConvertAsync(string materialCode, decimal quantity, string fromUnit, string toUnit);
+
+ Task<decimal> ConvertPurchaseToStockAsync(string materialCode, decimal quantity);
+
+ Task<decimal> ConvertIssueToStockAsync(string materialCode, decimal quantity);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index fbb7c9b..4d741a5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -39,5 +39,7 @@
IRepository<Dt_Task> Repository { get; }
Task<WebResponseContent> RequestInboundTask(string palletCode, string stationCode);
+
+ Task<WebResponseContent> TaskCompleted(string taskNum);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index aa1dece..7e3d41c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -179,6 +179,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -211,6 +212,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -337,6 +339,7 @@
StockQuantity = item.BarcodeQty,
Status = 0,
OrderNo = inboundOrder.InboundOrderNo,
+ BusinessType=inboundOrder.BusinessType,
});
item.ReceiptQuantity = item.BarcodeQty;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_ AllocateOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_ AllocateOrder.cs"
new file mode 100644
index 0000000..1109425
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_ AllocateOrder.cs"
@@ -0,0 +1,18 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models.Allocate
+{
+ /// <summary>
+ ///
+ /// </summary>
+ [SugarTable(nameof(Dt_InboundOrder), "鍏ュ簱鍗�")]
+ public class Dt_AllocateOrder : BaseEntity
+ {
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_AllocateOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_AllocateOrderDetail.cs"
new file mode 100644
index 0000000..760228f
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_AllocateOrderDetail.cs"
@@ -0,0 +1,12 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Model.Models.Allocate
+{
+ public class Dt_AllocateOrderDetail
+ {
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/DT_DailySequence.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/DT_DailySequence.cs"
new file mode 100644
index 0000000..9d3bd3c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/DT_DailySequence.cs"
@@ -0,0 +1,35 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.DB.Models;
+
+namespace WIDESEA_Model.Models.Basic
+{
+ /// <summary>
+ ///
+ /// </summary>
+
+ [SugarTable("DT_DailySequence")]
+ public class DT_DailySequence : BaseEntity
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public long Id { get; set; }
+
+ [SugarColumn(IsNullable = false)]
+ public DateTime SequenceDate { get; set; }
+
+ [SugarColumn(Length = 50, IsNullable = false)]
+ public string SequenceKey { get; set; } = "MESBarcode";
+
+ [SugarColumn(IsNullable = false)]
+ public int CurrentValue { get; set; }
+
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs"
index 1c90009..0786329 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Stock/Dt_StockInfoDetail.cs"
@@ -118,6 +118,14 @@
[SugarColumn(ColumnName = "barcode", ColumnDescription = "鏉＄爜")]
public string? Barcode { get; set; }
+
+ /// <summary>
+ /// 澶� 娉�:涓氬姟绫诲瀷
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "businessType", ColumnDescription = "涓氬姟绫诲瀷")]
+ public string? BusinessType { get; set; }
+
/// <summary>
/// 澶囨敞
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
index 4744830..edae13a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
@@ -42,7 +42,7 @@
public string PalletCode { get; set; }
/// <summary>
- /// 鎵樼洏绫诲瀷
+ /// 鎵樼洏绫诲瀷 -1 绌烘墭鐩�
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鎵樼洏绫诲瀷")]
public int PalletType { get; set; }
@@ -119,6 +119,8 @@
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
public string? OrderNo { get; set; }
+
+
/// <summary>
/// 浼樺厛绾�
/// </summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
index 7220a84..6a0d029 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -143,6 +143,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
@@ -173,6 +174,7 @@
}
catch (Exception ex)
{
+ _unitOfWorkManage.RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index a7b5dca..358c522 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -21,7 +21,10 @@
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using SqlSugar;
+using System.Reflection;
+using System.Reflection.Emit;
using System.Threading.Tasks;
+using System.Xml.Linq;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -31,6 +34,7 @@
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Task;
@@ -53,8 +57,11 @@
private readonly IRepository<Dt_StockInfo> _stockRepository;
private readonly ILocationInfoService _locationInfoService;
private readonly IInboundOrderService _inboundOrderService;
+ private readonly IInboundOrderDetailService _inboundOrderDetailService;
private readonly ILocationStatusChangeRecordService _locationStatusChangeRecordService;
private readonly IESSApiService _eSSApiService;
+ private readonly IStockService _stockService;
+ private readonly IRecordService _recordService;
public IRepository<Dt_Task> Repository => BaseDal;
private Dictionary<string, SqlSugar.OrderByType> _taskOrderBy = new()
@@ -66,15 +73,15 @@
private Dictionary<string, string> stations = new Dictionary<string, string>
{
{"3-5","3-9" },
- {"2-5","2-9" },
- {"1-11","1-1" },
+ {"2-5","2-9" },
+ {"1-11","1-1" },
};
public List<int> TaskTypes => typeof(TaskTypeEnum).GetEnumIndexList();
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_StockInfo> stockRepository, ILocationInfoService locationInfoService, IInboundOrderService inboundOrderService, ILocationStatusChangeRecordService locationStatusChangeRecordService, IESSApiService eSSApiService, ILogger<TaskService> logger, IStockService stockService, IRecordService recordService, IInboundOrderDetailService inboundOrderDetailService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
@@ -84,247 +91,9 @@
_locationStatusChangeRecordService = locationStatusChangeRecordService;
_eSSApiService = eSSApiService;
_logger = logger;
- }
-
- public async Task<WebResponseContent> RequestInboundTask(string palletCode, string stationCode)
- {
- try
- {
- Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
- if (dbtask != null)
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
- }
-
- Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
- }
-
- if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
- }
- if (!string.IsNullOrEmpty(stockInfo.LocationCode))
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- }
-
- Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation();
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
- }
-
-
- var newTask = new Dt_Task()
- {
- CurrentAddress = stationCode,
- Grade = 0,
- NextAddress = stations.GetValueOrDefault(stationCode) ?? "",
- PalletCode = palletCode,
- Roadway = locationInfo.RoadwayNo,
- SourceAddress = stationCode,
- TargetAddress = locationInfo.LocationCode,
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType,
- };
-
- if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
- {
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
-
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _locationInfoService.UpdateData(locationInfo);
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- _stockRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- }
- else
- {
- //鑾峰彇鏄惁瀛樺湪鍏ュ簱鍗�
- Dt_InboundOrder? inboundOrder = null;
- if (stockInfo != null && stockInfo.Details.Count > 0)
- {
- string? orderNo = stockInfo.Details.FirstOrDefault()?.OrderNo ?? "";
- inboundOrder = _inboundOrderService.Repository.QueryFirst(x => x.InboundOrderNo == orderNo && x.OrderStatus < InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt());
- }
-
- if (inboundOrder != null)
- {
- if (inboundOrder.OrderType == InOrderTypeEnum.Allocat.ObjToInt())
- {
- newTask.TaskType = TaskTypeEnum.InAllocate.ObjToInt();
- }
- else if (inboundOrder.OrderType == InOrderTypeEnum.Return.ObjToInt())
- {
- newTask.TaskType = TaskTypeEnum.ProductionReturn.ObjToInt();
- }
- }
- if (stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
- }
- else if (stockInfo.StockStatus == StockStatusEmun.MES閫�搴�.ObjToInt())
- {
- newTask.TaskType = TaskTypeEnum.MesMatReturn.ObjToInt();
- }
- else if (stockInfo.StockStatus == StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- newTask.TaskType = TaskTypeEnum.InPick.ObjToInt();
- }
- else if (stockInfo.StockStatus == StockStatusEmun.閫佹搴撳瓨瀹屾垚.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
- newTask.TaskType = TaskTypeEnum.InQuality.ObjToInt();
- }
- else if (stockInfo.StockStatus == StockStatusEmun.鐩樼偣搴撳瓨瀹屾垚.ObjToInt())
- {
- stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt();
- newTask.TaskType = TaskTypeEnum.InInventory.ObjToInt();
- }
- else
- {
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- }
-
- LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
-
- _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, locationInfo.LocationStatus, StockChangeType.Inbound.ObjToInt(), inboundOrder.InboundOrderNo, newTask.TaskNum);
-
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _locationInfoService.UpdateData(locationInfo);
-
- _stockRepository.UpdateData(stockInfo);
- _unitOfWorkManage.CommitTran();
- }
- TaskModel esstask = new TaskModel()
- {
- taskType = "putaway",
- taskGroupCode = "",
- groupPriority = 0,
- tasks = new List<TasksType>
- {
- new()
- {
- taskCode=newTask.TaskNum.ToString(),
- taskPriority=0,
- taskDescribe=new TaskDescribeType{
- containerCode=palletCode,
- containerType= "CT_KUBOT_STANDARD",
- fromLocationCode=stations.GetValueOrDefault(stationCode)??"",
- toStationCode="",
- toLocationCode=locationInfo.LocationCode,
- deadline=0,storageTag=""
- }
- }
- }
- };
- _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(esstask));
- var result = await _eSSApiService.CreateTaskAsync(esstask);
-
- _logger.LogInformation("鍒涘缓浠诲姟杩斿洖: " + result);
- if (result)
- {
- return WebResponseContent.Instance.OK();
- }
- else
- {
- return WebResponseContent.Instance.Error("涓嬪彂鏈哄櫒浜轰换鍔″け璐ワ紒");
- }
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
- /// <summary>
- /// 鍏ョ┖绠�
- /// </summary>
- /// <param name="palletCode"></param>
- /// <param name="address"></param>
- /// <param name="WarehouseId"></param>
- /// <returns></returns>
- public WebResponseContent InEmpty(string palletCode, string address, int WarehouseId)
- {
- try
- {
-
- Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
- if (dbtask != null)
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
- }
-
- Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).First();
- if (stockInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
- }
- if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt())
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
- }
- if (!string.IsNullOrEmpty(stockInfo.LocationCode))
- {
- return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
- }
- //stockInfo = new Dt_StockInfo()
- //{
- // PalletCode = barcode,
- // StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
- // WarehouseId = WarehouseId,
- // PalletType = PalletTypeEnum.Empty.ObjToInt(),
- // Details = new List<Dt_StockInfoDetail>()
- //};
-
- var locationInfo = _locationInfoService.AssignLocation();
- if (locationInfo == null)
- {
- return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
- }
-
- Dt_Task newTask = new Dt_Task()
- {
- CurrentAddress = address,
- Grade = 0,
- NextAddress = locationInfo.LocationCode,
- PalletCode = palletCode,
- Roadway = locationInfo.RoadwayNo,
- SourceAddress = address,
- TargetAddress = locationInfo.LocationCode,
- TaskType = TaskTypeEnum.InEmpty.ObjToInt(),
- TaskStatus = TaskStatusEnum.New.ObjToInt(),
- WarehouseId = stockInfo.WarehouseId,
- PalletType = stockInfo.PalletType
- };
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
- _unitOfWorkManage.BeginTran();
- int taskId = BaseDal.AddData(newTask);
- newTask.TaskId = taskId;
- _locationInfoService.UpdateData(locationInfo);
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- _stockRepository.AddData(stockInfo);
- _unitOfWorkManage.CommitTran();
-
-
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- _unitOfWorkManage.RollbackTran();
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ _stockService = stockService;
+ _recordService = recordService;
+ _inboundOrderDetailService = inboundOrderDetailService;
}
/// <summary>
@@ -332,22 +101,151 @@
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
- public async Task<WebResponseContent> TaskCompleted(int taskNum)
+ public async Task<WebResponseContent> TaskCompleted(string taskNum)
{
+ try
+ {
+ Dt_Task task;
+ if (int.TryParse(taskNum, out var newTaskNum))
+ {
+ task = BaseDal.QueryFirst(x => x.TaskNum == newTaskNum);
+ if (task == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+
+ MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
+ if (methodInfo != null)
+ {
+ WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
+ if (responseContent != null)
+ {
+ return responseContent;
+ }
+ }
+ return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ public WebResponseContent InboundTaskCompleted(Dt_Task task)
+ {
+ decimal beforeQuantity = 0;
+
+ //鏌ュ簱瀛�
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
+ }
+ if (stockInfo.Details.Count == 0 && stockInfo.PalletType != PalletTypeEnum.Empty.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鎵樼洏搴撳瓨鏄庣粏淇℃伅");
+ }
+ //鏌ヨ揣浣�
+ Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ if (locationInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
+ }
+
+ var ordernos = stockInfo.Details.GroupBy(x => x.OrderNo).Select(o => o.Key).ToList();
+ var inboundOrders = _inboundOrderService.Repository.Db.Queryable<Dt_InboundOrder>().Where(x => ordernos.Contains(x.InboundOrderNo)).Includes(x => x.Details).ToList();
+ Dt_InboundOrderDetail? inboundOrderDetail = null;
+
+ foreach (var inboundOrder in inboundOrders)
+ {
+ //鏍囧噯鍏ュ簱娴佺▼鏌ユ壘鍏ュ簱鍗曟嵁
+ if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.鍏ュ簱纭.ObjToInt())
+ {
+ foreach (var item in stockInfo.Details.Where(x => x.OrderNo == inboundOrder.InboundOrderNo).ToList())
+ {
+ var inbounddetail = inboundOrder.Details.Where(x => x.lineNo == item.InboundOrderRowNo && x.Barcode == item.Barcode).FirstOrDefault();
+ if (inbounddetail != null)
+ {
+ inbounddetail.OverInQuantity += item.StockQuantity;
+ if (inbounddetail.OverInQuantity == inbounddetail.OrderQuantity)
+ {
+ inbounddetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
+ else if (inbounddetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ inbounddetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
+ }
+ _inboundOrderDetailService.UpdateData(inbounddetail);
+ }
+ }
+ if (inboundOrder.Details.Count == inboundOrder.Details.Where(x => x.OrderQuantity == x.OverInQuantity).Count())
+ {
+ inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ else if (inboundOrder.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
+ }
+ _inboundOrderService.UpdateData(inboundOrder);
+ }
+ }
+ stockInfo.LocationCode = task.TargetAddress;
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x =>
+ {
+ x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ });
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfo.Details);
+
+ beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);
+
+ int beforeStatus = locationInfo.LocationStatus;
+ if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
+ {
+ locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
+ else
+ {
+ locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ }
+ _locationInfoService.Repository.UpdateData(locationInfo);
+
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
+
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, WIDESEA_Common.StockEnum.StockChangeType.MaterielGroup);
+
+
+ return WebResponseContent.Instance.OK();
+ }
+
+
+ public async Task<WebResponseContent> InEmptyTaskCompleted(Dt_Task task)
+ {
+
WebResponseContent content = new WebResponseContent();
try
{
- Dt_Task task = await Repository.QueryFirstAsync(x => x.TaskNum == taskNum);
- if (task == null)
- {
- return await Task.FromResult(WebResponseContent.Instance.Error($"鏈壘鍒颁换鍔′俊鎭�"));
- }
+
Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
if (locationInfo == null)
{
return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
}
- Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).Includes(x => x.Details).First();
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
if (stockInfo == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑缁勭洏淇℃伅");
@@ -361,13 +259,24 @@
{
return WebResponseContent.Instance.Error($"璐т綅鐘舵�佷笉姝ｇ‘");
}
- LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
- locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+
+
+ var beforelocationStatus = locationInfo.LocationStatus;
+ locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ _locationInfoService.Repository.UpdateData(locationInfo);
stockInfo.LocationCode = locationInfo.LocationCode;
+ stockInfo.PalletCode = task.PalletCode;
+ stockInfo.LocationCode = task.TargetAddress;
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ _stockRepository.UpdateData(stockInfo);
- Dt_InboundOrder? inboundOrder = _inboundOrderService.Repository.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == stockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
- Dt_InboundOrderDetail? inboundOrderDetail = null;
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforelocationStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
+
+
return content;
}
@@ -376,5 +285,49 @@
return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
}
}
+
+
+
+ public async Task<WebResponseContent> OutEmptyTaskCompleted(Dt_Task task)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode && x.WarehouseId == task.WarehouseId).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺搴旂殑搴撳瓨淇℃伅");
+ }
+ Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+
+ if (locationInfo == null)
+ {
+ return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅");
+ }
+
+ _stockRepository.Db.Deleteable(stockInfo);
+
+ int beforeStatus = locationInfo.LocationStatus;
+
+ locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+
+ _locationInfoService.Repository.UpdateData(locationInfo);
+
+
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
+
+ return WebResponseContent.Instance.OK();
+
+ }
+ catch (Exception ex)
+ {
+ return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
+ }
+ }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
new file mode 100644
index 0000000..f552ffb
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -0,0 +1,233 @@
+锘縰sing Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
+using WIDESEA_Core;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_TaskInfoService
+{
+ public partial class TaskService
+ {
+
+ public async Task<WebResponseContent> RequestInboundTask(string palletCode, string stationCode)
+ {
+ try
+ {
+ Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
+ if (dbtask != null)
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+ }
+
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).Includes(x => x.Details).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
+ }
+
+ if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
+ }
+ if (!string.IsNullOrEmpty(stockInfo.LocationCode))
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
+ }
+
+ Dt_LocationInfo? locationInfo = _locationInfoService.AssignLocation();
+ if (locationInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
+ }
+
+
+ var newTask = new Dt_Task()
+ {
+ CurrentAddress = stationCode,
+ Grade = 0,
+ NextAddress = stations.GetValueOrDefault(stationCode) ?? "",
+ PalletCode = palletCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = stationCode,
+ TargetAddress = locationInfo.LocationCode,
+ TaskType = TaskTypeEnum.Inbound.ObjToInt(),
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ WarehouseId = stockInfo.WarehouseId,
+ PalletType = stockInfo.PalletType,
+
+ };
+ //绌虹
+ if (stockInfo.PalletType == PalletTypeEnum.Empty.ObjToInt())
+ {
+ _unitOfWorkManage.BeginTran();
+ newTask.TaskType = TaskTypeEnum.InEmpty.ObjToInt();
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
+
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ _locationInfoService.UpdateData(locationInfo);
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+
+ _stockRepository.UpdateData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //鑾峰彇鏄惁瀛樺湪鍏ュ簱鍗�
+ Dt_InboundOrder? inboundOrder = null;
+ if (stockInfo != null && stockInfo.Details.Count > 0)
+ {
+ string? orderNo = stockInfo.Details.FirstOrDefault()?.OrderNo ?? "";
+ inboundOrder = _inboundOrderService.Repository.QueryFirst(x => x.InboundOrderNo == orderNo && x.OrderStatus < InOrderStatusEnum.鍏ュ簱瀹屾垚.ObjToInt());
+
+ }
+
+
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+
+ LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus;
+ _unitOfWorkManage.BeginTran();
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
+
+ _locationStatusChangeRecordService.AddLocationStatusChangeRecord(locationInfo, locationInfo.LocationStatus, StockChangeType.Inbound.ObjToInt(), inboundOrder?.InboundOrderNo, newTask.TaskNum);
+
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ _locationInfoService.UpdateData(locationInfo);
+
+ _stockRepository.UpdateData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ }
+ TaskModel esstask = new TaskModel()
+ {
+ taskType = "putaway",
+ taskGroupCode = "",
+ groupPriority = 0,
+ tasks = new List<TasksType>
+ {
+ new()
+ {
+ taskCode=newTask.TaskNum.ToString(),
+ taskPriority=0,
+ taskDescribe=new TaskDescribeType{
+ containerCode=palletCode,
+ containerType= "CT_KUBOT_STANDARD",
+ fromLocationCode=stations.GetValueOrDefault(stationCode)??"",
+ toStationCode="",
+ toLocationCode=locationInfo.LocationCode,
+ deadline=0,storageTag=""
+ }
+ }
+ }
+ };
+ _logger.LogInformation("鍒涘缓浠诲姟Request: " + JsonConvert.SerializeObject(esstask));
+ var result = await _eSSApiService.CreateTaskAsync(esstask);
+
+ _logger.LogInformation("鍒涘缓浠诲姟杩斿洖: " + result);
+ if (result)
+ {
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("涓嬪彂鏈哄櫒浜轰换鍔″け璐ワ紒");
+ }
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 鍏ョ┖绠�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="address"></param>
+ /// <param name="WarehouseId"></param>
+ /// <returns></returns>
+ public WebResponseContent InEmpty(string palletCode, string address, int WarehouseId)
+ {
+ try
+ {
+
+ Dt_Task dbtask = Repository.QueryFirst(x => x.PalletCode == palletCode);
+ if (dbtask != null)
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡鐢熸垚浠诲姟");
+ }
+
+ Dt_StockInfo stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode).First();
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�");
+ }
+ if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.鎷ｉ�夊畬鎴�.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝ｇ‘,涓嶅彲鐢宠鍏ュ簱");
+ }
+ if (!string.IsNullOrEmpty(stockInfo.LocationCode))
+ {
+ return WebResponseContent.Instance.Error($"璇ユ墭鐩樺凡缁戝畾璐т綅");
+ }
+ //stockInfo = new Dt_StockInfo()
+ //{
+ // PalletCode = barcode,
+ // StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(),
+ // WarehouseId = WarehouseId,
+ // PalletType = PalletTypeEnum.Empty.ObjToInt(),
+ // Details = new List<Dt_StockInfoDetail>()
+ //};
+
+ var locationInfo = _locationInfoService.AssignLocation();
+ if (locationInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"璐т綅鍒嗛厤澶辫触,鏈壘鍒板彲鍒嗛厤璐т綅");
+ }
+
+ Dt_Task newTask = new Dt_Task()
+ {
+ CurrentAddress = address,
+ Grade = 0,
+ NextAddress = locationInfo.LocationCode,
+ PalletCode = palletCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = address,
+ TargetAddress = locationInfo.LocationCode,
+ TaskType = TaskTypeEnum.InEmpty.ObjToInt(),
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ WarehouseId = stockInfo.WarehouseId,
+ PalletType = stockInfo.PalletType
+ };
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ _unitOfWorkManage.BeginTran();
+ int taskId = BaseDal.AddData(newTask);
+ newTask.TaskId = taskId;
+ _locationInfoService.UpdateData(locationInfo);
+ stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+ _stockRepository.AddData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+
+
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
new file mode 100644
index 0000000..84cf401
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs"
@@ -0,0 +1,126 @@
+锘縰sing Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OtherEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
+using WIDESEA_Core;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Basic;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_TaskInfoService
+{
+ public partial class TaskService
+ {
+ /// <summary>
+ /// 绌烘墭鐩樺嚭搴撲换鍔�
+ /// </summary>
+ /// <param name="inTask"></param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
+ {
+ try
+ {
+ Dt_StockInfo stockInfo ;
+ if (string.IsNullOrEmpty(palletCode))
+ {
+ stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt()).First();
+ }
+ else
+ {
+ stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == palletCode) .First();
+ }
+
+ if (stockInfo == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒扮┖鎵樼洏搴撳瓨");
+ }
+ Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ if (locationInfo == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒扮┖鎵樼洏搴撳瓨瀵瑰簲鐨勮揣浣嶄俊鎭�");
+ }
+
+ Dt_Task task = new Dt_Task()
+ {
+ CurrentAddress = stockInfo.LocationCode,
+ Grade = 0,
+ NextAddress = endStation,
+ PalletCode = stockInfo.PalletCode,
+ Roadway = locationInfo.RoadwayNo,
+ SourceAddress = stockInfo.LocationCode,
+ TargetAddress = endStation,
+ TaskStatus = TaskStatusEnum.New.ObjToInt(),
+ TaskType = TaskTypeEnum.OutEmpty.ObjToInt(),
+ WarehouseId = stockInfo.WarehouseId,
+ PalletType = stockInfo.PalletType
+
+ };
+ int beforeStatus = locationInfo.LocationStatus;
+ _unitOfWorkManage.BeginTran();
+ stockInfo.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ int taskId = BaseDal.AddData(task);
+ task.TaskId = taskId;
+
+ _stockService.StockInfoService.UpdateData(stockInfo);
+
+ _locationInfoService.UpdateData(locationInfo);
+
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);
+
+ _unitOfWorkManage.CommitTran();
+
+ TaskModel esstask = new TaskModel()
+ {
+ taskType = "carry",
+ taskGroupCode = "",
+ groupPriority = 0,
+ tasks = new List<TasksType>
+ {
+ new()
+ {
+ taskCode=task.TaskNum.ToString(),
+ taskPriority=0,
+ taskDescribe=new TaskDescribeType{
+ containerCode=stockInfo.PalletCode,
+ containerType= "CT_KUBOT_STANDARD",
+ fromLocationCode=stockInfo.LocationCode??"",
+ toStationCode="",
+ toLocationCode=endStation,
+ deadline=0,storageTag=""
+ }
+ }
+ }
+ };
+ _logger.LogInformation("鍒涘缓浠诲姟PalletOutboundTask Request: " + JsonConvert.SerializeObject(esstask));
+ var result = await _eSSApiService.CreateTaskAsync(esstask);
+
+ _logger.LogInformation("鍒涘缓浠诲姟PalletOutboundTask 杩斿洖: " + result);
+ if (result)
+ {
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("涓嬪彂鏈哄櫒浜轰换鍔″け璐ワ紒");
+ }
+
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer.sln" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
index f86f859..7b8e7db 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer.sln"
@@ -68,6 +68,12 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_CheckService", "WIDESEA_CheckService\WIDESEA_CheckService.csproj", "{C57C16CE-88A7-499A-8CE1-855D55482891}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Allocate", "Allocate", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_AllocateService", "WIDESEA_AllocateService\WIDESEA_AllocateService.csproj", "{D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IAllocateService", "WIDESEA_IAllocateService\WIDESEA_IAllocateService.csproj", "{A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -330,6 +336,30 @@
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|Any CPU.Build.0 = Release|Any CPU
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|x86.ActiveCfg = Release|Any CPU
{C57C16CE-88A7-499A-8CE1-855D55482891}.Release|x86.Build.0 = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Debug|x86.Build.0 = Debug|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Dev|x86.ActiveCfg = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Dev|x86.Build.0 = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Release|x86.ActiveCfg = Release|Any CPU
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7}.Release|x86.Build.0 = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Debug|x86.Build.0 = Debug|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Dev|Any CPU.Build.0 = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Dev|x86.ActiveCfg = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Dev|x86.Build.0 = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Release|x86.ActiveCfg = Release|Any CPU
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -359,6 +389,9 @@
{294A53A4-1311-4B71-A812-378A2BCB8346} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
{82EBBC95-FD6E-4E30-9F21-625DE1991C2C} = {294A53A4-1311-4B71-A812-378A2BCB8346}
{C57C16CE-88A7-499A-8CE1-855D55482891} = {294A53A4-1311-4B71-A812-378A2BCB8346}
+ {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {60DE2920-37C6-4C2B-A053-6B1B2DAF047A}
+ {D35E0897-0E66-4E1E-B8DA-28701BE3B2B7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+ {A6E822A3-5A09-4B18-BEE6-57CC7D7B8BEC} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {599A7267-7402-4143-84AE-9B407FC2BB69}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
new file mode 100644
index 0000000..361a8e5
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -0,0 +1,25 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.BaseController;
+using WIDESEA_IAllocateService;
+using WIDESEA_IInboundService;
+using WIDESEA_Model.Models;
+using WIDESEA_Model.Models.Allocate;
+
+namespace WIDESEA_WMSServer.Controllers.Allocate
+{
+
+ /// <summary>
+ /// 璋冩嫧鍗�
+ /// </summary>
+ [Route("api/AllocateOrder")]
+ [ApiController]
+ public class AllocateOrderController : ApiBaseController<IAllocateService, Dt_AllocateOrder>
+ {
+ public AllocateOrderController(IAllocateService service) : base(service)
+ {
+ }
+
+
+ }
+
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
index 1b242d7..5077d26 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
@@ -1,5 +1,6 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Memory;
using Newtonsoft.Json;
using System.DirectoryServices.Protocols;
using System.Threading.Tasks;
@@ -24,10 +25,13 @@
public readonly ITaskService _taskService;
private readonly ILogger<ESSController> _logger;
- public ESSController(ITaskService taskService, ILogger<ESSController> logger)
+ private readonly IMemoryCache _memoryCache;
+ private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+ public ESSController(ITaskService taskService, ILogger<ESSController> logger, IMemoryCache memoryCache)
{
_taskService = taskService;
_logger = logger;
+ _memoryCache = memoryCache;
}
/// <summary>
@@ -38,6 +42,8 @@
[HttpPost("ContainerArrivalReport"), AllowAnonymous]
public async Task<IActionResult> ContainerArrivalReport([FromBody] ContainerArrivalRequest request)
{
+ //杩欓噷瑕佸垽鏂嚭搴撶殑鏃跺�欙紝鏂欑浼氬埌鎵爜澶勩�備篃浼氳姹傝繖涓帴鍙ｃ��
+
var response = new ApiResponse<ContainerArrivalResponseData>
{
Code = 0,
@@ -47,17 +53,69 @@
direction = "100" // 绀轰緥鍊硷細鍙牴鎹疄闄呮儏鍐佃繑鍥炴柟鍚戞垨鍏朵粬淇℃伅
}
};
- var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
- if (result.Status)
+
+ // 鐢熸垚璇锋眰鐨勫敮涓�鏍囪瘑锛堝熀浜巆allId + 鏃堕棿鎴筹級
+ var requestKey = $"callback_{request.CallId}-{request.ContainerCode}_{DateTime.UtcNow:yyyyMMddHH}";
+
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃鐩稿悓鐨勮姹�
+ if (_memoryCache.TryGetValue(requestKey, out bool _))
{
- return Ok(response);
- }
- else
- {
+ _logger.LogWarning("妫�娴嬪埌閲嶅璇锋眰锛屽凡蹇界暐: CallId={CallId}", request.CallId);
response.Code = 1;
response.Msg = "error";
response.Data.direction = "0";
- return Ok(response);
+ return Ok(response);
+ }
+
+
+ await _semaphore.WaitAsync();
+ try
+ {
+ if (_memoryCache.TryGetValue(requestKey, out bool _))
+ {
+ _logger.LogWarning("鍙岄噸妫�鏌ユ娴嬪埌閲嶅璇锋眰锛屽凡蹇界暐: CallId={CallId}", request.CallId);
+ response.Code = 1;
+ response.Msg = "error";
+ response.Data.direction = "0";
+ return Ok(response);
+ }
+
+ var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
+
+ var cacheOptions = new MemoryCacheEntryOptions
+ {
+ AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1)
+ };
+ _memoryCache.Set(requestKey, true, cacheOptions);
+ if (result.Status)
+ {
+ response = new ApiResponse<ContainerArrivalResponseData>
+ {
+ Code = 0,
+ Msg = "",
+ Data = new ContainerArrivalResponseData
+ {
+ direction = "100"
+ }
+ };
+ return Ok(response);
+ }
+ else
+ {
+ response.Code = 1;
+ response.Msg = "error";
+ response.Data.direction = "0";
+ return Ok(response);
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "澶勭悊浠诲姟鐘舵�佸洖璋冩椂鍙戠敓寮傚父: CallId={CallId}", request.CallId);
+ return Ok($"澶勭悊鍥炶皟鏃跺彂鐢熷紓甯�: {ex.Message}");
+ }
+ finally
+ {
+ _semaphore.Release();
}
}
@@ -94,12 +152,6 @@
// 鏍规嵁浜嬩欢绫诲瀷鍜岀姸鎬佽繘琛屼笉鍚岀殑涓氬姟澶勭悊
switch (request.EventType)
{
- case EventType.task:
- await HandleTaskStatusChange(request);
- break;
- case EventType.task_allocated:
- await HandleTaskAllocated(request);
- break;
case EventType.tote_load:
await HandleToteLoad(request);
break;
@@ -109,6 +161,13 @@
case EventType.robot_reach:
await HandleRobotReach(request);
break;
+ case EventType.task:
+ await HandleTaskStatusChange(request);
+ break;
+ case EventType.task_allocated:
+ await HandleTaskAllocated(request);
+ break;
+
default:
_logger.LogWarning("鏈煡鐨勪簨浠剁被鍨�: {EventType}", request.EventType);
break;
@@ -156,6 +215,7 @@
_logger.LogInformation("浠诲姟瀹屾垚: TaskCode={TaskCode}, Container={Container}, Robot={Robot}",
request.TaskCode, request.ContainerCode, request.RobotCode);
+ _taskService.TaskCompleted(request.TaskCode);
// 鏍规嵁涓嶅悓鐨勪换鍔＄被鍨嬭繘琛岀壒娈婂鐞�
if (request.Weight.HasValue)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index d00daf2..1f7f40b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -5,6 +5,7 @@
using SqlSugar;
using System.Net;
using System.Threading.Tasks;
+using WIDESEA_BasicService;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
@@ -30,16 +31,20 @@
private readonly WIDESEA_IBasicService.IInvokeMESService _invokeMESService;
private readonly IESSApiService _eSSApiService;
- public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService) : base(service)
+
+ private readonly IDailySequenceService _dailySequenceService;
+ public InboundOrderController(IInboundOrderService service, WIDESEA_IBasicService.IErpApiService erpApiService, WIDESEA_IBasicService.IInvokeMESService invokeMESService, IESSApiService eSSApiService, IDailySequenceService dailySequenceService) : base(service)
{
this.erpApiService = erpApiService;
_invokeMESService = invokeMESService;
_eSSApiService = eSSApiService;
+ _dailySequenceService = dailySequenceService;
}
[HttpPost, Route("Test"), AllowAnonymous, MethodParamsValidate]
public async Task<WebResponseContent> Test()
{
+ await _dailySequenceService.GetNextSequenceAsync();
//erpApiService.GetSuppliersAsync();
//erpApiService.GetMaterialUnitAsync();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
index dae1303..c567f89 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
@@ -53,6 +53,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEA_AllocateService\WIDESEA_AllocateService.csproj" />
<ProjectReference Include="..\WIDESEA_BasicService\WIDESEA_BasicService.csproj" />
<ProjectReference Include="..\WIDESEA_CheckService\WIDESEA_CheckService.csproj" />
<ProjectReference Include="..\WIDESEA_InboundService\WIDESEA_InboundService.csproj" />
--
Gitblit v1.9.3