| 项目代码/WIDESEA_WMSClient/src/views/Home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 项目代码/WMS无仓储版/WIDESEA_WMSServer/BigGreenService/BigGreenService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/Home.vue
@@ -2,7 +2,7 @@ <div class="wms-dashboard"> <!-- ç»è®¡å¡çåºå --> <el-row :gutter="20" class="stats-card-row"> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Box /></el-icon> @@ -11,7 +11,7 @@ <div class="card-value">{{ bigscreendata.unInBoundOrderCount }}</div> </div> </el-col> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Document /></el-icon> @@ -20,7 +20,7 @@ <div class="card-value">{{ bigscreendata.unOutBoundOrderCount }}</div> </div> </el-col> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Download /></el-icon> @@ -29,7 +29,7 @@ <div class="card-value">{{ bigscreendata.inboundCount }}</div> </div> </el-col> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Upload /></el-icon> @@ -38,24 +38,42 @@ <div class="card-value">{{ bigscreendata.outboundCount }}</div> </div> </el-col> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Box /></el-icon> <el-icon :size="32"><Goods /></el-icon> </div> <div class="card-title">æè´§æç®±</div> <div class="card-value">{{ formatNumber(bigscreendata.inStockPallet) }}</div> </div> </el-col> <el-col :span="4"> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Box /></el-icon> <el-icon :size="32"><Crop /></el-icon> </div> <div class="card-title">空箱æ°é</div> <div class="card-value">{{ formatNumber(bigscreendata.freeStockPallet) }}</div> </div> </el-col> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Grid /></el-icon> </div> <div class="card-title">æ»åºä½</div> <div class="card-value">{{ bigscreendata.totalLocation }}</div> </div> </el-col> <el-col :span="3"> <div class="stats-card"> <div class="metric-icon"> <el-icon :size="32"><Warning /></el-icon> </div> <div class="card-title">ç¦ç¨åºä½</div> <div class="card-value">{{ bigscreendata.disableLocation }}</div> </div> </el-col> </el-row> <!-- å¾è¡¨åºåï¼ç¬¬ä¸è¡ï¼ --> ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/BigGreenService/BigGreenService.cs
@@ -71,6 +71,8 @@ ? 0 : Math.Round((decimal)inStockLocation / totalLocation, 4) * 100; //ç¦ç¨è´§ä½ var disableLocation = _locationInfoRepository.QueryData(x=>x.EnableStatus == (int)EnableStatusEnum.Disable).Count(); //计ç®å ¥åºä»»å¡ååºåºä»»å¡å®ææ°é var inboundCount = _taskHtyRepository.Db.Queryable<Dt_Task_Hty>().Where(x => x.TaskType >= 500 && x.TaskType < 900 && x.CreateDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")).Count(); var outboundCount = _taskHtyRepository.Db.Queryable<Dt_Task_Hty>().Where(x => x.TaskType >= 100 && x.TaskType < 500 && x.CreateDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")).Count(); @@ -101,7 +103,9 @@ FreeStockPallet = freeStockPallet, CompleteTask = completeTask, NearExpirationList = nearExpirationList, UnInBoundOrderCount = unInBound UnInBoundOrderCount = unInBound, TotalLocation = totalLocation, DisableLocation = disableLocation }; return WebResponseContent.Instance.OK(data: bigGreenData); } @@ -273,6 +277,9 @@ public List<SimpleStatisticsDTO> CompleteTask { get; set; } public List<StockInfoDetailExtDTO> NearExpirationList { get; set; } public int TotalLocation { get; set; } public int DisableLocation { get; set; } } /// <summary> ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs
@@ -30,7 +30,8 @@ private readonly IRepository<Dt_OutboundOrderDetail> _outboundOrderDetailRepository; private readonly IMaterialUnitService _materialUnitService; private readonly IRepository<Dt_OutStockLockInfo> _outStockLockInfoRepository; public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, IRepository<Dt_OutStockLockInfo> outStockLockInfoRepository) : base(BaseDal) private readonly IFeedbackMesService _feedbackMesService; public OutboundOrderService(IRepository<Dt_OutboundOrder> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IRepository<Dt_OutboundOrderDetail> outboundOrderDetailRepository, ILogger<OutboundOrderService> logger, IMaterialUnitService materialUnitService, IMaterielInfoService materielInfoService, IRepository<Dt_OutStockLockInfo> outStockLockInfoRepository, IFeedbackMesService feedbackMesService) : base(BaseDal) { _mapper = mapper; _unitOfWorkManage = unitOfWorkManage; @@ -39,6 +40,7 @@ _materialUnitService = materialUnitService; _materielInfoService = materielInfoService; _outStockLockInfoRepository = outStockLockInfoRepository; _feedbackMesService = feedbackMesService; } private int[] OrderTypes = new int[] { (int)InOrderTypeEnum.AllocatOutbound, (int)InOrderTypeEnum.InternalAllocat, (int)InOrderTypeEnum.ReCheck }; @@ -240,12 +242,14 @@ _outboundOrderDetailRepository.UpdateData(updateoutboundOrderDetails); _outboundOrderDetailRepository.AddData(outboundOrderDetails); if (outboundOrder.Details.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty)) var realLatestDetails = Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.OrderId == outboundOrder.Id).ToList(); if (realLatestDetails.All(x => x.OverOutQuantity >= x.OrderQuantity - x.MoveQty)) { outboundOrder.OrderStatus = (int)OutOrderStatusEnum.åºåºå®æ; outboundOrder.ReturnToMESStatus = 1; BaseDal.UpdateData(outboundOrder); _feedbackMesService.OutboundFeedback(outboundOrder.OrderNo); } BaseDal.UpdateData(outboundOrder); _unitOfWorkManage.CommitTran();
