From 5b5429a616f4d6637c3ddd4b2476f4d563f19585 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周四, 27 3月 2025 17:23:28 +0800 Subject: [PATCH] 增加 下发任务 --- CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/3、DataProcess_BZ21_FinishTask.cs | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 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/3\343\200\201DataProcess_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/3\343\200\201DataProcess_BZ21_FinishTask.cs" index 4b5c6c7..c7e2370 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/3\343\200\201DataProcess_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/3\343\200\201DataProcess_BZ21_FinishTask.cs" @@ -28,6 +28,11 @@ if (SystemValue.isStartedModel) { var rgvLocation = StationLocationEnum.BZ21.ToString(); + if (FormCC.stationView == null) + { + SystemWarningMsg._lbl_Alert_DataProcess_BZ21_FinishTask = $"{rgvLocation.ToString()}-鑾峰彇PLC瀵硅薄涓簄ull"; + continue; + } var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault(); if (obj.R_SurrouondTaskFinish) //if (true)//妯℃嫙 @@ -52,8 +57,10 @@ { var task = wmsDB.wms_rbline_task.Where(x => x.TaskNo == obj.R_SurrouondTaskNo.ToString() + //澧炲姞杩欎袱涓檺鍒舵潯浠� 銆怑ditby shaocx,2025-03-27銆� + && x.TaskStatus == (int)TaskStatusEnum.宸蹭笅鍙� && x.RbTaskType == (int)RbTaskTypeEnum.鍚堝寘浠诲姟 - ).OrderByDescending(x=>x.Id).FirstOrDefault(); + ).OrderByDescending(x => x.Id).FirstOrDefault(); if (task == null) { SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = $"{rgvLocation.ToString()},鏍规嵁 R_InboundNumber:{obj.R_InboundNumber}娌℃湁鎵惧埌宸蹭笅鍙戠殑浠诲姟 "; @@ -77,10 +84,10 @@ foreach (var item in upiobj) { item.UpiStatus = (int)UpiStatusEnum.宸插悎鍖�; + item.AreaCode = (int)AreaCodeEnum.鍖呰绾垮尯鍩�; } } task.TaskStatus = (int)TaskStatusEnum.宸插畬鎴�; - task.TaskStatusName = TaskStatusEnum.宸插畬鎴�.ToString(); task.FinishedTime = DateTime.Now; -- Gitblit v1.9.3