From 4e432dcc72c9ad5e95c34c7be172c142ca349c12 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 11:02:49 +0800
Subject: [PATCH] 修改 子单已入库 父单已入库

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |    4 ++--
 1 files changed, 2 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..90690cd 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -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);

--
Gitblit v1.9.2