Merge branch 'zjl_commit_20200526'

app/Http/Controllers/OrderController.php

@@ -2077,6 +2077,8 @@ Class OrderController extends Controller
         
         
         //循环订单详情
         //循环订单详情
         foreach ($info['order_items_info'] as $key => $value) {   
         foreach ($info['order_items_info'] as $key => $value) {   
+            if ($value['status'] == -1) continue;
+
             if(empty($value['batch'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少批次<br/>'.'请填写批次后再发送'];
             if(empty($value['batch'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少批次<br/>'.'请填写批次后再发送'];
             if(empty($value['buyerName'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少采购人员<br/>'.'请填写采购后再发送'];
             if(empty($value['buyerName'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少采购人员<br/>'.'请填写采购后再发送'];