Browse Source

Merge branch 'wugg-dev' of wugg/phpstock into version1.5

wugg 2 years ago
parent
commit
a7d8fc1545
1 changed files with 20 additions and 10 deletions
  1. 20 10
      app/admin/controller/Reorder.php

+ 20 - 10
app/admin/controller/Reorder.php

@@ -848,19 +848,29 @@ class Reorder extends Base
                                 Db::rollback();
                                 return error_show(1005, '商品仓库未找到');
                             }
-                            if($stock['usable_stock']+$stock['wait_out_stock']<$info['num']){
-                                Db::rollback();
-                                return error_show(1005, '商品可用库存不足退回数量');
+                            if($info['is_all']==1){
+	                            if($stock['wait_in_stock']<$info['num']){
+	                                Db::rollback();
+	                                return error_show(1005, '商品可用库存不足退回数量');
+	                            }else{
+	                                    $stock['wait_in_stock']-= $info['num'];
+	                            }
                             }else{
+	                                if($stock['usable_stock']+$stock['wait_out_stock']<$info['num']){
+	                                Db::rollback();
+	                                return error_show(1005, '商品可用库存不足退回数量');
+	                            }else{
 
-                                if($stock['usable_stock']>$info['num']){
-                                    $stock['usable_stock'] -= $info['num'];
-                                }else{
-                                    $stock['usable_stock'] = 0;
-                                    $stock['wait_out_stock']-= $info['num']- $stock['usable_stock'] ;
-                                }
-                                $stock['total_stock']= $stock['usable_stock']+ $stock['wait_out_stock'];
+	                                if($stock['usable_stock']>$info['num']){
+	                                    $stock['usable_stock'] -= $info['num'];
+	                                }else{
+	                                    $stock['usable_stock'] = 0;
+	                                    $stock['wait_out_stock']-= $info['num']- $stock['usable_stock'] ;
+	                                }
+	                                $stock['total_stock']= $stock['usable_stock']+ $stock['wait_out_stock'];
+	                            }
                             }
+
                             $stock['updatetime'] = date("Y-m-d H:i:s");
                             $st_up = Db::name("good_stock")->save($stock);
                             if ($st_up == false) {