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

Junjie

2023-11-27 5ac80d6a06f686a62c307c52c652e511e3896fb7

 src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java

@@ -14,14 +14,25 @@
public interface TaskWrkMapper extends BaseMapper<TaskWrk> {

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

    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 selectCrnNoWorking(@Param("crnNo") Integer crnNo,@Param("workNo") Integer workNo);

    List<TaskWrk> selectToBeHistoryData();