一堆需要求新增及更改

wangxinhui

20 小时以前 39d468b76e60c05ffcdf749f7ed1d3c443d542f8

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

@@ -106,11 +106,14 @@
                    {
                        return content.Error("未找到可分配垛位");
                    }
                    Dt_Packaxis packaxis = packaxes.FirstOrDefault(x => x.StationCode == packInfoAssign.StationCode);
                    packInfoAssign.PackType = packinfo.PackType;
                    packInfoAssign.OrderNo = packinfo.OrderNo;
                    packInfoAssign.MakeCode = packinfo.MakeCode;
                    packInfoAssign.MaterielCode = packInfoAssign.MaterielCode;
                    packInfoAssign.PackNum = packaxes.FirstOrDefault(x => x.StationCode == packInfoAssign.StationCode).PackNum;
                    packInfoAssign.PackNum = packaxis.PackNum;
                    //计算码垛完的高度
                    packInfoAssign.HeightNum = packaxis.AxisZCount * packaxis.AxisZSpacing + 200;
                    packaxisTask = new Dt_PackaxisTask()
                    {
                        DeviceCode = deviceCode,
@@ -158,18 +161,23 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_StationPackInfo stationPackInfo = _stationPackInfoRepository.QueryFirst(x => x.StationCode == stationCode);
                Dt_StationPackInfo stationPackInfo = _stationPackInfoRepository.Db.Queryable<Dt_StationPackInfo>().Where(x => x.StationCode == stationCode).Includes(x=>x.stationPackDetails).First();
                if (stationPackInfo.OverNum != stationPackInfo.AssignNum)
                {
                    throw new Exception($"分配数量{stationPackInfo.AssignNum}，完成数量{stationPackInfo.OverNum}数量不符");
                }
                List<Dt_StationPackDetail> stationPackDetails = _stationPackDetailRepository.QueryData(x => x.StationPackId == stationPackInfo.id);
                List<Dt_StationPackDetail> stationPackDetails = stationPackInfo.stationPackDetails;
                if (stationPackDetails.Count <= 0)
                {
                    throw new Exception($"{stationCode}未找到码垛明细");
                }
                List<string> barCodes = stationPackDetails.Select(x => x.BoxCode).ToList();
                List<Dt_Packinfo> packinfos = _packinfoRepository.QueryData(x => barCodes.Contains(x.BarCode)).ToList();
                List<Dt_Packinfo> packinfos = _packinfoRepository.QueryData(x => barCodes.Contains(x.BarCode) && x.PackStatus== StationOccupiedEnum.Sure.ObjToInt()).ToList();
                if (packinfos.Count != barCodes.Count)
                {
                    throw new Exception($"码垛信息与实际不符，码垛信息数量{packinfos.Count},实际数量{barCodes.Count}");
                }
                int heightNum = stationPackInfo.HeightNum;
                stationPackInfo.PackType = 0;
                stationPackInfo.OrderNo = "";
                stationPackInfo.MakeCode = "";
@@ -178,18 +186,19 @@
                stationPackInfo.OverNum = 0;
                stationPackInfo.AssignNum = 0;
                stationPackInfo.ExecutingNum = 0;
                stationPackInfo.HeightNum = 0;
                _unitOfWorkManage.BeginTran();
                _stationPackInfoRepository.UpdateData(stationPackInfo);
                _stationPackDetailRepository.DeleteData(stationPackDetails);
                _packinfoRepository.DeleteAndMoveIntoHty(packinfos, App.User?.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                //同步到WMS
                string address = AppSettings.Get("WMSApiAddress");
                string response = HttpHelper.Post($"{address}/api/Task/BoxingInBound?stationCode=" + stationCode, barCodes.Serialize());
                WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(response) ?? throw new Exception($"未收到返回结果");
                if (!responseContent.Status)
                {
                    throw new Exception(responseContent.Message);
                }
                //string address = AppSettings.Get("WMSApiAddress");
                //string response = HttpHelper.Post($"{address}/api/Task/BoxingInBound?stationCode={stationCode}&heightNum={heightNum}", barCodes.Serialize());
                //WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(response) ?? throw new Exception($"未收到返回结果");
                //if (!responseContent.Status)
                //{
                //    throw new Exception(responseContent.Message);
                //}
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
@@ -200,6 +209,7 @@
            }
            return content;
        }
        private readonly static object lockerCompleted = new object();
        /// <summary>
        /// ç åž›ä»»åŠ¡å®Œæˆ
        /// </summary>
@@ -208,44 +218,47 @@
        /// <returns></returns>
        public WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null)
        {
            try
            lock (lockerCompleted)
            {
                Dt_PackaxisTask? packaxisTaskFinish = null;
                if (packaxisTask!=null)
                try
                {
                    packaxisTaskFinish= packaxisTask;
                }
                else
                {
                    packaxisTaskFinish = BaseDal.QueryFirst(x => x.PackTaskNum == taskNum);
                    packaxisTaskFinish.TaskState = TaskStatusEnum.Finish.ObjToInt();
                }
                if (packaxisTaskFinish != null)
                {
                    Dt_StationPackInfo stationPackInfo = _stationPackInfoRepository.QueryFirst(x => x.StationCode == packaxisTaskFinish.TargetAddress);
                    stationPackInfo.ExecutingNum -= 1;
                    stationPackInfo.OverNum += 1;
                    Dt_StationPackDetail stationPackDetail = new Dt_StationPackDetail()
                    Dt_PackaxisTask? packaxisTaskFinish = null;
                    if (packaxisTask != null)
                    {
                        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();
                        packaxisTaskFinish = packaxisTask;
                    }
                    else
                    {
                        packaxisTaskFinish = BaseDal.QueryFirst(x => x.PackTaskNum == taskNum);
                    }
                    if (packaxisTaskFinish != null)
                    {
                        Dt_StationPackInfo stationPackInfo = _stationPackInfoRepository.QueryFirst(x => x.StationCode == packaxisTaskFinish.TargetAddress);
                        stationPackInfo.ExecutingNum -= 1;
                        stationPackInfo.OverNum += 1;
                        Dt_StationPackDetail stationPackDetail = new Dt_StationPackDetail()
                        {
                            StationPackId = stationPackInfo.Id,
                            BoxCode = packaxisTaskFinish.BarCode
                        };
                        packaxisTaskFinish.TaskState = TaskStatusEnum.Finish.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        _stationPackInfoRepository.UpdateData(stationPackInfo);
                        _stationPackDetailRepository.AddData(stationPackDetail);
                        BaseDal.DeleteAndMoveIntoHty(packaxisTaskFinish, App.User?.UserId == 0 ? OperateTypeEnum.自动完成 : OperateTypeEnum.人工完成);
                        _unitOfWorkManage.CommitTran();
                    }
                    else
                    {
                        return WebResponseContent.Instance.Error("未找到任务");
                    }
                    return WebResponseContent.Instance.OK();
                }
                else
                catch (Exception ex)
                {
                    return WebResponseContent.Instance.Error("未找到任务");
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error(ex.Message);
                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>