From 1a52289b4d1c7097a654610c132a91716655d3db Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 11 Jun 2021 17:34:34 +0800
Subject: [PATCH] 试剂安全库存
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 40352f7..66dc833 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -69,7 +69,7 @@
}
if(opeUseFlow.getCreateTime()==null){
- opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()));
+ opeUseFlow.setCreateTime(new Timestamp(System.currentTimeMillis()+1000));
}
this.opeUseFlowDao.insertOpeUseFlow(opeUseFlow);
@@ -380,19 +380,17 @@
public void updateReceiptNumberByCode(List<OpeApplyReserve> selectedTmpOrderList,String receiptNumber) {
for (OpeApplyReserve oar : selectedTmpOrderList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (oar.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : oar.getReagentCode()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(oar.getStartReagentCode2(), oar.getEndReagentCode2());
for (String code : codeTmp) {
this.updateReceiptNumber(code, receiptNumber);
}
@@ -434,19 +432,17 @@
@Override
public void updateReceiptNumberByCode2(List<OpeWarehouseReserve> selectTmpList, String receiptNumber) {
for (OpeWarehouseReserve owr : selectTmpList) {
- //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
- List<String> codeTmp = opeReagentStatusService
- .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
- assert codeTmp.size() > 0;
-
if (owr.getFlag() == 1) {
//库中领取 code存的是 试剂状态的id
- for (String statusId : codeTmp) {
+ for (String statusId : owr.getReagentCodes()) {
String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
//此时状态为领用待入库
this.updateReceiptNumber(code, receiptNumber);
}
}else{
+ //根据id或者试剂的条码直接查找 状态表单 查询订单所有的流向
+ List<String> codeTmp = opeReagentStatusService
+ .generateReagentCode(owr.getStartReagentCode2(), owr.getEndReagentCode2());
for (String code : codeTmp) {
this.updateReceiptNumber(code, receiptNumber);
}
@@ -539,4 +535,9 @@
}
+ @Override
+ public int getOpeUseFlow(OpeUseFlow opeUseFlow) {
+ return opeUseFlowDao.countOpeUseFlow(opeUseFlow);
+ }
+
}
--
Gitblit v1.9.2