From f7f1f176f931f5ad54056df7b8e8a9f028eea100 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:50:38 +0800
Subject: [PATCH] 合并
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
index a92f1f7..18b4539 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
@@ -1,4 +1,5 @@
锘縰sing LogLibrary.Log;
+using Masuit.Tools;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -36,6 +37,11 @@
var location = _locationRepository.QueryFirst(x => x.AreaId == result.LocationArea && x.LocationCode == result.LocationID);
if (location == null) throw new Exception("鏈煡搴撲綅");
+
+ if (_taskRepository.QueryFirst(x => x.SourceAddress == result.LocationID && x.Roadway == location.RoadwayNo) != null)
+ {
+ throw new Exception("褰撳墠搴撲綅宸插瓨鍦ㄤ换鍔�");
+ }
Dt_StationManager stationManager;
if (result.IsNG == 1)
@@ -122,13 +128,13 @@
// TaskState = (int)TaskOutStatusEnum.OutNew,
//};
LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡锛�").Info(true, result);
+ LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡").Info(true, result.ToJsonString());
return content.OK();
}
catch (Exception ex)
{
LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡锛�").Info(true, ex.Message);
+ LogFactory.GetLog("鍒嗗娴嬭瘯瀹屾垚閫氱煡").Info(true, ex.Message);
return content.Error(ex.Message);
}
}
--
Gitblit v1.9.3