From 752fd1d6f70afc3f58eca4ab2e6b9359ba2a5578 Mon Sep 17 00:00:00 2001 From: zongzhibin <zongzhibin@weben-smart.com> Date: 周六, 30 11月 2024 17:04:21 +0800 Subject: [PATCH] add --- CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Inbound/2、DataProcess_RobotBuffer_FinishTask.cs | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" index 9424fc2..206c13d 100644 --- "a/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" +++ "b/CC/iWareCC_ASRS/ThreadService/02_BZ39\345\267\245\344\275\215\357\274\210\350\241\245\346\235\277\345\220\216\345\267\245\344\275\215\357\274\211/Inbound/2\343\200\201DataProcess_RobotBuffer_FinishTask.cs" @@ -30,11 +30,11 @@ LogType logType = LogType.DataProcess_RobotBuffer_FinishTask; while (true) { - Thread.Sleep(2000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆� + Thread.Sleep(500);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆� SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTask = string.Empty; try { - if (SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask && SystemValue.isStartedModel) + if ( SystemValue.isStartedModel)//SystemValue.isAllowRuning_DataProcess_RobotBuffer_FinishTask && { var rgvLocation = StationLocationEnum.BZ39.ToString(); var obj = FormCC.stationView.R_StationForReadCommList.Where(x => x.StationCode == rgvLocation.ToString()).FirstOrDefault(); @@ -62,11 +62,23 @@ var task = wmsDB.wms_rbline_task.Where(x => x.TaskNo == obj.R_Inbound_TaskID.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.宸插畬鎴�) + { + using (StationServiceClient client = new StationServiceClient()) + { + var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation); + + } + continue; + } } var upiCode = task.UPI; @@ -89,6 +101,7 @@ InTime = DateTime.Now, OperReason = "鍏ュ簱", PackageCode = task.PackageCode, + Length = task.Length, Width = task.Width, Thk = task.Thk, PlaceCode = task.PlaceCode, @@ -124,6 +137,18 @@ wmsDB.SaveChanges(); } } + else + { + //涓嶅啀鎷︽埅 + + //棣栧厛鍏堟竻鐞� + using (StationServiceClient client = new StationServiceClient()) + { + var res = await client.InboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation); + + } + + } } } catch (Exception ex) -- Gitblit v1.9.3