From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 96 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
index 08ab215..8a53d5d 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
@@ -17,32 +17,32 @@
public interface OpeApplyService {
public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
- String applyUserId, String approveUserId, String queryCas,
+ Long applyUserId, Long approveUserId, String queryCas,
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,
+ Long applyUserId, Long approveUserId, String queryCas,
Integer first, Integer pageSize,String applyCode,String searchApproval);
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);
+ Long applyUserId, Long 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);
+ Long applyUserId, Long approveUserId, String queryCas,String applyCode,String searchApproval);
+ public OpeApply getOpeApply(Long id);
public OpeApply insertOpeApply(OpeApply opeApply);
public List<OpeApply> insertOpeApplyList(List<OpeApply> opeApplyList);
public boolean updateOpeApply(OpeApply opeApply);
- public boolean updateFirst(String id);
- public boolean updateFirst2(String id);
+ public boolean updateFirst(Long id);
+ public boolean updateFirst2(Long id);
public boolean updateOpeApplyProject(String newObjective,String oldObjective);
- public boolean updateSelectedOpeApplyStatus(String memo, List<String> applyIds,
- String adminUserId, List<String> adminApplyIds,List<String> firstUserIds);
+ public boolean updateSelectedOpeApplyStatus(String memo, List<Long> applyIds,
+ Long adminUserId, List<Long> adminApplyIds,List<Long> firstUserIds);
- public boolean updateOpeApplyStatus(ApplyStatus status, String memo, List<String> applyIds);
+ public boolean updateOpeApplyStatus(ApplyStatus status, String memo, List<Long> applyIds);
- public boolean updateOpeApplyAdminStatus(String memo, List<String> applyIds, String adminUserId,List<String> firstUserIds);
+ public boolean updateOpeApplyAdminStatus(String memo, List<Long> applyIds, Long adminUserId,List<Long> firstUserIds);
- public boolean updateOpeApplyAdminStatus2(String memo, List<String> applyIds, String adminUserId,List<String> firstUserIds);
+ public boolean updateOpeApplyAdminStatus2(String memo, List<Long> applyIds, Long adminUserId,List<Long> firstUserIds);
public boolean deleteOpeApply(List<OpeApply> opeApplyList);
@@ -50,35 +50,79 @@
public boolean isApplyApproved(OpeApply opeApply);
public boolean isAllowApplyCancel(OpeApply opeApply);
- OpeApply selectOpeApplyByPrimaryKey(String id);
+ OpeApply selectOpeApplyByPrimaryKey(Long id);
- int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName);
- List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first,
+ int getOpeApplyReserveTotalCountByName(Long id,String reagentName, String personName);
+ List<OpeApplyReserve> getOpeApplyReserveListByName(Long 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,boolean isExpired);
- List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
+ int getOpeApplyReserveTotalCountByNameFor(Long userId,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired);
+ List<OpeApplyReserve> getOpeApplyReserveListByNameFor(Long id,String reagentName, String personName, Integer first,
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);
+ public boolean updaetOpeApplyPrice(BigDecimal applyPrice,Long id);
+ public boolean updaetOpeApplyStockFlag(int stockFlag,Long id);
+ public boolean cancelApply(ApplyStatus status,Long id);
- public List<OpeApply> selectByReId(String id);
- public void updateByReId(String newReId,String oldReId);
+ public List<OpeApply> selectByReId(Long id);
+ public void updateByReId(Long newReId,Long oldReId);
- OpeApplyReserve getOpeApplyDetail(String applyCode);
+ OpeApplyReserve getOpeApplyDetail(Long applyCode);
- void updateOpeApplyInfo(ApplyStatus storage, String consigneeId, Timestamp arrivalTime, String applyId);
+ void updateOpeApplyInfo(ApplyStatus storage, Long consigneeId, Timestamp arrivalTime, Long applyId,Integer arrivalNum);
- void orderInputWarehouse(List<OpeApplyReserve> opeApplyList,String consigneeId,Timestamp arrivalTime) throws BusinessException,Exception;
+ void orderInputWarehouse(List<OpeApplyReserve> opeApplyList,Long consigneeId,Timestamp arrivalTime) throws BusinessException,Exception;
void btUpdateApplyAndOrder(List<OpeApply> opeList);
void importApply(FileUploadEvent event, SysUser user) throws IOException;
- OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey);
+ OpeApplyReserve getOpeApplyReserveListByNameForRowData(Long 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);
+
+ /**
+ * 根据id更新申请订单状态
+ * @param status
+ * @param applyId
+ * @return
+ */
+ int updateOpeApplyStatusById(Integer status, Long applyId);
+
+ /**
+ * 获取订单下面的申请列表
+ * @param orderId
+ * @return
+ */
+ List<OpeApply> getOpeApplyByOrderId(Long orderId);
+
+
+ /**
+ * 根据申请id获取试剂信息
+ * @param applyId
+ * @return
+ */
+ SysReagent getReagentByApplyId(Long applyId);
+
+ /**
+ * 获取数量，关联订单
+ * @param applyCode
+ * @param orderCode
+ * @param orderName
+ * @return
+ */
+ int getOpeApplyCountWithOrder(String applyCode,String orderCode,String orderName);
+
+ /**
+ * 获取列表 关联订单
+ * @param applyCode
+ * @param orderCode
+ * @param orderName
+ * @param first
+ * @param pageSize
+ * @return
+ */
+ List<OpeApply> getOpeApplyListWithOrder(String applyCode,String orderCode,String orderName,int first, int pageSize);
+
}
--
Gitblit v1.9.2