From 2f52e8c752122625f189ae7657e621db0d6d253c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 28 一月 2021 09:39:19 +0800
Subject: [PATCH] 修改安全测评内容
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 08482d6..9924439 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -15,6 +15,7 @@
import com.nanometer.smartlab.util.MessageUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.dao.DuplicateKeyException;
@@ -41,10 +42,13 @@
@Resource(name = "opeApplyDao")
OpeApplyDao opeApplyDao;
+ @Lazy
@Resource
OpeOrderService opeOrderService;
+ @Lazy
@Resource
OpeReagentStatusService opeReagentStatusService;
+ @Lazy
@Resource
OpeWarehouseReserveService opeWarehouseReserveService;
@@ -693,12 +697,12 @@
//2.2更改订单状态
List<OpeApply> oas = opeOrderService.getOpeApplyListByOrder(oo.getId());
assert oas.size() > 0;
- //子订单是否全部入库,是则父单为完成，否则未完成
+ //子订单是否全部入库,是则父单为已入库，否则未完成
boolean flag = oas.stream().allMatch(oa -> oa.getStatus() == ApplyStatus.STORAGE);
oo.setConsigneeUserId(consigneeId);
oo.setArrivalTime(arrivalTime);
if (flag){
- oo.setStatus(ApplyStatus.FINISHED);
+ oo.setStatus(ApplyStatus.STORAGE);
opeOrderService.updateOpeOrderStatus(oo);
}else{
oo.setStatus(ApplyStatus.UNCOMPLETED);
@@ -707,5 +711,12 @@
}
}
+ /**
+ * 补贴条码更新订单的领用数量
+ */
+ @Override
+ public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+ }
}
--
Gitblit v1.9.2