From 0c26a0906a17b14cd7966a334f66976cba1147ed Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 17:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ynhfwcs1' into ynhfwcs1
---
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 65cb0ab..e6cd827 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -2,7 +2,6 @@
import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -14,6 +13,7 @@
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+ TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);
TaskWrk selectByWrkNo(Integer wrkNo);
@@ -31,10 +31,14 @@
TaskWrk selectCrnStaWorking(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);
- TaskWrk selectCrnNoWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
+ TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);
List<TaskWrk> selectToBeHistoryData();
int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+ List<TaskWrk> selectWorkingTask();//鑾峰彇宸ヤ綔涓殑浠诲姟
+
+ TaskWrk selectStaWorking(Integer wrkNo);
+
}
--
Gitblit v1.9.1