Ver Fonte

细节bug优化

wufeng há 2 anos atrás
pai
commit
1bc47363a3
2 ficheiros alterados com 3 adições e 3 exclusões
  1. 1 1
      app/admin/controller/Purch.php
  2. 2 2
      app/admin/model/OrderOutChild.php

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

@@ -1040,7 +1040,7 @@ class Purch extends Base
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ['a.apply_id', 'in', $role[DataGroupModel::$type_全部]];
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo != '') $where[] = ['b.companyNo', '=', $relaComNo];
+        if ($relaComNo != '') $where[] = ['a.companyNo', '=', $relaComNo];
 
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != '') $where[] = ['b.supplierNo', '=', $supplierNo];

+ 2 - 2
app/admin/model/OrderOutChild.php

@@ -18,10 +18,10 @@ class OrderOutChild extends Model
     static function makeChild(string $outCode=''){
     	if($outCode=='')throw new \Exception("分单发货单单号不能为空");
     	$out=self::name("order_out")->where(["outCode"=>$outCode,"is_del"=>0])->findOrEmpty();
-		if(empty($out)) throw new \Exception("发货单信息找到");
+		if(empty($out)) throw new \Exception("发货单信息找到");
 		if($out['send_status']!=0) throw new \Exception("发货单拆单状态有误");
 		$sale = self::name("sale")->where(["orderCode"=>$out['orderCode'],"is_del"=>0])->findOrEmpty();
-		if(empty($sale)) throw new \Exception("订单信息找到");
+		if(empty($sale)) throw new \Exception("订单信息找到");
 		if($sale['wsend_num']<$out['send_num']) throw new \Exception("订单待发货数量不足");
 		$num= $out['send_num'];
 		$wsmlist = self::name("good_stock")->alias("a")