ad

app/admin/controller/Consult.php

@@ -724,10 +724,21 @@ class Consult extends Base
         $expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day']) :"";
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!=""? trim($this->post['origin_place']):"";
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""? trim($this->post['supplierNo']):"";
+        $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+         $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']):'';
+	        $cgd_supplier_name='';
         $user= \app\admin\common\User::getIns();
-        $supplier =$user->handle("getCodeAndName",["code"=>$supplierNo]);
-
+        $supplier =$user->handle("getCodeAndName",["code"=>[$supplierNo,$cgd_supplier_code]]);
         $supplierName = isset($supplier['data'][$supplierNo])?$supplier['data'][$supplierNo]:"";
+          if(isset($supplier_account[$supplierNo])){
+	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
+	            if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
+	            if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
+		        $cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
+	        }
         $pay_way = isset($this->post['pay_way'])&&$this->post['pay_way']!=""? intval($this->post['pay_way']):"";
         $tax = isset($this->post['tax'])&&$this->post['tax']!=""? trim($this->post['tax']):"";
         $send_way = isset($this->post['send_way'])&&$this->post['send_way']!=""? intval($this->post['send_way']):"";
@@ -911,6 +922,11 @@ class Consult extends Base
             'delivery_place'=>$delivery_place,//发货地
             'cgder' => $supplier['person'] ?? '',
             'cgderid' => $supplier['personid'] ?? 0,
+	        'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+	        'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
+	        'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
+	        'cgd_apply_id'=>$cgd_apply_id,//竞单人
+	        'cgd_apply_name'=>$cgd_apply_name,//竞单人
         ];
         Db::startTrans();
         try{
@@ -1136,10 +1152,22 @@ class Consult extends Base
         $expire_day = isset($this->post['expire_day'])&&$this->post['expire_day']!=""? intval($this->post['expire_day']) :"";
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!=""? trim($this->post['origin_place']):"";
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=""? trim($this->post['supplierNo']):"";
+          $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+         $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']):'';
+	        $cgd_supplier_name='';
                 $user= \app\admin\common\User::getIns();
-        $supplier =$user->handle("getCodeAndName",["code"=>$supplierNo]);
+        $supplier =$user->handle("getCodeAndName",["code"=>[$supplierNo,$cgd_supplier_code]]);
 
         $supplierName = isset($supplier['data'][$supplierNo])?$supplier['data'][$supplierNo]:"";
+        if(isset($supplier_account[$supplierNo])){
+	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
+	            if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
+	            if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
+		        $cgd_supplier_name= $supplier['data'][$cgd_supplier_code]??'';
+	     }
         $pay_way = isset($this->post['pay_way'])&&$this->post['pay_way']!=""? intval($this->post['pay_way']):"";
         $tax = isset($this->post['tax'])&&$this->post['tax']!=""? trim($this->post['tax']):"";
         $send_way = isset($this->post['send_way'])&&$this->post['send_way']!=""? intval($this->post['send_way']):"0";
@@ -1255,7 +1283,12 @@ class Consult extends Base
                 "remark"=>$remark,
                 "status"=>0,
                 "updatetime"=>date("Y-m-d H:i:s"),
-                'delivery_place' => $delivery_place
+                'delivery_place' => $delivery_place,
+                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+		        'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
+		        'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
+		        'cgd_apply_id'=>$cgd_apply_id,//竞单人
+		        'cgd_apply_name'=>$cgd_apply_name,//竞单人
             ];
             $insert= Db::name("consult_bids")->where($bidinfo)->save($data);
             if($insert){

app/admin/controller/Goodup.php

@@ -490,7 +490,7 @@ class Goodup extends Base
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!=''? trim($this->post['supplierNo']):'';
         $supplierArr=[];
         $supplier=[];
-         $userCommon= \app\admin\common\User::getIns();
+        $userCommon= \app\admin\common\User::getIns();
   
 	        if($supplierNo==''){
 	            return error_show(1004,'参数supplierNo不能为空');
@@ -499,13 +499,23 @@ class Goodup extends Base
 	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
 			$supplierArr=$supplier_temp['data']??[];
 			$supplier=$supplierArr['child']??[];
-	
-	        if ($this->level == 2) {
-	            $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
-	            if (isset($supplier_account[$supplierNo])) return json_show(1004, '该供应商已开通账号，不允许操作');
+			$supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+			
+	        if ($this->level == 2 &&isset($supplier_account[$supplierNo]) ) {
+	            return json_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']):'';
+	        $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($cgd_supplier_code=="")return error_show(1004,'采购供应商信息不能为空');
+	            if($cgd_apply_id=="")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]??'';
 	        }
-    
-        
        
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']):"";
         if($good_size==''){
@@ -730,6 +740,11 @@ class Goodup extends Base
                 'is_combind'=>$isCombind,
                 'chargerid'=>$supplier['personid']??$createrid,
                 'charger'=>$supplier['person']??$creater,//负责人跟创建人一致
+                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+                'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
+                'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
+                'cgd_apply_id'=>$cgd_apply_id,//竞单人
+                'cgd_apply_name'=>$cgd_apply_name,//竞单人
             ];
             $in = Db::name("good_basic")->insertGetId($data);
             if($in){
@@ -899,7 +914,19 @@ class Goodup extends Base
 	        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) return error_show(1004,'供应商信息未找到');
 			$supplierArr=$supplier_temp['data']??[];
 			$supplier=$supplierArr['child']??[];
-     
+            $supplier_account = checkHasAccountBySupplierNos([$supplierNo]);
+	        $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']):'';
+	        $cgd_supplier_name='';
+	        if(isset($supplier_account[$supplierNo])){
+	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
+	            if($cgd_apply_id=='')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]??'';
+	        }
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");
@@ -1070,6 +1097,11 @@ class Goodup extends Base
                 'is_combind'=>$isCombind,
                 'chargerid' => $supplier['personid'] ?? $this->uid,
                 'charger' => $supplier['person'] ?? $this->uname,//负责人跟创建人一致
+                'supplier_origin_price'=>$supplier_origin_price,//供应商采购成本
+                'cgd_supplier_code'=>$cgd_supplier_code,//采购供应商编号
+                'cgd_supplier_name'=>$cgd_supplier_name,//采购供应商编号
+                'cgd_apply_id'=>$cgd_apply_id,//竞单人
+                'cgd_apply_name'=>$cgd_apply_name,//竞单人
             ];
             $field = array_diff_assoc($temp,$data);
             $temp['field_change'] =empty($field)?"":json_encode(array_keys($field));

