百步三楼新仓库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
huangxiaoqiang
3 天以前 b2feeabc23454a2c9e161aa3b26d0edf938e55bd 
 CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs


@@ -1,4 +1,5 @@


using Masuit.Tools;


using Mapster;


using Masuit.Tools;


using SqlSugar;


using WIDESEA_Common.CustomModels;


using WIDESEA_Core.Const;


@@ -581,17 +582,48 @@




    #region 直接出库任务完成




    public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)


    public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task, DtStockInfo stock)


    {


        WebResponseContent content = new WebResponseContent();


        try


        {


            //添加历史


            var taskHty = CreateHistoricalTask(task);


            // 添加历史任务


            var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;


            //删除任务


            BaseDal.DeleteData(task);


            DtStockInfo_Hty stockInfo_Hty = null;


            if (stock != null)


            {


                stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();


                stockInfo_Hty.ModifyDate = DateTime.Now;


            }


            var taskHty = task.Adapt<Dt_Task_Hty>();


            taskHty.FinishTime = DateTime.Now;


            taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.人工完成 : (int)OperateTypeEnum.自动完成;


            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";




            var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);


            if (location != null)


            {


                int lastStatus = location.LocationStatus;


                location.LocationStatus = (int)LocationEnum.Free;


                _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);


            }


            task.TaskState = (int)TaskOutStatusEnum.OutFinish;




            // 事务处理


            await _unitOfWorkManage.UseTranAsync(async () =>


            {


                if (stockInfo_Hty != null)


                {


                    await DeleteStockInfoAsync(stock.Id);


                    await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);


                    await AddStockInfoHtyAsync(stockInfo_Hty);


                }




                if (location != null)


                {


                    await UpdateLocationAsync(location);


                }


                await DeleteTaskAsync(task.TaskId);


                await AddTaskHtyAsync(taskHty);


            });




            return content.OK();


        }


@@ -1019,6 +1051,13 @@


                .Where(x => x.DeviceCode.Contains("CWSC")) // 过滤条件


                .ToList().Select(x => x.DeviceCode).ToList();




            var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList();


            List<string>? materielCodes = outBoundMateriel.Count != 0


                ? outBoundMateriel.Where(x => x.ProductionLine == station.productLine && x.ProcessCode == "CWSC3")


                                  .Select(x => x.MaterielCode)


                                  .ToList()


                : null;




            // 修改后的查询代码


            var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()


                                .Includes(x => x.LocationInfo)


@@ -1029,6 +1068,7 @@


                                .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock)


                                // 增加对 LocationInfo 的空值检查


                                .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))


                                .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))


                                .OrderBy(x => x.OutboundTime)


                                .FirstAsync();




@@ -1088,6 +1128,7 @@


        var emergencyTask = new DTSEmergencyTask();


        try


        {


            Console.WriteLine($"火警参数:{obj.ToString()}");


            emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString());


            if (emergencyTask == null) throw new Exception("火警参数为空");


            string[] strings = emergencyTask.LocationCode.Split("-");


@@ -1180,14 +1221,15 @@




                var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);


                var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;


                var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;


                if (ReceiveByWMSTask == null || ipAddress == null)


                var ReceiveByWMSFireAlarmTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSFireAlarmTask)?.ConfigValue;


                if (ReceiveByWMSFireAlarmTask == null || ipAddress == null)


                {


                    throw new Exception("WMS IP 未配置");


                }


                var wmsIpAddrss = ipAddress + ReceiveByWMSTask;




                var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));


                var wmsIpAddrss = ipAddress + ReceiveByWMSFireAlarmTask;


                List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();


                taskDTOs.Add(taskDTO);


                var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTOs));


                if (respon != null)


                {


                    WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());