Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_digikey_20200424

app/Http/Controllers/AddOrderController.php

@@ -815,6 +815,16 @@ Class AddOrderController extends Controller
                     }
                 }
 
+                if ($type == 1 && $val['goods_price'] <= 0) {
+                    $err[] = '第'.$key.'行，商品单价等于或小于0';
+                    return;
+                }
+
+                if ($val['num'] <= 0) {
+                    $err[] = '第'.$key.'行，商品数量等于或小于0';
+                    return;
+                }
+                    
                 foreach ($val as $k=>$v) {
                     if (in_array($k, $required_keys)) {
                         if (empty($v)) { // 若必填项值为空，返回提示信息