From 182a80ed28bc67dc2af6709a305430b99a7a87ac Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 九月 2025 10:10:30 +0800
Subject: [PATCH] 大屏
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
index 9673adf..7409c06 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs"
@@ -9,6 +9,7 @@
using WIDESEA_Model.Models;
using WIDESEAWCS_DTO.WCSInfo;
using WIDESEA_DTO.WCSInfo;
+using WIDESEA_Common.TaskEnum;
namespace WIDESEA_TaskInfoService
{
@@ -26,15 +27,7 @@
{
string ConveyorLineID = AppSettings.Configuration[nameof(ConveyorLineID)];
if (!ConveyorLineID.Split(",").Contains(lineDTO.stationCode)) throw new Exception($"鏈壘鍒拌緭閫佺嚎缂栧彿[{lineDTO.stationCode}]鐨勪俊鎭�");
- switch (lineDTO.stationCode)
- {
- case "102":
- content = TransmissionlineRequest(lineDTO);
- break;
- case "1001":
- content = ProductionlineRequest(lineDTO);
- break;
- }
+ content = TransmissionlineRequest(lineDTO);
}
catch (Exception ex)
{
@@ -105,39 +98,39 @@
//{
// throw new Exception($"褰撳墠鍏ュ簱绔欏彴[{lineDTO.stationCode}]宸叉湁涓�鏉′换鍔�");
//}
- var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt());
+ var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
if (task == null) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
- //if (task.TaskState != (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);
-
- Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
-
- if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//妫�娴嬫潯浠堕渶鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
+ if (task.TaskType == TaskTypeEnum.PalletInbound.ObjToInt())
{
- task.NextAddress = "101";
- task.TaskState = (int)InTaskStatusEnum.InException;
- task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
- //stockInfo.StockStatus = StockStatusEmun.鍏ュ簱鎾ら攢.ObjToInt();
+ task.NextAddress = "1004";
+ task.CurrentAddress = lineDTO.stationCode;
+ task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
+ BaseDal.UpdateData(task);
+ return content;
}
+ if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt() && task.TaskType != TaskTypeEnum.InQuality.ObjToInt()) throw new Exception($"鏈壘鍒版墭鐩樺彿[{lineDTO.Barcode}]鐨勫叆搴撲换鍔�");
+
+ #region 鍒ゆ柇搴撳瓨鐘舵��
+ Dt_InventoryInfo inventoryInfo = _stockService.InventoryInfoService.Repository.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
+ if (inventoryInfo == null) throw new Exception("鏈壘鍒扮粍鐩樹俊鎭�");
+ if (inventoryInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt()) throw new Exception("璇ョ粍鐩樼姸鎬佷笉鍙叆搴�");
+ if (!string.IsNullOrEmpty(inventoryInfo.LocationCode)) throw new Exception("璇ユ墭鐩樺凡缁戝畾璐т綅");
+
+ if (lineDTO.Weight > 1500) task.Remark = $"鎵樼洏[{lineDTO.Barcode}]瓒呴噸";
else
{
- task.NextAddress = "104";
+ task.NextAddress = "1004";
task.CurrentAddress = lineDTO.stationCode;
- task.Remark=string.Empty;
+ task.Remark = string.Empty;
task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
- stockInfoDetail.Status = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
}
+ #endregion
#region 浜嬪姟
Db.Ado.BeginTran();
BaseDal.UpdateData(task);
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
- //Db.Updateable(stockInfo).ExecuteCommand();
+ _stockService.InventoryInfoService.Repository.UpdateData(inventoryInfo);
Db.Ado.CommitTran();
#endregion
if (!string.IsNullOrEmpty(task.Remark)) throw new Exception(task.Remark);
--
Gitblit v1.9.3