Merge branch 'zjl_shipping_20201201'

app/Http/Controllers/OrderController.php

@@ -2188,7 +2188,7 @@ Class OrderController extends Controller
         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($value['order_goods_type'] == 1 && empty($value['batch'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少批次<br/>'.'请填写批次后再发送'];
             if(empty($value['buyerName'])) return ['errcode'=>-1,'errmsg'=>'商品:'.$value['goods_name'].'缺少采购人员<br/>'.'请填写采购后再发送'];
 
             $tmp = [];