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

app/admin/controller/Sale.php

@@ -4743,7 +4743,7 @@ class Sale extends Base
 		                      return error_show(1004,"库存bn库存数更新失败");
 		                 }
                 	}else{
-                	$stokc = Db::name("good_stock")->where(['spuCode' => $einfo['good_code'], "wsm_code" => $order_out_infos[$value['outCode']]['wsm_code'], "is_del" => 0])->find();
+                	$stokc = Db::name("good_stock")->where(['spuCode' =>$sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['good_code'], "wsm_code" => $order_out_infos[$value['outCode']]['wsm_code'], "is_del" => 0])->find();
 		                if ($stokc == false) {
 		                    Db::rollback();
 		                    return error_show(1002, "未找到库存数据");