一堆逻辑修改

wangxinhui

2026-02-03 b2b779905bc8a71b52d0e14f91652309d9279878

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs

@@ -39,6 +39,12 @@
            _stationMangerRepository = stationMangerRepository;
            _unitOfWorkManage = unitOfWorkManage;
        }
        /// <summary>
        /// åˆ†é…ç åž›ä»»åŠ¡
        /// </summary>
        /// <param name="barCode"></param>
        /// <param name="deviceCode"></param>
        /// <returns></returns>
        public WebResponseContent ReqPackTask(string barCode,string deviceCode)
        {
            WebResponseContent content= new WebResponseContent();
@@ -139,6 +145,11 @@
            }
            return content;
        }
        /// <summary>
        /// ç åž›ç»“托并上传码垛工位码垛明细数据
        /// </summary>
        /// <param name="stationCode"></param>
        /// <returns></returns>
        public WebResponseContent BoxingInBound(string stationCode)
        {
            WebResponseContent content = new WebResponseContent();
@@ -186,11 +197,17 @@
            }
            return content;
        }
        /// <summary>
        /// ç åž›ä»»åŠ¡å®Œæˆ
        /// </summary>
        /// <param name="taskNum"></param>
        /// <param name="packaxisTask"></param>
        /// <returns></returns>
        public WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null)
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                
                Dt_PackaxisTask? packaxisTaskFinish = null;
                if (packaxisTask!=null)
                {
@@ -211,15 +228,16 @@
                        StationPackId = stationPackInfo.id,
                        BoxCode = packaxisTaskFinish.BarCode
                    };
                    _unitOfWorkManage.BeginTran();
                    _stationPackInfoRepository.UpdateData(stationPackInfo);
                    _stationPackDetailRepository.AddData(stationPackDetail);
                    BaseDal.DeleteAndMoveIntoHty(packaxisTaskFinish, App.User?.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                    _unitOfWorkManage.CommitTran();
                }
                else
                {
                    return WebResponseContent.Instance.Error("未找到任务");
                }
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)