ad

app/admin/controller/Consult.php

@@ -1192,8 +1192,9 @@ class Consult extends Base
         if($delivery_place==''){
             return error_show(1002,"参数delivery_place不能为空");
         }
-        $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
+//        $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
+
+	    $budget = get_budget($cat_id,$zx['companyNo'],$zx['platform_code']);
 
         $sale_cost_fee = $bidinfo['sale_cost_fee'];
 

app/admin/controller/Keepbrand.php

@@ -175,9 +175,9 @@ class Keepbrand extends Base
             return error_show(1002,"未找到数据");
         }
         $brand_book = isset($this->post['brand_book']) && $this->post['brand_book'] !=="" ? trim($this->post['brand_book']):"";
-        if($brand_book==""){
-            return error_show(1002,"参数brand_book不能为空");
-        }
+//        if($brand_book==""){
+//            return error_show(1002,"参数brand_book不能为空");
+//        }
 //        $gyscode = isset($this->post['gyscode']) && $this->post['gyscode'] !== "" ? trim($this->post['gyscode']):"";
 //        if($gyscode==""){
 //            return error_show(1002,"参数gyscode不能为空");

app/admin/controller/Reorder.php

@@ -502,7 +502,7 @@ class Reorder extends Base
         $page = $total>=$page ? $page :$total;
         $list = Db::name("sale_return")
             ->alias('sr')
-            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num ')
+            ->field('sr.*,b.skuCode,b.sale_price,b.good_num total_num,b.customer_code,b.supplierNo ')
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})
@@ -514,6 +514,8 @@ class Reorder extends Base
 
         $all_createrid = array_column($list,'apply_id');
         $item = get_company_name_by_uid($all_createrid);
+		 $userCommon = new \app\admin\common\User();
+        $names = $userCommon->handle('getCodeAndName',['code'=>array_merge(array_column($list,'supplierNo'),array_column($list,'customer_code'))]);
 
         $data=[];
         foreach ($list as $value){
@@ -527,7 +529,8 @@ class Reorder extends Base
             $value['return_total'] =$value['sale_price']*$value['num'] ;
 //            $value['total_num'] =$order['good_num'] ;
             $value['company_name'] = $item[$value['apply_id']]??'';
-
+			$value['supplierName'] = $names['data'][$value['supplierNo']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
+            $value['customerName'] = $names['data'][$value['customer_code']] ?? '';//isset($wsm['company']) ? $wsm['company'] : "";
             //是否具有编辑权限
 //            $value['is_allow_update'] = 0;
 //            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;

app/admin/controller/Resign.php

@@ -126,17 +126,17 @@ class Resign extends Base
         $all_createrid = array_column($list,'apply_id');
         $item = get_company_name_by_uid($all_createrid);
         $userCommon = new \app\admin\common\User();
+        $wsmCodes = array_column($list,'wsm_code');
+        $wsmcode = Db::name("warehouse_info")->alias("a")
+                    ->where(["a.wsm_code"=>$wsmCodes])->column("a.name as wsm_name,a.supplierNo as code","wsm_code");
+		$names = $userCommon->handle('getCodeAndName', ['code' =>array_merge(array_column($wsmcode,"code"),array_column($list,"companyNo"),array_column($list,"supplierNo"))]);
+		$wsmsupplier = $names['data']??[];
         foreach ($list as $value){
-            $value['wsm_name']="";
-            $value['wsm_supplier']="";
-            $value['wsm_supplierNo']="";
-            if($value['wsm_code']!=""){
-	            $wsmcode = Db::name("warehouse_info")->where(["wsm_code"=>$value['wsm_code']])->field("name as wsm_name,supplierNo")->find();
-				$tmpd = $userCommon->handle('getCodeAndName', ['code' =>$wsmcode['supplierNo']]);
-	            $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-	            $value['wsm_supplier'] =$tmpd['data'][$wsmcode['supplierNo']]??"";
-	            $value['wsm_supplierNo'] =$wsmcode['supplierNo']??"";
-            }
+            $value['wsm_name'] =isset($wsmcode[$value['wsm_code']]['wsm_name']) ? $wsmcode[$value['wsm_code']]['wsm_name']:"";
+            $value['wsm_supplier'] =$wsmsupplier[$wsmcode[$value['wsm_code']]['code']]??"";
+            $value['wsm_supplierNo'] =$wsmcode[$value['wsm_code']]['code']??"";
+            $value['companyName'] = $wsmsupplier[$value['companyNo']]??"";
+            $value['supplierName'] = $wsmsupplier[$value['supplierNo']]??"";
             $value['file_name'] ='';
             if($value['file_url']){
                 $file= basename($value['file_url']);

app/admin/controller/Sale.php

@@ -6,7 +6,8 @@ use app\abutment\model\SupplierRelationUser;
 use app\abutment\model\SupplierUser;
 use app\admin\model\DataGroup as DataGroupModel;
 use app\admin\model\GoodLog;
-use app\admin\model\GoodStockInfo;use app\admin\model\ProcessOrder;
+use app\admin\model\GoodStockInfo;
+use app\admin\model\ProcessOrder;
 use app\admin\model\SaleInfo;use Exception;
 use think\App;
 use think\facade\Cache;
@@ -2259,6 +2260,7 @@ class Sale extends Base
             ->alias('s')
             ->order("s.addtime desc")
             ->page($page, $size)
+            ->where($where)
             ->select()
             ->toArray();
         $all_createrid = array_column($list,'apply_id');