From 48d6b46ef23a321cc70e20d36a2b3bf721d05206 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:45:57 +0800
Subject: [PATCH] 电视机显示屏曲线图改成7天
---
src/main/java/com/zy/asrs/service/LocMastService.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 168d694..4ea4e50 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -3,16 +3,41 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
-import org.apache.ibatis.annotations.Param;
+import com.zy.asrs.entity.param.ErrorDeviceParam;
import java.util.List;
public interface LocMastService extends IService<LocMast> {
+ List<LocMast> asrLocMastNotInDetl1();
+ List<LocMast> asrLocMastNotInDetl2();
+ List<LocMast> asrLocMastNotInDetl3();
+ List<ErrorDeviceParam> adjacentLocMast();
+
+ /**
+ * 鎸夊簱鍖哄拰搴撲綅鍧愭爣琛ラ綈鍗曚釜搴撲綅鍒悕銆�
+ */
+ void prepareAreaAlias(LocMast locMast);
+
+ /**
+ * 鎸夊垪琛ㄥ唴鐨勫簱鍖烘渶灏忔帓鎵归噺琛ラ綈搴撲綅鍒悕锛屼富瑕佺敤浜庡垵濮嬪寲銆�
+ */
+ void fillAreaAlias(List<LocMast> locMasts);
+
+ /**
+ * 鎵归噺淇敼搴撳尯骞堕噸绠楃浉鍏冲簱鍖哄埆鍚嶃��
+ */
+ void batchUpdateArea(List<String> locNos, Integer areaId, Long userId);
+
+ /**
+ * 鎸夊師搴撲綅鍙锋垨鍒悕鏌ユ壘鍘熷 loc_no銆�
+ */
+ List<String> selectLocNosByNoOrAlias(String condition);
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
LocMast queryFreeLocMast(Integer row, Short locType1);
+ LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -20,6 +45,7 @@
* @return 鍚岀粍绌哄簱浣嶉泦鍚�
*/
List<String> queryGroupEmptyStock(String sourceLocNo);
+ List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType);
/**
* 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
@@ -27,17 +53,38 @@
* @return
*/
Boolean checkEmptyCount(LocMast locMast);
+ Boolean checkEmptyCount(LocMast locMast, Long whsType);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
*/
Boolean checkWhole(List<LocDetl> locDetls);
+ Boolean checkWhole(List<LocDetl> locDetls, Long whsType);
/**
* 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
* @return
*/
List<LocMast> queryShallowLocFMast(Integer crnNo);
+ List<LocMast> queryShallowLocFMast(Integer crnNo, Long whsType);
List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
+ List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo, Long whsType);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
+// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+ LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);
+// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+ LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType);
+
+ //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+ List<LocMast> selectLocByLev(Integer lev);
}
--
Gitblit v1.9.1