新增MES库区管理功能,包含免密接口、数据处理逻辑及相关控制器、服务和实体的实现。支持库区的增删改查操作,优化用户体验并增强系统的实时数据同步能力。

This commit is contained in:
geht
2026-05-12 14:06:07 +08:00
parent cffe32d896
commit b737dddb2a
74 changed files with 4937 additions and 174 deletions

View File

@@ -256,6 +256,67 @@ public class RawMaterialCardService : IRawMaterialCardService, ISingletonDepende
return allSuccess;
}
/// <summary>
/// 「重新拆码」专用:按 splitDetailId IN 批量删除卡片。
/// 走后端 /anon/deleteBySplitDetailIdsserver 端用 LambdaUpdateWrapper.in().remove() 一次完成。
/// dryRun=true 时仅查询匹配数量、不删除(用于桌面端弹窗确认前的预提示)。
/// 仅在线时调用——离线场景不支持本操作(涉及跨记录批量删,难以走 PendingOps 同步还原)。
/// </summary>
public async Task<int> DeleteBySplitDetailIdsAsync(IEnumerable<string> splitDetailIds, bool dryRun = false, CancellationToken ct = default)
{
if (splitDetailIds == null) return 0;
var distinctIds = splitDetailIds
.Where(s => !string.IsNullOrWhiteSpace(s))
.Select(s => s.Trim())
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
if (distinctIds.Count == 0) return 0;
if (!_networkMonitor.IsOnline)
{
_logger.Warning("[原材料卡片] 当前离线,无法按拆码明细 ID 批量删除卡片");
return -1;
}
try
{
var idsQs = string.Join(",", distinctIds.Select(Uri.EscapeDataString));
var url = $"{BaseUrl}/xslmes/mesXslRawMaterialCard/anon/deleteBySplitDetailIds"
+ $"?splitDetailIds={idsQs}&dryRun={(dryRun ? "true" : "false")}&tenantId={DefaultTenantId}";
using var client = CreateClient();
var resp = await client.PostAsync(url, new StringContent(string.Empty), ct).ConfigureAwait(false);
if (!resp.IsSuccessStatusCode)
{
_logger.Warning($"[原材料卡片] 按拆码明细ID批删 HTTP {(int)resp.StatusCode}");
return -1;
}
var json = await resp.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
using var doc = JsonDocument.Parse(json);
var code = doc.RootElement.TryGetProperty("code", out var codeEl) ? codeEl.GetInt32() : -1;
if (code != 200) return -1;
var count = doc.RootElement.TryGetProperty("result", out var resultEl) && resultEl.ValueKind == JsonValueKind.Number
? resultEl.GetInt32()
: 0;
if (!dryRun && count > 0)
{
// 同步清理本地缓存:把 SplitDetailId 在 distinctIds 中的卡片移除
var idSet = new HashSet<string>(distinctIds, StringComparer.OrdinalIgnoreCase);
lock (_cacheLock)
{
_localCache.RemoveAll(c => !string.IsNullOrWhiteSpace(c.SplitDetailId) && idSet.Contains(c.SplitDetailId!));
SaveCacheToDiskUnsafe();
}
}
return count;
}
catch (Exception ex)
{
_logger.Warning($"[原材料卡片] 按拆码明细ID批删异常: {ex.Message}");
return -1;
}
}
public async Task<bool> UpdatePriorityAsync(string id, string priorityPickup, CancellationToken ct = default)
{
if (_networkMonitor.IsOnline)
@@ -662,6 +723,7 @@ public class RawMaterialCardService : IRawMaterialCardService, ISingletonDepende
{
Id = input.Id,
Barcode = input.Barcode,
SplitDetailId = input.SplitDetailId,
BatchNo = input.BatchNo,
EntryDate = input.EntryDate,
MaterialId = input.MaterialId,