From 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 19 四月 2025 19:50:43 +0800
Subject: [PATCH] 优化空托出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
index 90c8d2c..095fc47 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
@@ -303,7 +303,16 @@
Dt_LocationInfo? locationInfo = null;
string CarChargingStation = AppSettings.Configuration[nameof(CarChargingStation)];//鑾峰彇绌挎杞﹀厖鐢典綅缃�
var ChargingStations = CarChargingStation.Split(",");
- Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Repository.QueryData(x => x.MaterielCode == stockInfoDetail.MaterielCode).OrderByDescending(x => x.CreateDate).First();
+ Dt_StockInfoDetail? instockInfoDetail = null;
+ var instockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => x.MaterielCode == stockInfoDetail.MaterielCode && x.Status == StockStatusEmun.鍏ュ簱涓�.ObjToInt());
+ if (instockInfoDetails.Count > 0)
+ instockInfoDetail = instockInfoDetails.OrderByDescending(x => x.CreateDate).First();
+ if (instockInfoDetails.Count < 1)
+ {
+ instockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => x.MaterielCode == stockInfoDetail.MaterielCode && x.Status == StockStatusEmun.宸插叆搴�.ObjToInt());
+ if (instockInfoDetails != null && instockInfoDetails.Count > 0)
+ instockInfoDetail = instockInfoDetails.OrderByDescending(x => x.CreateDate).First();
+ }
if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
if (instockInfo != null)//鏃犲簱瀛�
{
@@ -316,6 +325,10 @@
{
locationInfo = null;
}
+ if (locationInfo == null)
+ {
+ locationInfo = _basicService.LocationInfoService.GetLocationPallet();
+ }
}
else
{
@@ -323,6 +336,12 @@
}
if (locationInfo == null) locationInfo = _basicService.LocationInfoService.AssignLocation(2);//閲嶆柊鍒嗛厤璐т綅
if (locationInfo == null) throw new Exception($"鏃犲彲鍏ヨ揣浣�");
+ Dt_LocationInfo? locationInfo1 = null;
+ if (locationInfo.Row == 1)
+ {
+ locationInfo1 = _basicService.LocationInfoService.Repository.QueryFirst(x => x.Row == 2 && x.Layer == locationInfo.Layer && x.Column == locationInfo.Column);
+ locationInfo1.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
task.TaskState = (int)InTaskStatusEnum.SC_InExecuting;
task.CurrentAddress = task.NextAddress;
@@ -343,6 +362,7 @@
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
_basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ if (locationInfo1 != null) _basicService.LocationInfoService.Repository.UpdateData(locationInfo1);
Db.Ado.CommitTran();
return WebResponseContent.Instance.OK(data: new ReceiveWMSInfo()
--
Gitblit v1.9.3