From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 01 Feb 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index b056160..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;
@@ -526,12 +530,15 @@
}
@Override
- public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName) {
+ public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
params.put("personName", personName);
params.put("userId",id);
+ params.put("productSn",productSn);
+ params.put("applyCode",applyCode);
+ params.put("status",status);
return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -541,7 +548,7 @@
}
@Override
public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize) {
+ Integer pageSize,String productSn,String applyCode,Integer status) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("reagentName", reagentName);
@@ -549,6 +556,9 @@
params.put("userId",id);
params.put("first", first);
params.put("pageSize", pageSize);
+ params.put("productSn",productSn);
+ params.put("applyCode",applyCode);
+ params.put("status",status);
return this.opeApplyDao.getOpeApplyReserveListFor(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
@@ -687,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);
@@ -701,5 +711,12 @@
}
}
+ /**
+ * 补贴条码更新订单的领用数量
+ */
+ @Override
+ public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+ }
}
--
Gitblit v1.9.2