From c937e665ccbb763968d30ef2fad61c9eb935abfe Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期四, 02 五月 2024 10:29:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs --- src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java index ea48733..7659ffb 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -29,6 +29,16 @@ @Override public int getOutToStn182(Integer devpNo) { - return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).eq("wrk_sts",12)); + return selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devpNo).in("wrk_sts",11,12)); + } + + @Override + public List<WrkMast> selectWrkIoType(Integer crnNo) { + return this.baseMapper.selectWrkIoType(crnNo); + } + + @Override + public List<WrkMast> selectWaitPakIn(List<Integer> wrkNos) { + return this.baseMapper.selectWaitPakIn(wrkNos); } } -- Gitblit v1.9.1