ad

app/admin/controller/Goodup.php

@@ -888,12 +888,12 @@ class Goodup extends Base
 	        $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']):'';
-	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
+//	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
 	        $cgd_supplier_name='';
-	        if(isset($supplier_account[$supplierNo])){
+	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
 	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
-	            if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
+//	            if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
 		          $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
 	        }
@@ -1067,7 +1067,7 @@ class Goodup extends Base
                 'is_combind'=>$isCombind,
                 'chargerid' => $supplier['personid'] ?? $this->uid,
                 'charger' => $supplier['person'] ?? $this->uname,//负责人跟创建人一致
-                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+//                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
                 'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
                 'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
                 'cgd_apply_id'=>$cgd_apply_id,//竞单人

app/command/ExecByRelaComNoHandle.php

@@ -117,7 +117,7 @@ class ExecByRelaComNoHandle extends Command
                         'expiretime' => date('Y-m-d H:i:s', strtotime('+7 day')),
                         'remark' => ''
                     ]);
-            } //else  $output->writeln('没有可供处理的报表预约记录');
+            }
 
         } catch (Exception $exception) {
             Db::name('exec_rela_com_no')