From 2950220f98f891a64cc452478e2a2ae61b82a8cd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 13 四月 2025 16:21:52 +0800
Subject: [PATCH] 优化代码、添加大屏
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_ConveyorLine.cs | 97 ++++++++++++++----------------------------------
1 files changed, 28 insertions(+), 69 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 402308f..38a0c82 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"
@@ -8,6 +8,7 @@
using WIDESEA_Core;
using WIDESEA_Model.Models;
using WIDESEAWCS_DTO.WCSInfo;
+using WIDESEA_DTO.WCSInfo;
namespace WIDESEA_TaskInfoService
{
@@ -25,15 +26,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)
{
@@ -97,94 +90,60 @@
/// <returns></returns>
public WebResponseContent TransmissionlineRequest(ConveyorLineDTO lineDTO)
{
- WebResponseContent content = new WebResponseContent();
+ WebResponseContent content = new WebResponseContent().OK();
try
{
//if (BaseDal.QueryFirst(x => (x.SourceAddress == lineDTO.stationCode || x.CurrentAddress == lineDTO.stationCode) && x.TaskStatus == InTaskStatusEnum.AGV_InFinish.ObjToInt()) != null)
//{
// 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}]鐨勫叆搴撲换鍔＄姸鎬佷笉鍖归厤");
+ if (task.TaskType == TaskTypeEnum.PalletInbound.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()) 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);
- if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//妫�娴嬫潯浠堕渶鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
+ Dt_StockInfoDetail stockInfoDetail = stockInfo.Details.FirstOrDefault();
+
+ if (/*lineDTO.Spec != 1 ||*/ lineDTO.Weight > 1500)//妫�娴嬫潯浠堕渶鏇存敼锛侊紒锛侊紒锛侊紒锛侊紒锛侊紒
{
- task.NextAddress = "101";
+ //task.NextAddress = "101";
task.TaskState = (int)InTaskStatusEnum.InException;
- task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
- stockInfo.StockStatus = StockStatusEmun.鍏ュ簱鎾ら攢.ObjToInt();
+ task.Remark = $"鎵樼洏[{lineDTO.Barcode}]瓒呴噸";
+ //task.Remark = $"鎵樼洏[{lineDTO.Barcode}]淇℃伅涓嶅悎鏍�";
+ //stockInfo.StockStatus = StockStatusEmun.鍏ュ簱鎾ら攢.ObjToInt();
}
else
{
- task.NextAddress = "104";
+ task.NextAddress = "1004";
task.CurrentAddress = lineDTO.stationCode;
+ task.Remark = string.Empty;
task.TaskState = (int)InTaskStatusEnum.Line_InExecuting;
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
+ stockInfoDetail.Status = StockStatusEmun.鍏ュ簱纭.ObjToInt();
}
#region 浜嬪姟
Db.Ado.BeginTran();
BaseDal.UpdateData(task);
- Db.Updateable(stockInfo);
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ //Db.Updateable(stockInfo).ExecuteCommand();
Db.Ado.CommitTran();
#endregion
if (!string.IsNullOrEmpty(task.Remark)) throw new Exception(task.Remark);
- }
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 浜х嚎鐢宠
- /// </summary>
- /// <param name="lineDTO"></param>
- /// <returns></returns>
- public WebResponseContent ProductionlineRequest(ConveyorLineDTO lineDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
- if (task != null && task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
- return content.OK(data: task);
- if (task != null) 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);
- var StockInfoDetails = stockInfo.Details.Where(x => x.StockId == stockInfo.Id).ToList();
- #region 鐢熸垚鍏ュ簱浠诲姟
- Dt_Task dt_Task = new Dt_Task()
- {
- CurrentAddress = lineDTO.stationCode,
- NextAddress = "SC01",
- SourceAddress = lineDTO.stationCode,
- TargetAddress = "SC01",
- CreateDate = DateTime.Now,
- Creater = "System",
- PalletCode = lineDTO.Barcode,
- OrderNo = StockInfoDetails.Count() == 1 ? StockInfoDetails.First().OrderNo : null,
- Roadway = "SC01",
- TaskNum = Convert.ToInt32(DateTime.Now.ToString("HHmmss")),
- TaskState = InTaskStatusEnum.InNew.ObjToInt(),
- TaskType = TaskTypeEnum.Inbound.ObjToInt(),
- };
- dt_Task.Dispatchertime = DateTime.Now;
- Db.Ado.BeginTran();
- BaseDal.AddData(dt_Task);
- task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt());
- //content.Data = dt_Task;
- Db.Ado.CommitTran();
- if (task != null) return content.OK(data: task);
- #endregion
}
catch (Exception ex)
{
--
Gitblit v1.9.3