From 36230cd4dd0ebe5d21eede3eff6216908f7f7a8e Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 06 十一月 2024 16:48:32 +0800
Subject: [PATCH] AGV任务下发，AGV任务状态更新
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs | 102 +--------------------------------------------------
1 files changed, 2 insertions(+), 100 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..066b483 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);
@@ -161,7 +161,7 @@
{
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.Line_InFinish) throw new Exception($"鎵樼洏鍙穂{lineDTO.Barcode}]鐨勫叆搴撲换鍔＄姸鎬佷笉鍖归厤");
Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
if (stockInfo == null) throw new Exception($"鏈壘鍒版墭鐩榌{lineDTO.Barcode}]鐨勭粍鐩樹俊鎭�");
@@ -187,104 +187,6 @@
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_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);
-
- if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//鏉′欢闇�鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
- {
- 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();
- }
- #endregion
-
- if (!string.IsNullOrEmpty(task.Remark)) throw new Exception(task.Remark);
- }
- catch (Exception ex)
- {
- content.Code = 404;
- 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