333

schangxiang@126.com

2024-12-23 71f890c1c7f40d2605f9eabfe787e5ac287162fc

333

 CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/1¡¢DataProcess_BZ39.cs

@@ -63,7 +63,7 @@
                                //不再拦截 

                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, upiCode);
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, upiCode, false);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()}- upi:{upiCode}有‘未结束’的任务，不能处理,此次循环结束";

 CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/1¡¢DataProcess_BZ12.cs

@@ -77,7 +77,7 @@
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result, false);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-upi：{result}有‘已下发’的任务，不能处理,此次循环结束";

 CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs

@@ -80,7 +80,7 @@
                            using (WmsDBModel wmsDB = new WmsDBModel())
                            {
                                //要是有已下发的任务，就不要执行
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result);
                                var isValidate = TaskHandler.ValidateIssueTaskForNoFinishTaskByUpi(wmsDB, result, true);
                                if (!isValidate)
                                {
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()}-有‘已下发’的任务，不能处理,此次循环结束";
@@ -189,6 +189,17 @@
                                var plcTaskNo = BusinessHelper.CreatePlcTaskId();
                                plcTaskNo = MyExtendHelper.GetNewTaskNo(wmsDB, RbTaskTypeEnum.合包任务, plcTaskNo);

                                //判断该包下  æ˜¯å¦æœ‰æœªç»“束的 ç æ¿ä»»åŠ¡ï¼Œå¦‚果有，就自动更新完成
                                var mb_nofinishList = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.已完成
                && x.TaskStatus != (int)TaskStatusEnum.已取消
                && x.PackageCode == upiObj.PackageCode
             ).ToList();
                                foreach (var item in mb_nofinishList)
                                {
                                    item.TaskStatus = (int)TaskStatusEnum.已完成;
                                    item.TaskMsg = "任务被系统在合包工位自动完成(2)";
                                }

                                //新增任务表
                                var task = new wms_rbline_task()
                                {

 CC/iWareSql/DataAccess/TaskHandler.cs

@@ -18,7 +18,7 @@
        /// </summary>
        /// <param name="wmsDB"></param>
        /// <returns></returns>
        public static bool ValidateIssueTaskForNoFinishTaskByUpi(WmsDBModel.WmsDBModel wmsDB, string UPI)
        public static bool ValidateIssueTaskForNoFinishTaskByUpi(WmsDBModel.WmsDBModel wmsDB, string UPI, bool isNeedAutoFinishTak)
        {
            var isExist = wmsDB.wms_rbline_task.Where(x => x.TaskStatus != (int)TaskStatusEnum.已完成
                 && x.TaskStatus != (int)TaskStatusEnum.已取消
@@ -27,6 +27,19 @@

            if (isExist?.Count() > 0)
            {
                if (isNeedAutoFinishTak)
                {
                    using (WmsDBModel.WmsDBModel new_wmsDB = new WmsDBModel.WmsDBModel())
                    {
                        var updateTask = new_wmsDB.wms_rbline_task.Where(x => x.Id == isExist.First().Id).FirstOrDefault();
                        if (updateTask != null)
                        {
                            updateTask.TaskStatus = (int)TaskStatusEnum.已完成;
                            updateTask.TaskMsg = "任务被系统在合包工位自动完成(1)";
                            new_wmsDB.SaveChanges();
                        }
                    }
                }
                return false;
            }
            return true;