222
schangxiang@126.com
2024-11-23 a7e3d79db05f359e2476b2f8221cef91c45d9997
222
已修改4个文件
42 ■■■■■ 文件已修改
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Outbound/1、DataProcess_RobotBuffer_AutoQiTaoOutbound.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Outbound/2、DataProcess_RobotBuffer_IssueOutboundTask.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/1¡¢DataProcess_RobotBuffer_AutoQiTaoOutbound.cs
@@ -85,6 +85,8 @@
                                        var place = StationHandler.GetPlaceByPlaceCode(x.PlaceCode, wmsDB);
                                        place.PlaceStatus = (int)PlaceStatusEnum.锁定;
                                        Thread.Sleep(100);
                                    }
                                }
                            }
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Outbound/2¡¢DataProcess_RobotBuffer_IssueOutboundTask.cs
@@ -52,11 +52,19 @@
                                continue;
                            }
                            //取创建时间最早的那个要出库的包
                            var firstTask = wmsDB.wms_rbline_task.Where(x =>
                           x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                          && x.TaskStatus == (int)TaskStatusEnum.新建).OrderBy(x => x.CreateTime).FirstOrDefault();
                            if (firstTask == null)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},根据 æ²¡æœ‰æ‰¾åˆ° æ–°å»º çš„任务 ";
                                continue;
                            }
                            var taskList = wmsDB.wms_rbline_task.Where(x =>
                           x.RbTaskType == (int)RbTaskTypeEnum.出库任务
                          && x.TaskStatus == (int)TaskStatusEnum.新建).OrderBy(x => x.PackageCode).ToList();
                          && x.TaskStatus == (int)TaskStatusEnum.新建).Where(x => x.PackageCode == firstTask.PackageCode).OrderBy(x => x.CreateTime).ToList();
                            if (taskList == null)
                            {
                                SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_IssueOutboundTask = $"{rgvLocation.ToString()},根据 æ²¡æœ‰æ‰¾åˆ° æ–°å»º çš„任务 ";
@@ -70,7 +78,7 @@
                            using (StationServiceClient client = new StationServiceClient())
                            {
                                //首先要清理
                                var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, true, rgvLocation);
                                var res = await client.OutboundFinishConfirmAsync((int)EDevice.Station, false, rgvLocation);
                                if (!res.result)
                                {
                                    SystemWarningMsg._lbl_Alert_DataProcess_RobotBuffer_FinishTaskForOutbound = $"{rgvLocation.ToString()}-下发出库任务 å¤±è´¥,OutboundFinishConfirmAsync è¿”回:{res.resMsg}";
SDA/iWareSda/Devices/4-Station/StationModel/DB/RgvComm.cs
@@ -77,7 +77,7 @@
        /// åˆ†é…å‡ºåº“库位号
        /// </summary>
        [Description("分配出库库位号")]
        public string W_Destination_Out { get; set; }
        public int W_Destination_Out { get; set; }
        /// <summary>
        /// æ˜¯å¦æ—‹è½¬
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -278,6 +278,30 @@
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_ReqOut åœ°å€{0} å†™  " + false + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_ReqOut);
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_Destination_Out, 0, view_stationObj.W_Destination_Out);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_Destination_Out åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_Destination_Out);
                    return false;
                }
                b2 = this.plcService.WriteValuePoint(stationObj.W_Outbound_TaskID, 0, view_stationObj.W_Outbound_TaskID);
                if (!b2.result)
                {
                    msg = string.Format("向Station W_Outbound_TaskID åœ°å€{0} å†™  " + 0 + "失败,返回结果:" + b2.resMsg,
                        stationObj.W_Outbound_TaskID);
                    return false;
                }
                return true;
            }
            catch (Exception ex)