From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug
---
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
index 63b4259..08ab215 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
@@ -1,29 +1,29 @@
package com.nanometer.smartlab.service;
-import com.nanometer.smartlab.entity.OpeApply;
-import com.nanometer.smartlab.entity.OpeApplyReserve;
-import com.nanometer.smartlab.entity.OpeOrder;
-import com.nanometer.smartlab.entity.OpeWarehouseReserve;
+import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.exception.BusinessException;
+import org.primefaces.event.FileUploadEvent;
+import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
+import java.util.Map;
/**
* Created by johnny on 17/12/12.
*/
public interface OpeApplyService {
- public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
+ public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,
- Integer first, Integer pageSize,String applyCode,String applyUserName);
+ Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow);
public List<OpeApply> getOpeApplyListForApproval(String applyUserName,String approvaUserName,String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,
Integer first, Integer pageSize,String applyCode,String searchApproval);
- public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
- String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName);
+ public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
+ String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow);
public int getOpeApplyTotalCountForApproval(String applyUserName,String approvaUserName,String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,String applyCode,String searchApproval);
public OpeApply getOpeApply(String id);
@@ -55,9 +55,9 @@
int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName);
List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first,
Integer pageSize);
- int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply);
+ int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired);
List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply);
+ Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired);
public boolean updaetOpeApplyPrice(BigDecimal applyPrice,String id);
public boolean updaetOpeApplyStockFlag(int stockFlag,String id);
public boolean cancelApply(ApplyStatus status,String id);
@@ -73,4 +73,12 @@
void orderInputWarehouse(List<OpeApplyReserve> opeApplyList,String consigneeId,Timestamp arrivalTime) throws BusinessException,Exception;
void btUpdateApplyAndOrder(List<OpeApply> opeList);
+
+ void importApply(FileUploadEvent event, SysUser user) throws IOException;
+
+ OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey);
+
+ int getOpeApplySupplerRequireMngTotalCount(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int key, byte b);
+
+ List<OpeApply> getOpeApplySupplerRequireMngList(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int key, int first, int pageSize, byte b);
}
--
Gitblit v1.9.2