From 559bb7b4be83575cc5fedee98484647243c96f89 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 15:57:44 +0800
Subject: [PATCH] feat: 空托盘出库完整流程 + 输送线调度优化 + S7Simulator 协议同步增强
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 181 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 9 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
index af5cc9a..935624b 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs
@@ -11,6 +11,7 @@
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
+using WIDESEA_IRecordService;
using WIDESEA_Model.Models;
namespace WIDESEA_BasicService
@@ -23,6 +24,8 @@
private readonly IMapper _mapper;
private readonly IRepository<Dt_Task> _taskRepository;
private readonly IRepository<Dt_StockInfo> _stockInfoRepository;
+ private readonly IRecordService _recordService;
+ private readonly IRepository<Dt_Warehouse> _warehouseRepository;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -34,11 +37,15 @@
IRepository<Dt_LocationInfo> baseDal,
IRepository<Dt_Task> taskRepository,
IRepository<Dt_StockInfo> stockInfoRepository,
- IMapper mapper) : base(baseDal)
+ IRepository<Dt_Warehouse> warehouseRepository,
+ IMapper mapper,
+ IRecordService recordService) : base(baseDal)
{
_taskRepository = taskRepository;
_stockInfoRepository = stockInfoRepository;
_mapper = mapper;
+ _recordService = recordService;
+ _warehouseRepository = warehouseRepository;
}
/// <summary>
@@ -137,10 +144,10 @@
x.LocationStatus == LocationStatusEnum.Free.GetHashCode());
return locations?
- .OrderBy(x => x.Layer)
- .ThenByDescending(x => x.Depth)
- .ThenBy(x => x.Column)
- .ThenBy(x => x.Row)
+ .OrderByDescending(x => x.Depth) // 1. 娣卞害浼樺厛锛堜粠澶у埌灏忥級
+ .ThenBy(x => x.Layer) // 2. 灞傛暟
+ .ThenBy(x => x.Column) // 3. 鍒�
+ .ThenBy(x => x.Row) // 4. 琛�
.FirstOrDefault();
}
@@ -166,13 +173,64 @@
}
/// <summary>
+ /// 鏍规嵁璐т綅ID鑾峰彇璐т綅淇℃伅
+ /// </summary>
+ /// <param name="id">璐т綅id</param>
+ /// <returns>璐т綅淇℃伅</returns>
+ public async Task<Dt_LocationInfo> GetLocationInfoAsync(int id)
+ {
+ return await BaseDal.QueryFirstAsync(x => x.Id == id);
+ }
+
+ /// <summary>
/// 鏇存柊璐т綅淇℃伅
/// </summary>
/// <param name="locationInfo">璐т綅淇℃伅瀵硅薄</param>
/// <returns>鏇存柊鏄惁鎴愬姛</returns>
public async Task<bool> UpdateLocationInfoAsync(Dt_LocationInfo locationInfo)
{
- return await BaseDal.UpdateDataAsync(locationInfo);
+ var beforeLocation = await BaseDal.QueryFirstAsync(x => x.Id == locationInfo.Id);
+ var result = await BaseDal.UpdateDataAsync(locationInfo);
+ if (!result)
+ return false;
+
+ return beforeLocation == null
+ || await _recordService.AddLocationChangeRecordAsync(beforeLocation, locationInfo, LocationChangeType.HandUpdate, remark: "璐т綅鏇存柊");
+ }
+
+ public override WebResponseContent UpdateData(Dt_LocationInfo entity)
+ {
+ var beforeLocation = BaseDal.QueryFirst(x => x.Id == entity.Id);
+ var result = base.UpdateData(entity);
+ if (!result.Status || beforeLocation == null)
+ return result;
+
+ var saveRecordResult = _recordService.AddLocationChangeRecordAsync(beforeLocation, entity, LocationChangeType.HandUpdate, remark: "璐т綅鏇存柊").GetAwaiter().GetResult();
+ return saveRecordResult ? result : WebResponseContent.Instance.Error("璐т綅鐘舵�佸彉鏇磋褰曚繚瀛樺け璐�");
+ }
+
+ public override WebResponseContent UpdateData(List<Dt_LocationInfo> entities)
+ {
+ var beforeLocations = entities
+ .Select(entity => BaseDal.QueryFirst(x => x.Id == entity.Id))
+ .Where(location => location != null)
+ .ToDictionary(location => location!.Id, location => location!);
+
+ var result = base.UpdateData(entities);
+ if (!result.Status)
+ return result;
+
+ foreach (var entity in entities)
+ {
+ if (!beforeLocations.TryGetValue(entity.Id, out var beforeLocation))
+ continue;
+
+ var saveRecordResult = _recordService.AddLocationChangeRecordAsync(beforeLocation, entity, LocationChangeType.HandUpdate, remark: "鎵归噺璐т綅鏇存柊").GetAwaiter().GetResult();
+ if (!saveRecordResult)
+ return WebResponseContent.Instance.Error("璐т綅鐘舵�佸彉鏇磋褰曚繚瀛樺け璐�");
+ }
+
+ return result;
}
/// <summary>
@@ -281,6 +339,9 @@
};
var createdTask = await _taskRepository.Db.Insertable(newTransferTask).ExecuteReturnEntityAsync();
+ var beforeStock = CloneStockSnapshot(stockInfo);
+ var beforeSourceLocation = stockInfo.LocationDetails == null ? null : CloneLocationSnapshot(stockInfo.LocationDetails);
+ var beforeTargetLocation = CloneLocationSnapshot(emptyLocation);
// 鍒涘缓绉诲簱浠诲姟鍚庯紝绔嬪嵆閿佸畾搴撳瓨鍜岀浉鍏宠揣浣嶏紝閬垮厤骞跺彂閲嶅鍒嗛厤
stockInfo.StockStatus = StockStatusEmun.绉诲簱閿佸畾.GetHashCode();
@@ -302,7 +363,102 @@
throw new Exception("鍒涘缓绉诲簱浠诲姟鍚庢洿鏂板簱瀛樼姸鎬佹垨璐т綅鐘舵�佸け璐�");
}
+ var saveStockRecordResult = await _recordService.AddStockChangeRecordAsync(
+ beforeStock,
+ stockInfo,
+ StockChangeTypeEnum.Relocation,
+ createdTask.TaskNum,
+ createdTask.OrderNo,
+ "绉诲簱浠诲姟棰勫崰搴撳瓨");
+ if (!saveStockRecordResult)
+ {
+ throw new Exception("鍒涘缓绉诲簱浠诲姟鍚庤褰曞簱瀛樺彉鏇村け璐�");
+ }
+
+ if (beforeSourceLocation != null && stockInfo.LocationDetails != null)
+ {
+ var saveSourceLocationRecordResult = await _recordService.AddLocationChangeRecordAsync(
+ beforeSourceLocation,
+ stockInfo.LocationDetails,
+ LocationChangeType.RelocationAssignLocation,
+ createdTask.TaskNum,
+ createdTask.OrderNo,
+ null,
+ "绉诲簱浠诲姟閿佸畾婧愯揣浣�");
+ if (!saveSourceLocationRecordResult)
+ {
+ throw new Exception("鍒涘缓绉诲簱浠诲姟鍚庤褰曟簮璐т綅鍙樻洿澶辫触");
+ }
+ }
+
+ var saveTargetLocationRecordResult = await _recordService.AddLocationChangeRecordAsync(
+ beforeTargetLocation,
+ emptyLocation,
+ LocationChangeType.RelocationAssignLocation,
+ createdTask.TaskNum,
+ createdTask.OrderNo,
+ null,
+ "绉诲簱浠诲姟閿佸畾鐩爣璐т綅");
+ if (!saveTargetLocationRecordResult)
+ {
+ throw new Exception("鍒涘缓绉诲簱浠诲姟鍚庤褰曠洰鏍囪揣浣嶅彉鏇村け璐�");
+ }
+
return createdTask;
+ }
+
+ private static Dt_LocationInfo CloneLocationSnapshot(Dt_LocationInfo location)
+ {
+ return new Dt_LocationInfo
+ {
+ Id = location.Id,
+ WarehouseId = location.WarehouseId,
+ LocationCode = location.LocationCode,
+ LocationName = location.LocationName,
+ RoadwayNo = location.RoadwayNo,
+ Row = location.Row,
+ Column = location.Column,
+ Layer = location.Layer,
+ Depth = location.Depth,
+ LocationType = location.LocationType,
+ LocationStatus = location.LocationStatus,
+ EnableStatus = location.EnableStatus,
+ Remark = location.Remark
+ };
+ }
+
+ private static Dt_StockInfo CloneStockSnapshot(Dt_StockInfo stockInfo)
+ {
+ return new Dt_StockInfo
+ {
+ Id = stockInfo.Id,
+ PalletCode = stockInfo.PalletCode,
+ PalletType = stockInfo.PalletType,
+ LocationId = stockInfo.LocationId,
+ LocationCode = stockInfo.LocationCode,
+ WarehouseId = stockInfo.WarehouseId,
+ StockStatus = stockInfo.StockStatus,
+ Remark = stockInfo.Remark,
+ OutboundDate = stockInfo.OutboundDate,
+ Details = stockInfo.Details?.Select(detail => new Dt_StockInfoDetail
+ {
+ Id = detail.Id,
+ StockId = detail.StockId,
+ MaterielCode = detail.MaterielCode,
+ MaterielName = detail.MaterielName,
+ OrderNo = detail.OrderNo,
+ BatchNo = detail.BatchNo,
+ ProductionDate = detail.ProductionDate,
+ EffectiveDate = detail.EffectiveDate,
+ SerialNumber = detail.SerialNumber,
+ StockQuantity = detail.StockQuantity,
+ OutboundQuantity = detail.OutboundQuantity,
+ Status = detail.Status,
+ Unit = detail.Unit,
+ InboundOrderRowNo = detail.InboundOrderRowNo,
+ Remark = detail.Remark
+ }).ToList()
+ };
}
/// <summary>
@@ -351,11 +507,18 @@
/// <param name="layer">灞傛暟</param>
/// <param name="depth">娣卞害</param>
/// <returns>璐т綅淇℃伅瀵硅薄</returns>
- private static Dt_LocationInfo CreateLocationInfo(string roadwayNo, int row, int col, int layer, int depth)
+ private Dt_LocationInfo CreateLocationInfo(string roadwayNo, int row, int col, int layer, int depth)
{
+ var warehouse = _warehouseRepository.QueryData(x => x.WarehouseCode == roadwayNo).FirstOrDefault();
+
+ if (warehouse == null)
+ {
+ throw new InvalidOperationException($"鏈壘鍒板贩閬撶紪鍙蜂负 {roadwayNo} 鐨勪粨搴撲俊鎭�");
+ }
+
return new Dt_LocationInfo
{
- WarehouseId = 0,
+ WarehouseId = warehouse.WarehouseId,
Row = row,
Column = col,
Layer = layer,
@@ -364,7 +527,7 @@
EnableStatus = EnableStatusEnum.Normal.GetHashCode(),
LocationStatus = LocationStatusEnum.Free.GetHashCode(),
LocationType = LocationTypeEnum.Undefined.GetHashCode(),
- LocationCode = $"{row:D3}-{col:D3}-{layer:D3}",
+ LocationCode = $"{roadwayNo}-{row:D3}-{col:D3}-{layer:D3}",
LocationName = $"{roadwayNo}宸烽亾{row:D3}琛寋col:D3}鍒梴layer:D3}灞倇depth:D2}娣�"
};
}
--
Gitblit v1.9.3