优化WMS基础管理模块、任务管理添加任务历史信息

dengjunjie

2024-10-30 810fe2bcf1888eacd926f3caa604f033483d20c9

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs

@@ -8,6 +8,8 @@
using WIDESEA_Core;
using WIDESEA_Model.Models;
using WIDESEA_Core.Helper;
using WIDESEAWCS_DTO.WCSInfo;
using System.Transactions;

namespace WIDESEA_TaskInfoService
{
@@ -148,6 +150,96 @@
        }

        /// <summary>
        /// å †åž›æœºç”³è¯·å…¥åº“！！！！！！！入库分配逻辑待定
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        public WebResponseContent StackerCraneRequestInbound(ConveyorLineDTO lineDTO)
        {
            WebResponseContent content = new WebResponseContent().OK();
            try
            {
                var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
                if (task == null) throw new Exception($"未找到托盘号[{lineDTO.Barcode}]的入库任务");
                if (task.TaskStatus != (int)InTaskStatusEnum.Line_InFinish) throw new Exception($"托盘号[{lineDTO.Barcode}]的入库任务状态不匹配");

                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
                if (stockInfo == null) throw new Exception($"未找到托盘[{lineDTO.Barcode}]的组盘信息");
                if (stockInfo.StockStatus != StockStatusEmun.入库确认.ObjToInt()) throw new Exception($"托盘[{lineDTO.Barcode}],该组盘状态不可入库");
                Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(lineDTO.stationCode, TaskTypeEnum.Inbound.ObjToInt());
                if (locationInfo == null) throw new Exception($"无可入货位");
                locationInfo.LocationStatus = LocationStatusEnum.Inbounding.ObjToInt();
                stockInfo.StockStatus = StockStatusEmun.入库中.ObjToInt();
                using (TransactionScope scope = new TransactionScope())
                {
                    _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    scope.Complete();
                }
                content.Data = new ReceiveWMSInfo()
                {
                    TargetAddress = locationInfo.LocationCode,
                    IsPickPlace = locationInfo.MaxQty - locationInfo.CurrentQty == 1,
                };
            }
            catch (Exception ex)
            {
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// è¾“送线申请入库
        /// </summary>
        /// <param name="lineDTO"></param>
        /// <returns></returns>
        public WebResponseContent ConveyorLineRequestInbound(ConveyorLineDTO lineDTO)
        {
            WebResponseContent content = new WebResponseContent().OK();
            try
            {
                var task = BaseDal.QueryFirst(x => x.PalletCode == lineDTO.Barcode);
                if (task == null) throw new Exception($"未找到托盘号[{lineDTO.Barcode}]的入库任务");
                if (task.TaskStatus != (int)InTaskStatusEnum.AGV_InFinish) throw new Exception($"托盘号[{lineDTO.Barcode}]的入库任务状态不匹配");

                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(lineDTO.Barcode);
                (bool, string) result = CheckRequestInbound(lineDTO.stationCode, lineDTO.Barcode, true, stockInfo);
                if (!result.Item1) return content = WebResponseContent.Instance.Error(result.Item2);

                if (lineDTO.Spec != 1 || lineDTO.Weight != 500)//条件需更改！！！！！！！！！！
                {
                    task.NextAddress = "101";
                    task.TaskStatus = (int)InTaskStatusEnum.InException;
                    task.Remark = $"托盘[{lineDTO.Barcode}]信息不合格";
                    stockInfo.StockStatus = StockStatusEmun.入库撤销.ObjToInt();
                }
                else
                {
                    task.NextAddress = "104";
                    task.CurrentAddress = lineDTO.stationCode;
                    task.TaskStatus = (int)InTaskStatusEnum.Line_InExecuting;
                    stockInfo.StockStatus = StockStatusEmun.入库确认.ObjToInt();
                }

                #region äº‹åŠ¡
                using (TransactionScope scope = new TransactionScope())
                {
                    BaseDal.UpdateData(task);
                    Db.Updateable(stockInfo);
                    scope.Complete();
                }
                #endregion

                if (!string.IsNullOrEmpty(task.Remark)) throw new Exception(task.Remark);
            }
            catch (Exception ex)
            {
                content.Code = 404;
                content.Error(ex.Message);
            }
            return content;
        }
        /// <summary>
        /// éªŒè¯æ•°æ®
        /// </summary>
        /// <param name="stationCode">起始地址</param>
@@ -157,13 +249,13 @@
        /// <returns>返回处理结果</returns>
        private (bool, string) CheckRequestInbound(string stationCode, string palletCode, bool isCheckStock = true, Dt_StockInfo? stockInfo = null)
        {
            if (BaseDal.QueryFirst(x => x.PalletCode == palletCode) != null)
            //if (BaseDal.QueryFirst(x => x.PalletCode == palletCode) != null)
            //{
            //    return (false, "该托盘号已有任务");
            //}
            if (BaseDal.QueryFirst(x => (x.SourceAddress == stationCode || x.CurrentAddress == stationCode) && x.TaskStatus == InTaskStatusEnum.AGV_InFinish.ObjToInt()) != null)
            {
                return (false, "该托盘号已有任务");
            }
            if (BaseDal.QueryFirst(x => (x.SourceAddress == stationCode || x.CurrentAddress == stationCode) && x.TaskStatus == InTaskStatusEnum.InNew.ObjToInt()) != null)
            {
                return (false, "当前入库站台已有一条新建任务");
                return (false, "当前入库站台已有一条任务");
            }
            if (isCheckStock)
            {