From 3133c40cf7f5467db6c172b436f509c85e096eff Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 15:30:48 +0800
Subject: [PATCH] 修改仓库领用模块：补贴条码入库显示人员信息
---
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 15 +++++++++++----
1 files changed, 11 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 08482d6..2100151 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -678,12 +678,12 @@
if (codeList == null){
//无条码入库 不需要增加状态和流向
//1.1库存表增加
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
}else{
//条码入库
assert codeList.size() > 0;
//1.1入库(库存表增加)
- opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+ opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
//1.2试剂状态表增加,流向增加
opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
}
@@ -693,12 +693,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 +707,12 @@
}
}
+ /**
+ * 补贴条码更新订单的领用数量
+ */
+ @Override
+ public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+ }
}
--
Gitblit v1.9.2