Bladeren bron

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 jaren geleden
bovenliggende
commit
bad6c72f57
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 2
      app/abutment/controller/Sale.php

+ 2 - 2
app/abutment/controller/Sale.php

@@ -368,7 +368,7 @@ class Sale extends BaseController
                 ['a.outCode', 'in', array_column($param['list'], 'outCode')],
                 ['c.supplierNo', '<>', $this->request->user['supplierNo']]
             ])->column('a.outCode');
-        if (!empty($temp)) return json_show(1003, '不允许处理其他供应商的单子' , $temp);
+        if (!empty($temp)) return json_show(1003, '不允许处理其他供应商的单子', $temp);
 
 //        $user = GetUserInfo($param['token']);
         $createrid = $this->request->user['uid'];
@@ -376,9 +376,9 @@ class Sale extends BaseController
 
         //所有发货单信息
         $order_out_infos = Db::name("order_out")
-            ->where('status', 1)
             ->where('is_del', 0)
             ->whereIn('outCode', array_column($param['list'], 'outCode'))
+            ->whereIn('status', [0, 1])
             ->column('id,status,send_num,orderCode,wsm_code,apply_id,apply_name', 'outCode');
 
         //处理数据