From 46e98339480d853fc78a014c34d7ff9fcaf13890 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 05 十二月 2024 14:09:02 +0800
Subject: [PATCH] 产线协议
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 202 ++++++++++++++++++++++----------------------------
1 files changed, 90 insertions(+), 112 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 26748a6..48c0576 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"
@@ -113,7 +113,7 @@
Roadway = locationInfo.RoadwayNo,
SourceAddress = stationCode,
TargetAddress = locationInfo.LocationCode,
- TaskStatus = InTaskStatusEnum.InNew.ObjToInt(),
+ TaskState = InTaskStatusEnum.InNew.ObjToInt(),
TaskType = taskType,
};
BaseDal.AddData(task);
@@ -150,141 +150,119 @@
}
/// <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.TaskStatus != (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}]鐨勭粍鐩樹俊鎭�");
- 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())
- {
- _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- scope.Complete();
- }
- content.Data = new ReceiveWMSInfo()
- {
- TargetAddress = locationInfo.LocationCode,
- IsPickPlace = locationInfo.MaxQty - locationInfo.CurrentQty == 1,
- };
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 杈撻�佺嚎鐢宠鍏ュ簱
- /// </summary>
- /// <param name="lineDTO"></param>
- /// <returns></returns>
- public WebResponseContent ConveyorLineRequestInbound(ConveyorLineDTO lineDTO)
- {
- WebResponseContent content = new WebResponseContent().OK();
- try
- {
- var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
- if (task == null) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
- if (task.TaskStatus != (int)InTaskStatusEnum.AGV_InFinish) 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() || !string.IsNullOrEmpty(stockInfo.LocationCode))
+ throw new Exception($"鎵樼洏[{lineDTO.Barcode}],璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
- (bool, string) result = CheckRequestInbound(lineDTO.stationCode, lineDTO.Barcode, true, stockInfo);
- if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);
+ Dt_InboundOrder inboundOrder = _inboundService.InbounOrderService.GetInboundOrder(stockInfoDetail.OrderNo);
+ if (inboundOrder == null || inboundOrder.Details == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勫叆搴撳崟鏄庣粏淇℃伅");
+ Dt_LocationInfo locationInfo = null;
- if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//鏉′欢闇�鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
+ #region 鍒ゆ柇鏄惁鎸囧畾璐т綅
+ Dt_InboundOrderDetail orderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfoDetail.BatchNo);
+ if (orderDetail != null && !string.IsNullOrEmpty(orderDetail.LocationCode))
{
- task.NextAddress = "101";
- task.TaskStatus = (int)InTaskStatusEnum.InException;
- task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱鎾ら攢.ObjToInt();
- }
- else
- {
- task.NextAddress = "104";
- task.CurrentAddress = lineDTO.stationCode;
- task.TaskStatus = (int)InTaskStatusEnum.Line_InExecuting;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- }
-
- #region 浜嬪姟
- using (TransactionScope scope = new TransactionScope())
- {
- BaseDal.UpdateData(task);
- Db.Updateable(stockInfo);
- scope.Complete();
+ locationInfo = _basicService.LocationInfoService.GetLocation(orderDetail.LocationCode);
}
#endregion
- if (!string.IsNullOrEmpty(task.Remark)) throw new Exception(task.Remark);
+ #region 鍒ゆ柇褰撳墠鍏ュ簱鎵樼洏鎵规鍙锋槸鍚﹀瓨鍦ㄥ凡鍒嗛厤鍏ュ簱
+ else
+ {
+ 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 <= 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)
+ {
+ 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?.MaxQty <= locationInfo?.CurrentQty) 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 < locationInfo.CurrentQty) throw new Exception();
+ 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)
{
- content.Code = 404;
+ Db.Ado.RollbackTran();
content.Error(ex.Message);
}
return content;
- }
- /// <summary>
- /// 楠岃瘉鏁版嵁
- /// </summary>
- /// <param name="stationCode">璧峰鍦板潃</param>
- /// <param name="palletCode">鎵樼洏缂栧彿</param>
- /// <param name="isCheckStock">鏄惁妫�鏌ョ粍鐩樹俊鎭�--鍖哄垎鐗╂枡鍏ュ簱鍜岀┖鎵樺叆搴�</param>
- /// <param name="stockInfo">缁勭洏淇℃伅--鍙┖</param>
- /// <returns>杩斿洖澶勭悊缁撴灉</returns>
- private (bool, string) CheckRequestInbound(string stationCode, string palletCode, bool isCheckStock = true, Dt_StockInfo? stockInfo = null)
- {
- //if (BaseDal.QueryFirst(x => x.PalletCode == palletCode) != null)
- //{
- // return (false, "璇ユ墭鐩樺彿宸叉湁浠诲姟");
- //}
- if (BaseDal.QueryFirst(x => (x.SourceAddress == stationCode || x.CurrentAddress == stationCode) && x.TaskStatus == InTaskStatusEnum.AGV_InFinish.ObjToInt()) != null)
- {
- return (false, "褰撳墠鍏ュ簱绔欏彴宸叉湁涓�鏉′换鍔�");
- }
- if (isCheckStock)
- {
- if (stockInfo == null)
- {
- return (false, "鏈壘鍒扮粍鐩樹俊鎭�");
- }
- if (stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt())
- {
- return (false, "璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
- }
- if (!string.IsNullOrEmpty(stockInfo.LocationCode))
- {
- return (false, "璇ユ墭鐩樺凡缁戝畾璐т綅");
- }
- if (stockInfo.Details == null || stockInfo.Details.Count == 0)
- {
- return (false, "娌℃湁搴撳瓨鏄庣粏淇℃伅");
- }
- }
- else
- {
- if (_stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == palletCode) != null)
- {
- return (false, "璇ユ墭鐩樺凡瀛樺湪搴撳唴");
- }
- }
-
- return (true, "鎴愬姛");
}
--
Gitblit v1.9.3