diff --git a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java index e362173..e9d89b7 100644 --- a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java @@ -174,7 +174,7 @@ public class PoServiceImpl extends ServiceImpl implemen } // 根据库位获取仓库ID String warehouseId = null; - Location location = locationService.getByLocationIdAndSite(inData.getSite(), inData.getLocationId()); + Location location = locationService.getByLocationIdAndSite(inData.getSite(), inData.getLocationNo()); if (location != null) { warehouseId = location.getWarehouseId(); } diff --git a/src/main/resources/mapper/dashboard/DashboardDao.xml b/src/main/resources/mapper/dashboard/DashboardDao.xml index fa41c54..2a95104 100644 --- a/src/main/resources/mapper/dashboard/DashboardDao.xml +++ b/src/main/resources/mapper/dashboard/DashboardDao.xml @@ -46,6 +46,11 @@ WHERE MONTH(created_time) = MONTH(GETDATE()) AND YEAR(created_time) = YEAR(GETDATE())) AS monthlyTasks, + -- 当日作业总数(当日已完成任务数) + (SELECT COUNT(DISTINCT task_no) + FROM wms_order_task + WHERE created_time >= DATEADD(DAY, -5, GETDATE())) AS todayTasks, + -- 出库作业数(当月已完成,source_type不包含"入库") (SELECT COUNT(DISTINCT task_no) FROM wms_order_task