Merge remote-tracking branch 'origin/glccwcs' into glccwcs

Administrator

2025-06-05 aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2

 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;
@@ -15,12 +14,32 @@

    TaskWrk selectByTaskNo(String taskNo);

    TaskWrk selectByStartPoint(@Param("startPoint") String startPoint);

    TaskWrk selectByBarcode(@Param("barcode") String barcode);

    TaskWrk selectByWrkNo(Integer wrkNo);

    List<TaskWrk> selectReceive();//获取接收任务

    TaskWrk selectPakIn(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo, @Param("startPoint") String startPoint);

    List<TaskWrk> selectPakOut(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);

    WrkMast selectCrnWorking(@Param("crnNo") Integer crnNo);
    List<TaskWrk> selectPakOut3(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);

    List<TaskWrk> selectPakOutIoType(@Param("crnNo") Integer crnNo);

    TaskWrk selectCrnWorking(@Param("crnNo") Integer crnNo);

    TaskWrk selectCrnStaWorking(@Param("crnNo") Integer crnNo, @Param("targetPoint") String targetPoint);

    TaskWrk selectCrnNoInWorking(@Param("crnNo") Integer crnNo, @Param("workNo") Integer workNo);

    List<TaskWrk> selectToBeHistoryData();

    int saveToHistory(String taskNo);//将任务转历史日志

    List<TaskWrk> selectWorkingTask();//获取工作中的任务

}