From 1f121db427cc068eee97b699c410d1b5f320e867 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 06 九月 2025 14:26:27 +0800 Subject: [PATCH] 最新代码提交 --- 项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 252 insertions(+), 31 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" index 1f7d0db..4c3a92f 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" @@ -20,6 +20,7 @@ using WIDESEA_DTO; using WIDESEA_DTO.Basic; using WIDESEA_DTO.Task; +using WIDESEA_External.Model; using WIDESEA_Model.Models; namespace WIDESEA_TaskInfoService @@ -53,7 +54,7 @@ { return WebResponseContent.Instance.Error($"鏈壘鍒扮粍鐩樹俊鎭�"); } - if (stockInfo.StockStatus != StockStatusEmun.閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MES閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt()) + if (stockInfo.StockStatus != StockStatusEmun.MES浣欐枡閫�搴�.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt()) { return WebResponseContent.Instance.Error($"璇ユ墭鐩樼姸鎬佷笉姝g‘,涓嶅彲鐢宠鍏ュ簱"); } @@ -81,22 +82,6 @@ if (stockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt()) { stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(); - } - else if (stockInfo.StockStatus == StockStatusEmun.MES閫�搴�.ObjToInt()) - { - newTask.TaskType = TaskTypeEnum.MesMatReturn.ObjToInt(); - } - else if (stockInfo.StockStatus == StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt()) - { - //todo 灏忔墭鐩樻殏鏃舵湭鍚敤 - if (stockInfo.PalletType == PalletTypeEnum.MediumPallet.ObjToInt()) - { - newTask.TaskType = TaskTypeEnum.MesPalletLargeReturn.ObjToInt(); - } - else - { - newTask.TaskType = TaskTypeEnum.MesPalletSmallReturn.ObjToInt(); - } } else { @@ -147,7 +132,7 @@ { return content.Error($"鏈壘鍒扮粍鐩樹俊鎭�"); } - if (stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt()) + if (stockInfo.StockStatus != StockStatusEmun.鎵嬪姩缁勭洏鏆傚瓨.ObjToInt() && stockInfo.StockStatus != StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt()) { return content.Error($"璇ユ墭鐩樼姸鎬佷笉姝g‘,涓嶅彲鐢宠鍏ュ簱"); } @@ -175,6 +160,10 @@ { stockInfo.StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(); } + else + { + stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt(); + } _unitOfWorkManage.BeginTran(); int taskId = BaseDal.AddData(newTask); newTask.TaskId = taskId; @@ -190,6 +179,86 @@ content.Error(ex.Message); } return content; + } + /// <summary> + /// 鍘熸枡璇锋眰缁勭洏 + /// </summary> + /// <returns></returns> + public WebResponseContent YLPurchaseBoxing(string palletCode) + { + WebResponseContent content = new WebResponseContent(); + try + { + Dt_StockInfo stockInfoOld = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode); + if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId==MaterielInvOrgEnum.鏂板巶.ObjToInt()) + { + return content.OK($"鏂板巶涓存椂鍏ュ簱{stockInfoOld.PalletCode}"); + } + else if (stockInfoOld != null) + { + return content.Error($"鏉$爜{stockInfoOld.PalletCode}淇℃伅宸插瓨鍦�"); + } + //鑾峰彇閲囪喘淇℃伅 + Dt_PurchaseBSTOrderDetail purchaseBSTOrderDetail = _purchaseBSTOrderDetailRepository.QueryFirst(x=>x.Barcode== palletCode); + if (purchaseBSTOrderDetail == null) + { + return content.Error($"鏈壘鍒版潯鐮亄palletCode}閲囪喘淇℃伅"); + } + if (purchaseBSTOrderDetail.PurchaseBSTOrderDetailStatus!=InOrderStatusEnum.鏈紑濮�.ObjToInt()) + { + return content.Error($"閲囪喘{purchaseBSTOrderDetail.Barcode}淇℃伅宸插叆搴撴垨鍏ュ簱涓�"); + } + else + { + purchaseBSTOrderDetail.PurchaseBSTOrderDetailStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt(); + } + //鑾峰彇閲囪喘涓诲崟 + Dt_PurchaseBSTOrder purchaseBSTOrder = _purchaseBSTOrderRepository.QueryFirst(x=>x.Id==purchaseBSTOrderDetail.PurchaseBSTOrderId); + //鑾峰彇鐗╂枡 + Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == purchaseBSTOrderDetail.MaterialId); + //鐢熸垚搴撳瓨缁勭洏淇℃伅 + Dt_StockInfo stockInfo = new Dt_StockInfo() + { + MaterielInvOrgId = materielInfo.MaterielInvOrgId, + PalletCode = purchaseBSTOrderDetail.Barcode, + LocationCode = "", + PalletType = 1, + WarehouseId = materielInfo.WarehouseId, + StockAttribute = materielInfo.MaterielSourceType, + StockStatus = StockStatusEmun.缁勭洏鏆傚瓨.ObjToInt(), + MaterielSpec = materielInfo.MaterielSpec, + Unit = materielInfo.MaterielUnit, + MaterielThickness = purchaseBSTOrderDetail.MaterialThick, + MaterielWide = purchaseBSTOrderDetail.MaterialWide, + MaterielWeight = purchaseBSTOrderDetail.DeliveryQty, + MaterielCode = materielInfo.MaterielCode, + MaterielName = materielInfo.MaterielName, + StockLength= purchaseBSTOrderDetail.ProcurementLength, + MaterielId= purchaseBSTOrderDetail.MaterialId + }; + if (purchaseBSTOrderDetail.MaterialWide > 1200) + { + stockInfo.PalletType = 2; + } + _unitOfWorkManage.BeginTran(); + //鏂板缁勭洏淇℃伅 + _stockRepository.StockInfoRepository.AddData(stockInfo); + if (purchaseBSTOrder.PurchaseOrderStatus==InOrderStatusEnum.鏈紑濮�.ObjToInt()) + { + purchaseBSTOrder.PurchaseOrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt(); + _purchaseBSTOrderRepository.UpdateData(purchaseBSTOrder); + } + _purchaseBSTOrderDetailRepository.UpdateData(purchaseBSTOrderDetail); + _unitOfWorkManage.CommitTran(); + content.OK("璇锋眰鎴愬姛"); + } + catch (Exception ex) + { + _unitOfWorkManage.RollbackTran(); + content.Error(ex.Message); + } + return content; + } public string AssignYLRoadwayNo(string palletCode) { @@ -208,15 +277,27 @@ } string roadwayNo = ""; + //闄愬埗鐩村緞 if (stockInfo.MaterielThickness > 800) { + //鑾峰彇鍒嗛厤 List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.RoadwayNo.Contains("YL")).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).ToList(); - roadwayNo = locationCounts.OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? ""; if (stockInfo.MaterielWide > 2200) { locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()) && x.RoadwayNo=="SC02_YL").GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).ToList(); - roadwayNo = locationCounts.OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? ""; } + List<LocationCount> useLocationCounts = Db.Queryable<Dt_Task>().Where(x => x.WarehouseId == warehouse.WarehouseId + && locationCounts.Select(j => j.RoadwayNo).Contains(x.Roadway) + && TaskInboundTypes.Contains(x.TaskType)).GroupBy(x => x.Roadway).Select(x => new LocationCount { RoadwayNo = x.Roadway, Count = SqlFunc.AggregateCount(x) }).ToList(); + foreach (var item in locationCounts) + { + LocationCount? count = useLocationCounts.FirstOrDefault(x => x.RoadwayNo == item.RoadwayNo); + if (count != null) + { + item.Count -= count.Count; + } + } + roadwayNo = locationCounts.OrderByDescending(x => x.Count).FirstOrDefault()?.RoadwayNo ?? ""; } return !string.IsNullOrEmpty(roadwayNo) ? (roadwayNo) : throw new Exception("鏈壘鍒板彲鍒嗛厤宸烽亾"); } @@ -231,6 +312,7 @@ /// </summary> public WebResponseContent InboundTaskCompleted(Dt_Task task) { + WebResponseContent content = new WebResponseContent(); try { Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId); @@ -239,14 +321,14 @@ Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress); if (locationInfoEnd == null) { - return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅"); + return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅"); } Dt_AGVStationInfo agvstation = _agvStationInfoRepository.QueryFirst(x => x.AGVStationCode == task.SourceAddress && ( x.StationArea == AGVStationAreaEnum.AreaA.ObjToInt() || x.StationArea == AGVStationAreaEnum.AreaC.ObjToInt())); if (agvstation != null) { agvstation.IsOccupied = WhetherEnum.False.ObjToInt(); } - Dt_ProStockInfo proStockInfo = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == task.PalletCode); + Dt_ProStockInfo proStockInfo = _stockRepository.ProStockInfoRepository.Db.Queryable<Dt_ProStockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x=>x.proStockInfoDetails).First(); if (proStockInfo != null && proStockInfo.StockStatus == StockStatusEmun.MES绌烘墭閫�搴�.ObjToInt()) { task.TaskStatus = TaskStatusEnum.Finish.ObjToInt(); @@ -262,24 +344,46 @@ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚); _unitOfWorkManage.CommitTran(); } + else if (proStockInfo != null && proStockInfo.StockStatus == StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt()) + { + task.TaskStatus = TaskStatusEnum.Finish.ObjToInt(); + proStockInfo.proStockInfoDetails.ForEach(x => + { + x.ProStockDetailStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(); + }); + _unitOfWorkManage.BeginTran(); + if (agvstation != null) + { + _agvStationInfoRepository.UpdateData(agvstation); + } + proStockInfo.LocationCode = locationInfoEnd.LocationCode; + proStockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(); + _stockRepository.ProStockInfoRepository.UpdateData(proStockInfo); + _stockRepository.ProStockInfoDetailRepository.UpdateData(proStockInfo.proStockInfoDetails); + _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, proStockInfo.PalletType, LocationStatusEnum.InStock, proStockInfo.WarehouseId); + BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚); + _unitOfWorkManage.CommitTran(); + } else { - return WebResponseContent.Instance.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�"); + return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�"); } } else//鍘熸枡搴撳畬鎴� { + //鑾峰彇搴撳瓨 Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == task.PalletCode); if (stockInfo == null) { - return WebResponseContent.Instance.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�"); + return content.Error($"鏈壘鍒板搴斿簱瀛樹俊鎭�"); } + //鑾峰彇璐т綅淇℃伅 Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress); if (locationInfoEnd == null) { - return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅"); + return content.Error($"鏈壘鍒板搴旂殑缁堢偣璐т綅淇℃伅"); } - + //鏇存柊鐘舵�� task.TaskStatus = TaskStatusEnum.Finish.ObjToInt(); _unitOfWorkManage.BeginTran(); if (task.TaskType == TaskTypeEnum.InPick.ObjToInt()) @@ -292,15 +396,31 @@ _stockService.StockInfoService.Repository.UpdateData(stockInfo); _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId); BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.浜哄伐瀹屾垚 : WIDESEA_Core.Enums.OperateTypeEnum.鑷姩瀹屾垚); + //if (stockInfo.MaterielInvOrgId==MaterielInvOrgEnum.鑰佸巶.ObjToInt()) + //{ + // int Qty = Convert.ToInt32(stockInfo.MaterielWeight); + // BSTPurchaseUpModel bSTPurchaseUpModel = new BSTPurchaseUpModel() + // { + // Barcode = stockInfo.PalletCode, + // BarcodeQty = Qty, + // Rfid = stockInfo.PalletCode + // }; + // BSTResponse bSTResponse = _invokeERPService.BSTPurchaseUp(bSTPurchaseUpModel).DeserializeObject<BSTResponse>(); + // if (bSTResponse.Code==500) + // { + // throw new Exception($"BST涓�鏈烢RP鍚屾鍏ュ簱淇℃伅澶辫触,閿欒淇℃伅{bSTResponse.Msg}"); + // } + //} _unitOfWorkManage.CommitTran(); } - return WebResponseContent.Instance.OK(); + return content.OK(); } catch (Exception ex) { _unitOfWorkManage.RollbackTran(); - return WebResponseContent.Instance.Error(ex.Message); + content.Error(ex.Message); } + return content; } /// <summary> /// 鍒嗛厤鎴愬搧宸烽亾 @@ -339,6 +459,7 @@ throw new Exception(ex.Message); } } + /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 /// </summary> @@ -376,7 +497,7 @@ { task.TaskStatus = TaskStatusEnum.SC_Execute.ObjToInt(); } - + LocationStatusEnum lastStatus = (LocationStatusEnum)locationInfo.LocationStatus; //鏇存柊閿佸畾璐т綅 @@ -521,6 +642,106 @@ } return content; } + private readonly static object _lockerFLorCP = new object(); + /// <summary> + /// 杈呮枡鎴愬搧鍏ュ簱 + /// </summary> + /// <returns></returns> + public WebResponseContent InboundFLOrCPTask(string barCode, string startPoint,string matCode,int matCount) + { + lock (_lockerFLorCP) + { + WebResponseContent content = new WebResponseContent(); + try + { + //string palletCode = @"^C\d{5}$"; // 姝e垯琛ㄨ揪寮� + //bool isValid = Regex.IsMatch(barCode, palletCode); + //if (!isValid) + //{ + // return content.Error($"妗嗙爜鏍煎紡閿欒{barCode}"); + //} + Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == matCode && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt() && x.WarehouseId==WarehouseEnum.LLDCP.ObjToInt()); + if (materielInfo == null) + { + return content.Error($"鏈壘鍒扮墿鏂欎俊鎭瘂matCode}"); + } + Dt_AGVStationInfo agvstation = _agvStationInfoRepository.QueryFirst(x => x.AGVStationCode == startPoint); + if (agvstation == null) + { + return content.Error($"璧风偣閿欒{startPoint}"); + } + //鍒ゆ柇褰撳墠鐐逛綅鏄惁閲嶅 + Dt_Task taskOldPoint = BaseDal.QueryFirst(x => x.SourceAddress == startPoint && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.AGV_Executing.ObjToInt())); + if (taskOldPoint != null) + { + return content.Error($"绔欑偣{startPoint}宸插瓨鍦ㄤ换鍔�"); + } + Dt_Task taskOld = BaseDal.QueryFirst(x => x.PalletCode == barCode); + if (taskOld != null) + { + return content.Error($"鎵樼洏{barCode}浠诲姟宸插瓨鍦�"); + } + Dt_ProStockInfo proStockInfoOld = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == barCode); + if (proStockInfoOld != null) + { + return content.Error($"鎵樼洏{barCode}宸插瓨鍦�"); + } + //鍒嗛厤宸烽亾 + string roadWay = AssignCPRoadwayNo(); + + //鑾峰彇鎴愬搧搴� + Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.LLDCP.ToString()); + Dt_ProStockInfoDetail proStockInfoDetail = new Dt_ProStockInfoDetail() + { + ProductCode = materielInfo.MaterielCode, + ProductName= materielInfo.MaterielName, + ProductSpec=materielInfo.MaterielSpec, + ProductUnit=materielInfo.MaterielUnit, + StockQty = matCount, + ProStockDetailStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt() + }; + Dt_ProStockInfo proStockInfo = new Dt_ProStockInfo() + { + PalletCode = barCode, + ProStockAttribute = materielInfo.MaterielSourceType, + PalletType = 1, + LocationCode = "", + WarehouseId = warehouse.WarehouseId, + StockStatus = StockStatusEmun.鎵嬪姩缁勭洏鍏ュ簱纭.ObjToInt(), + proStockInfoDetails = new List<Dt_ProStockInfoDetail> { proStockInfoDetail } + }; + + Dt_Task newTask = new Dt_Task() + { + CurrentAddress = startPoint, + Grade = 0, + NextAddress = "", + PalletCode = barCode, + Roadway = roadWay, + SourceAddress = startPoint, + TargetAddress = "", + TaskType = TaskTypeEnum.Inbound.ObjToInt(), + TaskStatus = TaskStatusEnum.New.ObjToInt(), + WarehouseId = warehouse.WarehouseId, + PalletType = 1 + }; + _unitOfWorkManage.BeginTran(); + int taskId = BaseDal.AddData(newTask); + BaseDal.Db.InsertNav(proStockInfo).Include(x => x.proStockInfoDetails).ExecuteCommand(); + newTask.TaskId = taskId; + _unitOfWorkManage.CommitTran(); + //鎺ㄩ�佷换鍔� + PushTasksToWCS(new List<Dt_Task> { newTask }, "AGV"); + content.OK("鍙戦�佹垚鍔�"); + } + catch (Exception ex) + { + _unitOfWorkManage.RollbackTran(); + content.Error(ex.Message); + } + return content; + } + } /// <summary> /// 鍗板埛浣欐枡閫�鏂欎换鍔� /// </summary> @@ -581,7 +802,7 @@ Roadway = "", SourceAddress = address, TargetAddress = "", - TaskType = TaskTypeEnum.PrintBackInbound.ObjToInt(), + TaskType = TaskTypeEnum.PrintYLBackInbound.ObjToInt(), TaskStatus = TaskStatusEnum.New.ObjToInt(), WarehouseId = warehouseId, PalletType = 1, @@ -667,7 +888,7 @@ Roadway = "", SourceAddress = address, TargetAddress = "", - TaskType = TaskTypeEnum.PrintInbound.ObjToInt(), + TaskType = TaskTypeEnum.PrintYLInbound.ObjToInt(), TaskStatus = TaskStatusEnum.New.ObjToInt(), WarehouseId = warehouseId, PalletType = 1, -- Gitblit v1.9.3