From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料

---
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 994beaf..c14025b 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -17,6 +17,8 @@
     List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
 
     LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("locType3") Short locType3);
+    LocMast queryFreeLocMastIncludeFirst(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("locType3") Short locType3);
+    LocMast queryFreeLocMastExceptFirst(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("locType3") Short locType3);
 
     @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
     List<String> queryGroupEmptyStock(Integer crnNo);
@@ -26,4 +28,37 @@
         "and (loc_type2 is null or loc_type2 = #{locType2}) and (loc_type3 is null or loc_type3 = #{locType3}) ")
     Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("locType2") Short locType2, @Param("locType3") Short locType3, @Param("crnNo") Integer crnNo);
 
+    List<LocMast> queryShallowLocFMast();
+
+    List<LocMast> queryNeedMoveShallLocF();
+
+    List<LocMast> queryNeedMoveShallLocD();
+
+    LocMast queryEmptyDeepLoc();
+
+    List<LocMast> queryDeepLocDMast();
+
+    /**
+     * 鏍规嵁鍫嗗灈鏈虹珯鐐规煡璇㈢┖搴撲綅
+     * @param crnNo 鍫嗗灈鏈哄彿
+     * @return 搴撲綅
+     */
+    LocMast queryEmptyLocNoByStaNo(@Param("crnNo") int crnNo);
+
+    LocMast queryLocByBarCode(@Param("row") int row);
+
+    /**
+     * 鑾峰彇婊¤冻鏉′欢鐨勭┖搴撲綅
+     * @param devpNo 鍏ュ簱绔欑偣
+     * @param flag 灞傛爣璇嗭紝1琛ㄧず鍘�1-6灞傦紝2鍘昏〃绀�7-11灞�
+     * @return 搴撲綅
+     */
+    LocMast queryLocByBarCodeNew(@Param("devpNo") int devpNo, @Param("flag") int flag);
+
+    LocMast selectByBarcode(@Param("barcode") String barcode);
+
+    /**
+     * 鍥涘彿鍫嗗灈鏈烘壘搴撲綅
+     */
+    List<LocMast> selectOneByCrnNo(@Param("crnNo") int crnNo);
 }

--
Gitblit v1.9.1