From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/java/com/zy/asrs/service/PlaService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
index c62526a..7caee55 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DropdownValuesDto;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.Pla;
 import com.zy.asrs.entity.PlaQty;
@@ -11,7 +12,9 @@
 
 public interface PlaService extends IService<Pla> {
 
-    Pla selectByBatchAndPackageNo(String batch, Integer packageNo);
+    List<DropdownValuesDto> getDropdownValues();
+
+    Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand);
 
     void queryStock(OrderDetl orderDetl, List<PlaQty> plaQties);
 

--
Gitblit v1.9.1