app/admin/controller/Login.php

@@ -3,7 +3,6 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
-use app\admin\common\YouZan;
 use think\Request;
 
 class Login

app/admin/controller/Origin.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
-use app\admin\model\SaleOriginChange;use think\App;use think\facade\Validate;use think\Request;
+use app\admin\model\SaleOriginChange;use think\App;use think\facade\Cache;use think\facade\Validate;use think\Request;
 
 class Origin extends Base
 {
@@ -13,7 +13,10 @@ class Origin extends Base
     	parent::__construct($app);
     	$this->model=new SaleOriginChange();
     }
-    
+    /** 成本修改列表
+	* @return \think\response\Json|void
+	* @throws \think\db\exception\DbException
+	 */
     public function list(){
        $param =$this->request->only(['orderCode'=>'','companyNo'=>'',"size"=>15,"page"=>1],'post','trim');
        $where=[];

app/admin/controller/Sale.php

@@ -193,6 +193,11 @@ class Sale extends Base
             'send_way' => 2,
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
+             'supplier_origin_price'=>$goodinfo['supplier_origin_price'],//供应商采购成本
+	        'cgd_supplier_code'=>$goodinfo['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$goodinfo['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$goodinfo['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$goodinfo['cgd_apply_name'],//竞单人
         ];
         $addrlist = isset($this->post['addrlist']) && $this->post['addrlist'] !== "" ? $this->post['addrlist'] : "";
         $send_num = 0;
@@ -558,6 +563,11 @@ class Sale extends Base
             'good_createrid' => $data['good_createrid'],
             'good_creater' => $data['good_creater'],//商品创建人
             'from_tag' => isset($from_tag[$data['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
+            'supplier_origin_price'=>$data['supplier_origin_price'],//供应商采购成本
+	        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
         ];
         $up = Db::name("purchease_order")->insert($cg, true);
         if ($up) {
@@ -945,6 +955,11 @@ class Sale extends Base
             'send_way' => $zxinfo['send_way'],
             'good_createrid' => $zxinfo['createrid'],
             'good_creater' => $zxinfo['creater'],//商品创建人id
+            'supplier_origin_price'=>$zxinfo['supplier_origin_price'],//供应商采购成本
+	        'cgd_supplier_code'=>$zxinfo['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$zxinfo['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$zxinfo['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$zxinfo['cgd_apply_name'],//竞单人
         ];
         $rm = $this->uid;//isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
         $ri = $this->uname;//isset($apply_id["data"]['nickname']) ? $apply_id["data"]['nickname'] : "";
@@ -1535,6 +1550,11 @@ class Sale extends Base
             "send_way" => $goodinfo['send_way'],
             'good_createrid' => $goodinfo['createrid'],
             'good_creater' => $goodinfo['creater'],//商品创建人
+            'supplier_origin_price'=>$goodinfo['supplier_origin_price'],//供应商采购成本
+	        'cgd_supplier_code'=>$goodinfo['cgd_supplier_code'],//采购供应商编号
+	        'cgd_supplier_name'=>$goodinfo['cgd_supplier_name'],//采购供应商编号
+	        'cgd_apply_id'=>$goodinfo['cgd_apply_id'],//竞单人
+	        'cgd_apply_name'=>$goodinfo['cgd_apply_name'],//竞单人
         ];
         $datas = [
             "orderCode" => $orderCode,
@@ -1947,6 +1967,11 @@ class Sale extends Base
                 'send_way' => 2,
                 'good_createrid' => $good['createrid'],
                 'good_creater' => $good['creater'],//商品创建人
+                 'supplier_origin_price'=>$good['supplier_origin_price'],//供应商采购成本
+		        'cgd_supplier_code'=>$good['cgd_supplier_code'],//采购供应商编号
+		        'cgd_supplier_name'=>$good['cgd_supplier_name'],//采购供应商编号
+		        'cgd_apply_id'=>$good['cgd_apply_id'],//竞单人
+		        'cgd_apply_name'=>$good['cgd_apply_name'],//竞单人
             ];
             if ($good['is_stock'] == 0) {
                 $bol = $this->createCgd($cgd, $standing_book_data);

app/admin/controller/SaleReport.php

@@ -1680,7 +1680,7 @@ class SaleReport extends Base
 //        $names = $userCommon->handle('getCodeAndName', ['code' => array_column($data, 'customer_code')]);
 
         $all_uids = array_unique(array_merge(array_column($all_order_return, 'apply_id'), array_column
-        ($all_order_back, 'apply_id'), array_column($all_order_back, '部门')));
+        ($all_order_back, 'apply_id'), array_column($data, '部门')));
         $all_company = get_company_name_by_uid($all_uids);
 
         foreach ($data as $value) {
@@ -2420,8 +2420,9 @@ class SaleReport extends Base
             '' 下单月份,
             a.addtime")
             ->where($where)
+            ->where( "a.good_num-a.th_num > IFNULL((select sum(receipt_quantity) from wsm_order_addr where orderCode=a.orderCode and is_del=0),0) ")
             ->order("a.addtime desc")
-            ->cursor();
+            ->select();
 
         $list = [];
         $depart=[];

app/command/caixiao.php

@@ -45,7 +45,7 @@ class caixiao extends Command
             return true;
         }
         $this->hour=date('Y-m-d H:i:s',strtotime('-1 hours'));
-       $this->contect= Db::connect('mysql_cxinv');
+        $this->contect= Db::connect('mysql_cxinv');
         $this->table =$this->contect->name("caixiao_data");
         $this->sale();
         $this->cgd();

app/common.php

@@ -637,7 +637,7 @@ function upload_excel($files,$extend="xls")
  */
 function excelSave($fileName = '', $headArr = [], $data = [])
 {
-    $objPHPExcel = new PHPExcel();
+    $objPHPExcel =new PHPExcel();
     $objPHPExcel->getProperties();
     $keyA = 0; // 设置表头
     foreach ($headArr as $v) {