From cf6b965a86065a537a40c74f67e88a04447d2582 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期一, 12 七月 2021 18:00:38 +0800 Subject: [PATCH] 修改导入申购 --- src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java index 083cd89..e5e23d3 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java @@ -1,12 +1,11 @@ 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; @@ -55,9 +54,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); + 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 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); @@ -71,4 +70,10 @@ void updateOpeApplyInfo(ApplyStatus storage, String consigneeId, Timestamp arrivalTime, String applyId); 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); } -- Gitblit v1.9.2