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

whycq

2024-10-22 85ce1fa2f3d894cce2be0faa24551dfca7896ac9

 src/main/java/com/zy/asrs/service/WrkMastExecuteService.java

@@ -18,10 +18,12 @@
    List<WrkMastExecute> selectWrkMastExecuteByType(Integer type);

    List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts);
    List<WrkMastExecute> selectWrkMastExecuteByTypeAndIoTyperAndWrkType(Integer type,Integer ioType,Integer wrkSts,Integer jarRegin);

    List<WrkMastExecute> selectWrkMastExecuteByWrk(WrkMastExecute wrkMastExecute);

    Integer getWrkMastExecuteByJarIdCount(Integer jarId);
    Integer getWrkMastExecuteByjarReginCount(Integer jarId);

    Integer selectNoStart(Integer jarRegin);