huojin
/
Cpte-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2026-01-21 11:33:52 +08:00
parent 2b4eed320e
commit 614c1847db
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/entity/AgvTask.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -66,6 +67,9 @@ public class AgvTask implements Serializable {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private java.lang.Long itemId; private java.lang.Long itemId;
@TableField(exist = false)
private String itemCode;
/** /**
* 柜号 * 柜号
*/ */

7
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/AgvTaskMapper.java
View File

@ -74,5 +74,12 @@ public interface AgvTaskMapper extends BaseMapper<AgvTask> {
@Select(value = "select end_code,count(end_code) from data_agv_task where type='OUTBOUND' and status in (1,2) and agv_vendor='TES' group by end_code") @Select(value = "select end_code,count(end_code) from data_agv_task where type='OUTBOUND' and status in (1,2) and agv_vendor='TES' group by end_code")
List<Map<String, Integer>> pointTaskCountMap(); List<Map<String, Integer>> pointTaskCountMap();
List<ConNoAgv> queryIsExecuteAgvTask(); List<ConNoAgv> queryIsExecuteAgvTask();
/**
* 查询正在执行的AGV任务前5个
*/
@Select(value = "select * from data_agv_task where type in ('INBOUND','OUTBOUND') and status=2 LIMIT 5")
List<AgvTask> queryExecuteTopFive();
} }

25
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/dashboard/controller/DashBoardController.java
View File

@ -12,7 +12,11 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.cpte.modules.agvTask.entity.AgvTask; import org.cpte.modules.agvTask.entity.AgvTask;
import org.cpte.modules.agvTask.mapper.AgvTaskMapper;
import org.cpte.modules.agvTask.service.IAgvTaskService; import org.cpte.modules.agvTask.service.IAgvTaskService;
import org.cpte.modules.base.entity.Item;
import org.cpte.modules.base.mapper.ItemMapper;
import org.cpte.modules.base.service.IItemService;
import org.cpte.modules.dashboard.vo.OutAndInData; import org.cpte.modules.dashboard.vo.OutAndInData;
import org.cpte.modules.inventory.mapper.InventoryMapper; import org.cpte.modules.inventory.mapper.InventoryMapper;
import org.cpte.modules.receive.mapper.AsnDetailMapper; import org.cpte.modules.receive.mapper.AsnDetailMapper;
@ -51,6 +55,12 @@ public class DashBoardController {
@Autowired @Autowired
private TaskMapper taskMapper; private TaskMapper taskMapper;
@Autowired
private AgvTaskMapper agvTaskMapper;
@Autowired
private IItemService itemService;
@GetMapping("/getChartCardList") @GetMapping("/getChartCardList")
public Result<JSONArray> getChartCardList() { public Result<JSONArray> getChartCardList() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
@ -99,4 +109,19 @@ public class DashBoardController {
return Result.OK(outAndInDataList); return Result.OK(outAndInDataList);
} }
@GetMapping("/queryExecuteTopFive")
public Result<List<AgvTask>> queryExecuteTopFive() {
//前5条执行中的AGV任务
List<AgvTask> agvTasks = agvTaskMapper.queryExecuteTopFive();
List<Long> itemIds=agvTasks.stream().map(AgvTask::getItemId).distinct().toList();
Map<Long, Item> itemMap=itemService.queryByItemIdsToMap(itemIds);
for (AgvTask agvTask : agvTasks){
Item item=itemMap.get(agvTask.getItemId());
if(item!=null){
agvTask.setItemCode(item.getItemCode());
}
}
return Result.OK(agvTasks);
}
} }