From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 4341661..309d81b 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.TaskWrk;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -14,7 +13,10 @@
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {
TaskWrk selectByTaskNo(String taskNo);
+
TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);
+
+ TaskWrk selectByBarcode(@Param("barcode") String barcode);
TaskWrk selectByWrkNo(Integer wrkNo);
@@ -32,7 +34,7 @@
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();
--
Gitblit v1.9.1