From f778d39fbbb49efe4dd0aaa0b2f89ed7fa3d5ea6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 02 八月 2023 15:37:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 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..c150405 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
@@ -29,6 +30,18 @@
@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 WrkMast wrkCrnMoveOutXY(Integer crnNo) {
+ WrkMast wrkMast = this.baseMapper.wrkCrnMoveOutXYing(crnNo);
+ if (!Cools.isEmpty(wrkMast)){
+ return wrkMast;
+ }
+ WrkMast wrkMast1 = this.baseMapper.wrkCrnMoveOutXYingOther(crnNo);
+ if (!Cools.isEmpty(wrkMast1)){
+ return null;
+ }
+ return this.baseMapper.wrkCrnMoveOutXY(crnNo);
}
}
--
Gitblit v1.9.1