From aea629d098bdab0918d90e0c51af9d7b099bca12 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:45:51 +0800
Subject: [PATCH] #新旧物料更新接口
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 1c44970..035c797 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
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;
@@ -17,7 +17,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
@Slf4j
@@ -37,6 +36,11 @@
@Override
public List<LocMast> selectAreaEmpty(Short locType1, Integer locType3) {
return this.baseMapper.selectAreaEmpty(locType1, locType3);
+ }
+
+ @Override
+ public List<LocMast> selectAreaEmptyByLev(Short locType1, Integer locType3, Integer lev) {
+ return this.baseMapper.selectAreaEmptyByLev(locType1, locType3, lev);
}
@Override
@@ -146,6 +150,21 @@
return locMast;
}
+ @Override
+ public LocMast findInnerLoc(String locNo) {
+ List<String> groupLoc = Utils.getGroupLoc(locNo);
+ for (String loc : groupLoc) {
+ LocMast tmp = this.baseMapper.selectByLoc(loc);
+ if (tmp == null) {
+ continue;
+ }
+ if (tmp.getLocSts().equals("O")) {
+ return tmp;
+ }
+ }
+ return null;
+ }
+
/**
* 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
*/
@@ -186,4 +205,13 @@
public Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev) {
return this.baseMapper.updateLocType2ByRBL(locType2, startRow, endRow, startBay, endBay, startLev, endLev);
}
+
+ public void updateByLocNo(LocMast locMast){
+ this.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo()));
+ }
+
+ @Override
+ public List<LocMast> selectLocDetlNotExist() {
+ return this.baseMapper.selectLocDetlNotExist();
+ }
}
--
Gitblit v1.9.1