From 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十一月 2024 10:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 127 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 4e34f77..8be150b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
@@ -19,7 +20,12 @@
@Override
public LocMast queryFreeLocMast(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, locType1);
+ return this.baseMapper.queryFreeLocMast(row, locType1,1L);
+ }
+
+ @Override
+ public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
+ return this.baseMapper.queryFreeLocMast(row, locType1,type);
}
@Override
@@ -31,6 +37,123 @@
if (Cools.isEmpty(sourceStock)) {
return null;
}
- return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo());
+ return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), 1L);
+ }
+
+ @Override
+ public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
+ if (Cools.isEmpty(sourceLocNo)) {
+ return null;
+ }
+ LocMast sourceStock = this.selectById(sourceLocNo);
+ if (Cools.isEmpty(sourceStock)) {
+ return null;
+ }
+ return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo(), type);
+ }
+
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast) {
+ if (locMast == null) {
+ return false;
+ }
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
+ }
+
+ @Override
+ public Boolean checkEmptyCount(LocMast locMast,Long type) {
+ if (locMast == null) {
+ return false;
+ }
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
+ }
+
+ /*
+ *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+// @Override
+// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L);
+// }
+// return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L);
+// }
+//
+// @Override
+// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInF1(locNos,type);
+// }
+// return this.baseMapper.selectLocByLocStsPakInF2(locNos,type);
+// }
+
+ @Override
+ public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+ if (curRow>nearRow){
+ return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+ return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+
+ @Override
+ public LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+ if (curRow>nearRow){
+ return this.baseMapper.selectLocByLocStsPakInShuttleF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+ return this.baseMapper.selectLocByLocStsPakInShuttleF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+// @Override
+// public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+// if (curRow<nearRow){
+// return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L);
+// }
+// return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
+// }
+ @Override
+ public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
+ if (curRow>nearRow){
+ return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+ return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ }
+
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls) {
+ return null;
+ }
+
+ @Override
+ public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
+ return null;
+ }
+
+ @Override
+ public List<LocMast> queryShallowLocFMast(Integer crnNo) {
+ return this.baseMapper.queryShallowLocFMast(crnNo,1L);
+ }
+
+ @Override
+ public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
+ return this.baseMapper.queryShallowLocFMast(crnNo,type);
+ }
+
+ @Override
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
+ if (crnNo==1){
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
+ }
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
+ }
+
+ @Override
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
+ if (crnNo==1){
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
+ }
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
}
}
--
Gitblit v1.9.1