ad

app/admin/controller/Goodup.php

@@ -2336,7 +2336,13 @@ class Goodup extends Base
 	            if (isset($supplier_account[$supplierNo])) return json_show(1004, '该供应商已开通账号，不允许操作');
 	            if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '原供应商已开通账号，不允许操作');
 	        }
-	
+		 $supplier_temp =$userCommon->handle('hqInfo',['code'=>$supplierNo]);
+		        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
+				$supplierArr=$supplier_temp['data']??[];
+				$supplier=$supplierArr['child']??[];
+				  if($supplierArr['relation_code']==$company_id){
+	                return error_show(1004,'业务公司与供应商属于同一家公司');
+	            }
 	        $cgd_supplier_code =  isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
 	        $cgd_apply_id =  isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
@@ -2347,13 +2353,7 @@ class Goodup extends Base
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
 		          $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
 	        }
-	        $supplier_temp =$userCommon->handle("hqInfo",["code"=>$supplierNo]);
-	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,"供应商信息未找到");
-			$supplierArr=$supplier_temp['data']??[];
-			$supplier=$supplierArr['child']??[];
-			  if($supplierArr['relation_code']==$company_id){
-        	    return error_show(1004,'业务公司与供应商属于同一家公司');
-            }
+	       
 
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
         if($good_size==''){
@@ -2609,7 +2609,7 @@ class Goodup extends Base
                         $lemp['mark_fee'] = $value['mark_fee'];
                         $lemp['package_fee'] = $value['package_fee'];
                         $lemp['other_fee'] = $value['other_fee'];
-
+						$lemp['supplier_origin_price'] = $value['supplier_origin_price'];
                         if ($is_gold_price == 1 && $top_cat_id == 6) {
                             $gold =Db::name("gold_price1")->where(["type"=>$noble_metal,"status"=>1,"is_del"=>0])->order("addtime desc")->find();
 

app/command/SplitSale.php

@@ -235,6 +235,9 @@ class SplitSale extends Command
             'is_diff' => $sale['is_diff'] ?? 0,
             'send_num' => $sale['send_num'] ?? 0,
             'wsend_num' => $sale['wsend_num'] ?? 0,
+            'workNo' => $sale['workNo'] ?? '',
+            'poNo' => $sale['platform_order'] ?? '',
+            'other_orderNo' => $sale['other_orderNo'],
             'th_num' => $sale['th_num'] ?? 0,
             'send_type' => $sale['send_type'] ?? 0,
             'gold_price' => $sale['gold_price'] ?? 0,