wugg 2 years ago
parent
commit
06afdd88a1
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/admin/controller/Reorder.php
  2. 1 1
      app/admin/controller/Sale.php

+ 2 - 2
app/admin/controller/Reorder.php

@@ -835,8 +835,8 @@ class Reorder extends Base
                             }
                             $lor=$cgd['status'];
                             if($cgd['wsend_num']<$info['num']){
-                                $cgd['wsend_num']=0;
-                                $cgd['send_num'] += $info['num']-$cgd['wsend_num'];
+                                $cgd['send_num'] += $cgd['wsend_num']==0?0 :($info['num']-$cgd['wsend_num']);
+                                 $cgd['wsend_num']=0;
                             }else{
                                 $cgd['wsend_num'] -= $info['num'];
                                 $cgd['send_num'] += $info['num'];

+ 1 - 1
app/admin/controller/Sale.php

@@ -843,7 +843,7 @@ class Sale extends Base
         if($companyNo==""){
             return error_show(1003,"参数 companyNo 不能为空");
         }
-        $company = Db::name("bussiness")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
+        $company = Db::name("business")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
         if($company==false){
              return error_show(1003,"业务公司数据未找到");
         }