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 | 8 +++++++-
1 files changed, 7 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 81e718c..7caee55 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -1,6 +1,8 @@
package com.zy.asrs.service;
+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;
@@ -10,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);
@@ -19,4 +23,6 @@
void viladate(List<Pla> plas, User user);
List<Pla> selectToHistory();
+
+ public Page<Pla> getStockStatisAll(Page<Pla> page);
}
--
Gitblit v1.9.1