Merge remote-tracking branch 'origin/master'

李宇

2021-01-18 bbcef869002175b9b12583cc9d7b64d45f0f3bda

Merge remote-tracking branch 'origin/master'

 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);