From c827fe7b0c5b3b444d76ba0d96a2649c764630dd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 14 十一月 2024 16:36:08 +0800
Subject: [PATCH] 修改WCS、WMS出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 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 066b483..bd475f9 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"
@@ -150,40 +150,97 @@
}
/// <summary>
- /// 鍫嗗灈鏈虹敵璇峰叆搴擄紒锛侊紒锛侊紒锛侊紒鍏ュ簱鍒嗛厤閫昏緫寰呭畾
+ /// 鍫嗗灈鏈虹敵璇峰叆搴�
/// </summary>
/// <param name="task"></param>
/// <returns></returns>
public WebResponseContent StackerCraneRequestInbound(ConveyorLineDTO lineDTO)
{
- WebResponseContent content = new WebResponseContent().OK();
+ WebResponseContent content = new WebResponseContent();
try
{
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.Line_InFinish) 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}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
- Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(lineDTO.stationCode, TaskTypeEnum.Inbound.ObjToInt());
- if (locationInfo == null) throw new Exception($"鏃犲彲鍏ヨ揣浣�");
- locationInfo.LocationStatus = LocationStatusEnum.Inbounding.ObjToInt();
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱涓�.ObjToInt();
- using (TransactionScope scope = new TransactionScope())
+
+ 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)
{
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- scope.Complete();
+ locationInfo = _basicService.LocationInfoService.GetLocation(instockInfo.LocationCode);
}
- content.Data = new ReceiveWMSInfo()
+ #endregion
+ else
{
- TargetAddress = locationInfo.LocationCode,
- IsPickPlace = locationInfo.MaxQty - locationInfo.CurrentQty == 1,
- };
+ instockInfoDetail = _stockService.StockInfoDetailService.Get_StockInfoDetail(stockInfoDetail.OrderNo);//鍏ュ簱鍗曞瓨鍦ㄥ簱瀛橈紝鍒ゆ柇璐т綅
+ 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
+ {
+ 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 == null)
+ {
+ int inboundOrderCount = inboundOrder.Details.Count;
+ List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Get_StockInfoDetails(stockInfoDetail.OrderNo);//鑾峰彇宸ュ崟鎵�鏈夊凡鍏ュ簱鎴栧叆搴撲腑搴撳瓨
+ if (stockInfoDetails != null || stockInfoDetails.Count > 0) inboundOrderCount -= stockInfoDetails.GroupBy(x => x.BatchNo).Count();
+ 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.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 == 12) locationInfo.EnableStatus = EnableStatusEnum.OnlyOut.ObjToInt();
+ locationInfo.LocationStatus = LocationStatusEnum.Inbounding.ObjToInt();
+
+ Db.Ado.BeginTran();
+ UpdateData(task);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
+ Db.Ado.CommitTran();
+ #endregion
+ content.OK(data: new ReceiveWMSInfo()
+ {
+ TargetAddress = task.TargetAddress,
+ IsPickPlace = task.IsPickPlace,
+ });
}
catch (Exception ex)
{
+ Db.Ado.RollbackTran();
content.Error(ex.Message);
}
return content;
--
Gitblit v1.9.3