雷神教育集团
2026-03-06 75c4ed0d3c640e66bc95dc170de52b753629e3ed
ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs
@@ -14,6 +14,10 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
<<<<<<< HEAD
=======
using WIDESEAWCS_DTO.TaskInfo;
>>>>>>> main
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IPackInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
@@ -39,6 +43,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 +149,11 @@
            }
            return content;
        }
        /// <summary>
        /// ç åž›ç»“托并上传码垛工位码垛明细数据
        /// </summary>
        /// <param name="stationCode"></param>
        /// <returns></returns>
        public WebResponseContent BoxingInBound(string stationCode)
        {
            WebResponseContent content = new WebResponseContent();
@@ -186,11 +201,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 +232,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)
@@ -228,5 +250,42 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
<<<<<<< HEAD
=======
        /// <summary>
        /// åˆ é™¤ç åž›ä»»åŠ¡ä¿¡æ¯
        /// </summary>
        /// <param name="packTaskNum"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent PickaixsTaskDele(int PackTaskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                    Dt_PackaxisTask packaxisTask = BaseDal.QueryFirst(x => x.PackTaskNum == PackTaskNum);
                    if(packaxisTask == null)
                    {
                        return WebResponseContent.Instance.Error("未找到任务");
                    }
                    else
                    {
                        Dt_Packinfo packinfo = _packinfoRepository.QueryFirst(x => x.BarCode == packaxisTask.BarCode);
                        packinfo.PackStatus = 0;
                        _packinfoRepository.UpdateData(packinfo);
                        BaseDal.DeleteAndMoveIntoHty(packaxisTask, App.User?.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工删除);
                      content.Status = true;
                    }
            }
            catch (Exception e)
            {
                return WebResponseContent.Instance.Error(e.Message);
            }
            return content;
        }
>>>>>>> main
    }
}