From 34e0894214280018ac9de1bd0f8fe1ce5cd5a97f Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 29 十月 2024 16:28:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
index 7192e4f..aadd73d 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocMastMapper.java
@@ -2,16 +2,14 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.AgvLocMast;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
import java.util.List;
@Mapper
public interface AgvLocMastMapper extends BaseMapper<AgvLocMast>{
+ //@Delete("delete from agv_loc_mast")
@Delete("delete from agv_loc_mast")
public void deleteAll();
@@ -24,4 +22,15 @@
List<AgvLocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
+ @Select("select loc_no " +
+ "from agv_loc_mast " +
+ "where loc_sts = 'O' and floor = ${floor}")
+ List<String> queryGroupEmptyStock(@Param("floor")int floor);
+
+
+ @Select("SELECT * FROM agv_loc_mast WHERE lev1 = #{lev} And floor = #{floor}")
+ List<AgvLocMast> selectLocByLevAndFloor(@Param("lev")int lev, @Param("floor")int floor);
+
+ @Select("SELECT loc_type2 FROM agv_loc_mast WHERE loc_type1 = #{locType1} AND loc_type2 IS NOT NULL GROUP BY loc_type2")
+ List<String> queryContainerTypeByLocType1(@Param("locType1")Short locType1);
}
--
Gitblit v1.9.1