From 22a51a35a7367bc5569ea075afe0b7f1c438b529 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 11:10:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

---
 src/main/java/com/zy/asrs/service/LocRuleService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocRuleService.java b/src/main/java/com/zy/asrs/service/LocRuleService.java
index 24c3490..9e6e196 100644
--- a/src/main/java/com/zy/asrs/service/LocRuleService.java
+++ b/src/main/java/com/zy/asrs/service/LocRuleService.java
@@ -1,10 +1,25 @@
 package com.zy.asrs.service;
 
+import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.LocRule;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 public interface LocRuleService extends IService<LocRule> {
 
-    LocRule find(String matnr, String batch, int startRow, int endRow);
+    List<LocRule> find(String matnr);
+
+    List<LocRule> findCode(String matnr, String other);
+
+    //鎵炬贩杞藉簱浣嶈鍒�
+    List<LocRule> findMixed();
+
+    //灏嗗簱浣嶈鍒欑粍杞崲涓哄簱浣嶇粍
+    List<LocMast> locRuleToLocNos(LocRule locRule);
+
+    int updateKeepGoByMatnr(String matnr, Integer keepGo);
+
+    int updateKeepGoByMixed(Integer keepGo);
 
 }

--
Gitblit v1.9.1