From 8f392cc88b0768b74efca3b68785cf5aa1c38e70 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 06 十一月 2024 14:28:20 +0800
Subject: [PATCH] 代码更新
---
wcs-server-hbf/WIDESEA_WCS/WIFIService.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/wcs-server-hbf/WIDESEA_WCS/WIFIService.cs b/wcs-server-hbf/WIDESEA_WCS/WIFIService.cs
index 60b49d1..d802187 100644
--- a/wcs-server-hbf/WIDESEA_WCS/WIFIService.cs
+++ b/wcs-server-hbf/WIDESEA_WCS/WIFIService.cs
@@ -199,6 +199,23 @@
}
if (jkloction.Count > 0)
{
+ #region 璁板綍涓婃枡璇锋眰淇″彿
+ WriteLog.GetLog().Write($"{locNum}涓婃枡璇锋眰---{DateTime.Now}", $"鍒囧嵎涓婃枡璇锋眰");
+ #endregion
+ //鍐嶆鍒ゆ柇鏄惁鏈変换鍔″瓨鍦�
+ dt_agvtask agvtaskOld = agvRepository.FindFirst(x=>x.agv_toaddress== location_QJ.upper_code);
+ if (agvtaskOld!=null && location_QJ.task==2)
+ {
+ location_QJ.logic_col = 1;//璁剧疆鑹搧鐗╂枡
+ location_QJ.task = 1;//璁剧疆浠诲姟鐢熸垚1
+ var ent = ibase_Ware_Location.DbContext.ChangeTracker.Entries<base_ware_location>().FirstOrDefault();
+ if (ent != null)
+ {
+ ent.State = EntityState.Detached;
+ }
+ ibase_Ware_Location.Update(location_QJ, true);
+ return content.Error("鏀圭紦瀛樻灦浠诲姟宸插瓨鍦�");
+ }
base_ware_location lotion = jkloction.OrderBy(d => d.update_time).FirstOrDefault();
dt_agvtask agvtask = new dt_agvtask()
{
@@ -248,10 +265,10 @@
if (be==1&& dw==1)
{
agvRepository.Add(agvtask, true);//浠诲姟鐢熸垚
- WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"鐢熸垚浠诲姟:{agvtask.agv_tasknum}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
- WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"璧风偣璐т綅銆恵lotion.upper_code}銆戠姸鎬侊細鎵樼洏鍏夌數妫�娴嬶細{lotion.tpgd},鐘舵�侊細{lotion.location_state},鏇存柊鏃堕棿锛歿lotion.wireless_time}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
- WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"缁堢偣璐т綅銆恵location_QJ.upper_code}銆戠姸鎬侊細鎵樼洏鍏夌數妫�娴嬶細{location_QJ.tpgd},-1鍏夌數锛歿location_QJ.gd2}锛�-2鍏夌數:{location_QJ.gd1},-3鍏夌數锛歿location_QJ.gd4}锛�-4鍏夌數锛歿location_QJ.gd3},鐘舵�侊細{location_QJ.location_state},鏇存柊鏃堕棿锛歿location_QJ.wireless_time}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
- WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"----------------浠诲姟鐢熸垚鎴愬姛 {DateTime.Now} -------------- {Environment.NewLine}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
+ //WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"鐢熸垚浠诲姟:{agvtask.agv_tasknum}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
+ //WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"璧风偣璐т綅銆恵lotion.upper_code}銆戠姸鎬侊細鎵樼洏鍏夌數妫�娴嬶細{lotion.tpgd},鐘舵�侊細{lotion.location_state},鏇存柊鏃堕棿锛歿lotion.wireless_time}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
+ //WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"缁堢偣璐т綅銆恵location_QJ.upper_code}銆戠姸鎬侊細鎵樼洏鍏夌數妫�娴嬶細{location_QJ.tpgd},-1鍏夌數锛歿location_QJ.gd2}锛�-2鍏夌數:{location_QJ.gd1},-3鍏夌數锛歿location_QJ.gd4}锛�-4鍏夌數锛歿location_QJ.gd3},鐘舵�侊細{location_QJ.location_state},鏇存柊鏃堕棿锛歿location_QJ.wireless_time}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
+ //WriteDBLog.Info($"鍒囧嵎鎸夐挳浠诲姟鐢熸垚").Write($"----------------浠诲姟鐢熸垚鎴愬姛 {DateTime.Now} -------------- {Environment.NewLine}", $"鍒囧嵎鎸夐挳浠诲姟鐢熸垚");
return content.OK("鍛煎彨鎴愬姛,浠诲姟宸茶褰�", 1);
}
}
--
Gitblit v1.9.3