From 8467804705615f7614c29e7ef7ac3e99f5c13a54 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 11 二月 2025 13:53:05 +0800
Subject: [PATCH] 优化WMS接口日志记录，添加接口名称和接口描述
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 102 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 25 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 bd475f9..e60d181 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"
@@ -122,7 +122,7 @@
locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
if (isUpdateStock)
{
- locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.OutLock.ObjToInt();
if (stockInfo != null && stockInfo.Details != null && stockInfo.Details.Count > 0)
{
orderNo = stockInfo.Details.FirstOrDefault()?.OrderNo ?? "";
@@ -159,50 +159,99 @@
WebResponseContent content = new WebResponseContent();
try
{
+ Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == lineDTO.stationCode) ?? throw new Exception("鏈壘鍒拌绔欏彴瀵瑰簲鐨勫贩閬擄紝璇锋鏌ュ熀纭�閰嶇疆淇℃伅");
+ if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt())
+ {
+ throw new Exception("璇ュ贩閬撲笉鍙叆搴擄紝璇锋鏌ュ贩閬撶鐢ㄤ俊鎭�");
+ }
+ if (roadwayInfo.AreaId > 0)
+ {
+ Dt_AreaInfo areaInfo = _basicRepository.AreaInfoRepository.QueryFirst(x => x.Id == roadwayInfo.AreaId);
+ if (areaInfo != null && areaInfo.AreaStatus == EnableEnum.Disable.ObjToInt())
+ {
+ throw new Exception("鍖哄煙琚鐢紝涓嶅彲鍏ュ簱");
+ }
+ }
var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
if (task == null) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
- if (task.TaskState >= (int)InTaskStatusEnum.Line_InFinish) throw new Exception($"鎵樼洏鍙穂{lineDTO.Barcode}]鐨勫叆搴撲换鍔＄姸鎬佷笉鍖归厤");
+ if (task.TaskState >= (int)InTaskStatusEnum.SC_InExecuting) throw new Exception($"鎵樼洏鍙穂{lineDTO.Barcode}]鐨勫叆搴撲换鍔＄姸鎬佷笉鍖归厤");
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
if (stockInfo == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勭粍鐩樹俊鎭�");
Dt_StockInfoDetail? stockInfoDetail = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).FirstOrDefault();
if (stockInfoDetail == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勭粍鐩樿鎯�");
- if (stockInfo.StockStatus != StockStatusEmun.鍏ュ簱纭.ObjToInt()) throw new Exception($"鎵樼洏[{lineDTO.Barcode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
+ if (stockInfo.StockStatus != StockStatusEmun.鍏ュ簱纭.ObjToInt() || !string.IsNullOrEmpty(stockInfo.LocationCode))
+ throw new Exception($"鎵樼洏[{lineDTO.Barcode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
- if (inboundOrder == null || inboundOrder.Details == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勫叆搴撳崟鏄庣粏淇℃伅");
- Dt_StockInfo instockInfo = null;
- Dt_LocationInfo locationInfo = null;
- #region 鍒ゆ柇褰撳墠鍏ュ簱鎵樼洏鎵规鍙锋槸鍚﹀瓨鍦ㄥ凡鍒嗛厤鍏ュ簱
- Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo, stockInfoDetail.BatchNo);
- if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
- if (instockInfo != null)
+ if (inboundOrder == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勫叆搴撳崟淇℃伅");
+
+ #region 鍒ゆ柇鏄惁鎸囧畾璐т綅
+ Dt_InboundOrderDetail? orderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfoDetail.BatchNo);
+ if (orderDetail == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勫叆搴撳崟鏄庣粏淇℃伅");
+ Dt_LocationInfo? locationInfo = null;
+ if (!string.IsNullOrEmpty(orderDetail.LocationCode))
{
- locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
+ locationInfo = _basicService.LocationInfoService.GetLocation(orderDetail.LocationCode);
}
#endregion
+
+ #region 鍒ゆ柇褰撳墠鍏ュ簱鎵樼洏鎵规鍙锋槸鍚﹀瓨鍦ㄥ凡鍒嗛厤鍏ュ簱
else
{
- instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo);//鍏ュ簱鍗曞瓨鍦ㄥ簱瀛橈紝鍒ゆ柇璐т綅
+ Dt_StockInfo? instockInfo = null;
+ Dt_StockInfoDetail instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo, stockInfoDetail.BatchNo);
if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
if (instockInfo != null)
{
locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
- //if (locationInfo.MaxQty == 12)
- //{
- // locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
- // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- // locationInfo = null;
- //}
- if (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt()) locationInfo = null;
- else
+ if (locationInfo.MaxQty <= locationInfo.CurrentQty) locationInfo = null;
+ }
+ #endregion
+ else
+ {
+ instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo);//鍏ュ簱鍗曞瓨鍦ㄥ簱瀛橈紝鍒ゆ柇璐т綅
+ if (instockInfoDetail != null) instockInfo = _stockService.StockInfoService.Repository.GetStockInfo(instockInfoDetail.StockId);
+ if (instockInfo != null)
{
- List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//鑾峰彇宸ュ崟鎵�鏈夊凡鍏ュ簱鎴栧叆搴撲腑搴撳瓨
- if (stockInfoDetails.GroupBy(x => x.BatchNo).Count() < 2) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
- else locationInfo = null;
+ locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);//鏌ヨ宸插瓨鍦ㄥ簱瀛樿揣浣嶇姸鎬�
+ #region MyRegion
+ //if (locationInfo.MaxQty == 12)
+ //{
+ // locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
+ // _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ // locationInfo = null;
+ //}
+ //if (locationInfo.EnableStatus == EnableStatusEnum.OnlyOut.ObjToInt()) locationInfo = null;
+ #endregion
+ if (locationInfo.LocationStatus > LocationStatusEnum.Inbounding.ObjToInt()) locationInfo = null;
+
+ else
+ {
+ #region 鍒ゆ柇璐т綅
+ if (locationInfo.Row == 1)//澶栦晶璐т綅锛屽垽鏂唴渚ц揣浣�
+ {
+ var newLocation = Db.Queryable<Dt_LocationInfo>().Where(x => x.LocationCode != locationInfo.LocationCode && x.Remark == locationInfo.Remark).First();
+ if (newLocation != null)
+ {
+ if (newLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt() &&
+ (newLocation.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() ||
+ newLocation.EnableStatus == EnableStatusEnum.Normal.ObjToInt()))
+ {
+ locationInfo = newLocation;
+ }
+ }
+ }
+ #endregion
+ //List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//鑾峰彇宸ュ崟鎵�鏈夊凡鍏ュ簱鎴栧叆搴撲腑搴撳瓨
+ //if (stockInfoDetails.GroupBy(x => x.BatchNo).Count() < 2) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
+ //else locationInfo = null;
+ }
+ //if (locationInfo?.MaxQty <= locationInfo?.CurrentQty) locationInfo = null;
}
}
- if (locationInfo == null)
+
+ if (locationInfo == null)//鍒嗛厤鏂拌揣浣�
{
int inboundOrderCount = inboundOrder.Details.Count;
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//鑾峰彇宸ュ崟鎵�鏈夊凡鍏ュ簱鎴栧叆搴撲腑搴撳瓨
@@ -210,18 +259,21 @@
locationInfo = _basicService.LocationInfoService.AssignLocation(inboundOrderCount);//閲嶆柊鍒嗛厤璐т綅
}
}
+
+
if (locationInfo == null) throw new Exception($"鏃犲彲鍏ヨ揣浣�");
#region 淇敼搴撳瓨鍙婅揣浣嶄俊鎭�
task.TaskState = (int)InTaskStatusEnum.SC_InExecuting;
task.CurrentAddress = task.NextAddress;
- task.NextAddress = locationInfo.LocationCode;
+ task.NextAddress = locationInfo.LocationCode;//浣跨敤璐т綅澶囨敞瀛楁锛屽搴斿爢鍨涙満鎺掑垪灞�
task.TargetAddress = task.NextAddress;
task.IsPickPlace = locationInfo.MaxQty - locationInfo.CurrentQty == 1;
stockInfo.LocationCode = locationInfo.LocationCode;
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱涓�.ObjToInt();
stockInfoDetail.Status = StockStatusEmun.鍏ュ簱涓�.ObjToInt();
locationInfo.CurrentQty++;
+ if (locationInfo.MaxQty < locationInfo.CurrentQty) throw new Exception();
if (locationInfo.MaxQty == 12) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
locationInfo.LocationStatus = LocationStatusEnum.Inbounding.ObjToInt();
--
Gitblit v1.9.3