From 7f16849cfa9362d32eaaf323c71350351f13b689 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 11 九月 2025 08:51:15 +0800
Subject: [PATCH] 添加看板库位库存接口

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
index 917fd58..26d12aa 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
@@ -2,12 +2,11 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.md.entity.KBBTJPDrawingBP;
-import com.mes.md.entity.PrimitiveTask;
-import com.mes.md.entity.TaskingLog;
+import com.mes.md.entity.*;
 import com.mes.md.mapper.KBBTJPDrawingBPMapper;
 import com.mes.md.mapper.TaskingLogMapper;
 import com.mes.md.service.KBBTJPDrawingBPService;
+import com.mes.md.service.LineConfigurationService;
 import com.mes.md.service.PrimitiveTaskService;
 import com.mes.md.service.TaskingLogService;
 import com.mes.utils.Result;
@@ -42,12 +41,15 @@
     TaskingLogService taskingLogService;
     @Autowired
     TaskingLogMapper taskingLogMapper;
+    @Autowired
+    LineConfigurationService lineConfigurationService;
 
     @ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
-    @PostMapping("/selectPrimitiveTask")
+    @PostMapping("/findMachineTask")
     @ResponseBody
-    public Result findMachineTask(@RequestBody PrimitiveTask primitiveTask) {
-        List<PrimitiveTask> list =primitiveTaskService.selectPrimitiveTask(primitiveTask);
+    public Result findMachineTask(@RequestBody Machine machine) {
+        LineConfiguration lineConfiguration = lineConfigurationService.machineLineConfiguration(machine);
+        List<PrimitiveTask> list =primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
         return Result.build(200,"鎴愬姛",list);
     }
 

--
Gitblit v1.8.0