From 6c5a7bd1a9342d8e6792773aef3d62588a60714d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 28 11月 2024 15:23:57 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
CC/iWareCC_ASRS/ThreadService/04_BZ21（搬运整垛机器人）/DataProcess_BZ21_FinishTask.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs"
index c26f4c3..57252a4 100644
--- "a/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/04_BZ21\357\274\210\346\220\254\350\277\220\346\225\264\345\236\233\346\234\272\345\231\250\344\272\272\357\274\211/DataProcess_BZ21_FinishTask.cs"
@@ -53,18 +53,30 @@
var task = wmsDB.wms_rbline_task.Where(x =>
x.TaskNo == obj.R_SurrouondTaskNo.ToString()
&& x.RbTaskType == (int)RbTaskTypeEnum.澶规澘浠诲姟
- && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙�).FirstOrDefault();
+ ).OrderByDescending(x=>x.Id).FirstOrDefault();
if (task == null)
{
SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 ";
continue;
}
+ else
+ {
+ if (task.TaskStatus == (int)TaskStatusEnum.宸插畬鎴�)
+ {
+ //缁橮LC鎺ㄩ�佷换鍔″畬鎴愮‘璁や俊鍙�
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = client.SetSurroundTaskFinishAck((int)EDevice.Station, true, rgvLocation);
+ }
+ continue;
+ }
+ }
var upiobj = wmsDB.mes_batchOrderUPI_new.Where(x => x.PackageCode == task.PackageCode).ToList();
- if (upiobj .Count>0)
+ if (upiobj.Count > 0)
{
foreach (var item in upiobj)
{
- item.UpiStatus = 4;
+ item.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�;
}
}
task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�;
@@ -90,6 +102,23 @@
wmsDB.SaveChanges();
}
}
+ else
+ {
+ //缁橮LC鎺ㄩ�佷换鍔″畬鎴愮‘璁や俊鍙�
+ using (StationServiceClient client = new StationServiceClient())
+ {
+ var res = client.SetSurroundTaskFinishAck((int)EDevice.Station, false, rgvLocation);
+ //if (!res.result)
+ //{
+ // SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()}-涓嬪彂鐮佹澘浠诲姟 澶辫触,SetPalletizingTaskFinishAck 杩斿洖:{res.resMsg}";
+ // continue;
+ //}
+ //else
+ //{
+ // Log4NetHelper.WriteInfoLog(logType, $"{rgvLocation.ToString()}-涓嬪彂鍏ュ簱浠诲姟 鎴愬姛,SetPalletizingTaskFinishAck锛屽弬鏁�: 绔欑偣{rgvLocation}");
+ //}
+ }
+ }
}
}
catch (Exception ex)
--
Gitblit v1.9.3