ad

app/admin/command/downredinvres.php

@@ -24,7 +24,7 @@ class downredinvres extends Command
     protected function execute(Input $input, Output $output)
     {
 		$GetOrderInfoAndInvoiceInfo= Cache::store("redis")->get("downredinvres");
-       if($GetOrderInfoAndInvoiceInfo==0) Cache::store("redis")->set("downredinvres",1,180);
+       if($GetOrderInfoAndInvoiceInfo==1) Cache::store("redis")->set("downredinvres",1,180);
         Db::startTrans();
         $date= date("Y-m-d H:i:s");
         $row =Db::name("invoice_red")->where(["status"=>1,"is_del"=>0])->where("updatetime","<=",date("Y-m-d H:i:s"))
@@ -40,7 +40,6 @@ class downredinvres extends Command
 		$Tax =new \TaxInvoice($invoice['appKey'],$invoice['appSecret'],$invoice['entCode']);
 		$pch= randomkeys(26).date("YmdHis");
 		$result=$Tax->DownloadRedInvoiceApplicationResult($row['SQBSCQQPCH'],$row['XHFSBH'],$row['FPLXDM'],$opendatetime,$opendatetime);
-		var_dump($result);
 		if(isset($result['ZTDM']) && $result['ZTDM']=='060000'){
 			if(isset($result['HZSQDXZZXX']) && !empty($result['HZSQDXZZXX'])){
 				foreach ($result['HZSQDXZZXX'] as $item){
@@ -61,7 +60,11 @@ class downredinvres extends Command
 					}
 				}
 			}
+		}else{
+			$data['remark']=$result['ZTXX'];
+			Db::name("invoice_red")->where($row)->update($data);
 		}
+
 		Db::commit();
 		$output->writeln("[$date] ".$row['invRed'].'发票申请表获取成功');
         }catch (\Exception $e){

app/admin/controller/Stat.php

@@ -108,26 +108,36 @@ class Stat extends BaseController{
 		                 ->where("year",date("Y",strtotime($post["daytime"])))
 		                 ->where("month",date("m",strtotime($post["daytime"])))
 						->where($where)
-		                 ->select();
-		if($depart_tips->isEmpty()){
+		                 ->column("*","companyNo");
+		if(empty($depart_tips)){
 			return error_show(1004,"未获取到各部门指标");
 		}
 		$return=[];
-		foreach ($depart_tips as $value){
+		$sort=["GS2302231125079621",'GS2302231323386950','GS2304031312553746','GS2302231124114965','GS2203161855277894'];
+		foreach ($sort as $value){
 			$temp=[];
-			$temp["companyName"] = $value['companyName'];
-			$temp["total_tips"] = $value['total_tips'];
-			$temp["dayinfo"] =Db::name("depart_company")
-		             ->where("day_time",date("Y-m-d",strtotime($post["daytime"])))
-						->where(["companyNo"=>$value['companyNo']])
-		             ->column("sale_total,th_total,type,companyNo");;
-			$temp["monthinfo"] =Db::name("depart_company")
-		               ->whereBetween("day_time",[date("Y-m-01",strtotime($post["daytime"])),date("Y-m-t",  strtotime($post["daytime"]))])
-		               ->where(["companyNo"=>$value['companyNo']])
-		               ->group("companyNo,type")
-		               ->column("sum(sale_total) as msale_total,sum(th_total) as mth_total,companyNo,type");
-			$return[]=$temp;
+			if(isset($depart_tips[$value])){
+				$temp["companyName"] = $depart_tips[$value]['companyName'];
+				$temp["total_tips"] = $depart_tips[$value]['total_tips'];
+				$temp["dayinfo"] =Db::name("depart_company")
+				                    ->where("day_time",date("Y-m-d",strtotime($post["daytime"])))
+				                    ->where(["companyNo"=>$value])
+				                    ->column("sale_total,th_total,type,companyNo");;
+				$temp["monthinfo"] =Db::name("depart_company")
+				                      ->whereBetween("day_time",[date("Y-m-01",strtotime($post["daytime"])),date("Y-m-t",  strtotime($post["daytime"]))])
+				                      ->where(["companyNo"=>$value])
+				                      ->group("companyNo,type")
+				                      ->column("sum(sale_total) as msale_total,sum(th_total) as mth_total,companyNo,type");
+				$return[]=$temp;
+			}
+
 		}
+		//1.北京百辰荣达国际科贸有限公司
+		//2.北京泓源广诚国际商贸有限公司
+		//3.北京锦兴弘昌科技有限公司
+		//4.北京普润心堂商贸有限公司
+		//5.北京万宇恒通国际科贸有限公司
+//		$sort=["GS2302231125079621",'GS2302231323386950','GS2304031312553746','GS2302231124114965','GS2203161855277894'];
 
 		return app_show(0,"获取成功",$return);
 	}

app/admin/route/app.php

@@ -112,7 +112,7 @@ Route::rule("redopen","admin/OrderInv/redOpen");
 Route::rule("redlist","admin/OrderInv/redList");
 Route::rule("orderticket","admin/OrderInv/ticketInfo");
 Route::rule("returnredlist","admin/OrderInv/returnRedList");
-
+Route::rule("ticketedit","admin/OrderInv/TicketEdit");
 Route::rule("orderpayadd","admin/OrderPay/create");
 Route::rule("orderpaystatus","admin/OrderPay/status");
 Route::rule("orderpaylist","admin/OrderPay/list");

app/command/Report.php

@@ -464,16 +464,17 @@ class Report extends Command
             b.costPrice 工艺费,
             b.deliveryPrice 物流费,
             b.goodPrice 采购单价合计,
-            (ifnull(b.totalPrice,a.total_origin_price)+ifnull(b.th_fee,0)) 采购总货款,
-            (a.totalPrice -ifnull(b.totalPrice,a.total_origin_price))  毛利润,
-            round((a.totalPrice -ifnull(b.totalPrice,a.total_origin_price))/a.totalPrice,2) 毛利率,
+            (ifnull(b.totalPrice,a.total_origin_price)+ifnull(b.th_fee,0)) 实际采购总货款,
+            0 毛利润,
+            0 毛利率,
             round(b.tax/100,2) 采购税点,
-            round(b.totalPrice/(1+ round(b.tax/100,2)),2) 不含税采购成本,
+            0 不含税采购成本,
             a.qrdType 库存性质,
             b.supplierName 供应商名称,
             b.sendType 发货方式,
             a.thNum 退货数量,
-            a.fundCode 财务核算编码')
+            a.fundCode 财务核算编码,
+             a.total_plan_price 预计采购总额')
 		          ->leftJoin('cgd_info b', 'b.sequenceNo=a.cgdNo and b.is_del=0')
 		          ->where($where)
 		          ->order(['a.id' => 'desc'])
@@ -548,7 +549,8 @@ class Report extends Command
             g.status 退票状态,
             g.return_type 退票方式,
             f.thNum 退货数量,
-            f.th_fee 退货金额            
+            f.th_fee 退货金额,
+            e.total_plan_price 预计采购总额         
             ')
 		          ->leftJoin('invoice_pool_info b', 'b.invNo=a.invNo')
 		          ->leftJoin('invoice_ticket c', 'c.invNo=a.invNo and c.type=0 and c.status in (0,1,2,3)')
@@ -891,7 +893,8 @@ class Report extends Command
 	'' as 付款方式,
 	b.fundCode 财务核算码,
 	a.th_remark 退货备注,
-	c.bkCode 备库单号
+	c.bkCode 备库单号,
+	round(a.th_num * (b.total_plan_price/b.goodNum),2) 预计采购总额
 		")->cursor();
 		foreach ($list as $value) {
 			$value['销售来源']= $this->qrdSource[$value['销售来源']]??"";

app/command/companyStats.php

@@ -25,7 +25,7 @@ class companyStats extends Command
 	    $sttime = Cache::get("compTips");
 	    if($sttime==1) return '';
 	    Cache::set("compTips",1,1800);
-      $supplier = ["GS2302231124114965","GS2302231125079621","GS2302231323386950",'GS2203161855277894'];
+      $supplier = ["GS2302231124114965","GS2302231125079621","GS2302231323386950",'GS2203161855277894',"GS2304031312553746"];
       try{
 	      foreach ($supplier as $sp){
 		      $this->checkData($sp);

app/command/handleCxData.php

@@ -44,9 +44,7 @@ class handleCxData extends command
 			    foreach ($results as $result) {
 				    $data=$result['data'] ?? [];
 				    $qrd_insert_data=$wait_insert_data=$cgd_insert_data=[];
-				    $data['cat_name']=is_array($data['cat_name']) ? $data['cat_name'] : json_decode($data['cat_name'] ,
-					    true
-				    );
+				    $data['cat_name']=is_array($data['cat_name']) ? $data['cat_name'] : json_decode($data['cat_name'],true);
 				    if ($result['order_type'] == 1) {
 					    $data['total_price']=$data['total_price'] - $data['th_fee'] - $data['diff_fee'];
 					    $exitReport=Db::name("report_code")->where('qrdNo' , $data['orderCode'])->findOrEmpty();
@@ -125,6 +123,7 @@ class handleCxData extends command
 									          'goodPrice'=>$data['sale_price'] ,//产品单价,
 									          'totalPrice'=>$data['total_price'] ,//货款总额,
 									          'total_origin_price'=>$data['total_origin_price'] ,//成本总额,
+									          'total_plan_price'=>$data['total_origin_price_plan'] ,//成本总额,
 									          'sendNum'=>$data['send_num'] ,//已发货数量,
 									          'wsendNum'=>$data['wsend_num'] ,//未发货数量,
 									          'apay_fee'=>0 ,//已付款,
@@ -167,6 +166,36 @@ class handleCxData extends command
 								    "orderCode"=>$data['orderCode'] ,
 								    "status"=>1 ,
 							    ];
+							    $re=Db::name('qrd_info')
+							          ->where('id' , $exists_qrd['id'])
+							          ->update([
+									          'poCode'=>$data['poNo'] ,//po编号,
+									          'workCode'=>$data['workNo'] ,//业务编号,
+									          'zxCode'=>$data['zxNo'] ,//咨询单编号,
+									          'goodMaterial'=>'' ,//商品材质,
+									          'goodUnit'=>$data['unit'] ,//商品单位,
+									          'goodDesc'=>$data['cost_desc'] ,//工艺说明,
+									          'goodType'=>$data['good_type'] ,//商品类型,
+									          'goodModel'=>'' ,//商品型号,
+									          'metalsType'=>$data['noble_metal'] ,//贵金属种类,
+									          'weight'=>$data['good_weight'] ,//商品重量,
+									          'deliveryDay'=>$data['delivery_day'] ,//物流天数,
+									          'workDay'=>$data['lead_time'] ,//工期,
+									          'tax'=>$data['tax'] ,//税率,
+									          'total_origin_price'=>$data['total_origin_price'] ,//成本总额,
+									          'total_plan_price'=>$data['total_origin_price_plan'] ,//成本总额,
+									          'sendNum'=>$data['send_num'] ,//已发货数量,
+									          'wsendNum'=>$data['wsend_num'] ,//未发货数量,
+									          'sendType'=>$data['send_type'] ,//发货方式
+									          'sendStatus'=>$data['send_status'] ,//发货状态,
+									          'remark'=>"" ,//备注,
+									          'area'=>$data['customer_name'] ,//公司,
+									          'customerAttr'=>$all_branch[$data['customer_code']]['parent'] ?? '' ,//客户属性,
+									          'branch'=>$all_branch[$data['customer_code']]['branch'] ?? '' ,//分公司,从客户表中查
+									          'pay_source'=>$data['pay_source'] ?? "" ,//支付渠道,
+									          'updatetime'=>$date
+								          ]
+							          );
 						    }
 
 					    } else {
@@ -213,6 +242,7 @@ class handleCxData extends command
 							    'goodPrice'=>$data['sale_price'] ,//产品单价,
 							    'totalPrice'=>$data['total_price'] ,//货款总额,
 							    'total_origin_price'=>$data['total_origin_price'] ,//成本总额,
+							    'total_plan_price'=>$data['total_origin_price_plan'] ,//成本总额,
 							    'sendNum'=>$data['send_num'] ,//已发货数量,
 							    'wsendNum'=>$data['wsend_num'] ,//未发货数量,
 							    'apay_fee'=>0 ,//已付款,
@@ -356,6 +386,43 @@ class handleCxData extends command
 								    "status"=>1 ,
 							    ];
 
+							    Db::name('cgd_info')
+							      ->where('id' , $exists_cgd['id'])
+							      ->update([
+									      'bkCode'=>$data['bkcode'] ,//备库单编号',
+									      'qrdCode'=>$data['qrdNo'] ,//确认单编号',
+									      'goodType'=>$data['good_type'] ,//商品类型',
+									      'goodBrand'=>$data['brand'] ,//商品品牌',
+									      'goodModel'=>'' ,//商品型号',
+									      'goodMaterial'=>'' ,//商品材质',
+									      'goodUnit'=>$data['unit'] ,//商品单位',
+									      'goodDesc'=>$data['cost_desc'] ,//工艺说明',
+									      'metalsType'=>$data['noble_metal'] ,//贵金属种类',
+									      'weight'=>$data['weight'] ,//商品重量',
+									      'is_diff'=>$data['is_diff'] ,//是否有工差',
+									      'deliveryDay'=>$data['delivery_day'] ,//物流天数',
+									      'workDay'=>$data['lead_time'] ,//产品工期',
+									      'tax'=>$data['tax'] ,//税点',
+									      'barePrice'=>$data['nake_fee'] ,//裸价',
+									      'markPrice'=>$data['mark_fee'] ,//加标费',
+									      'packPrice'=>$data['pakage_fee'] ,//包装费',
+									      'certPrice'=>$data['cert_fee'] ,//证书费',
+									      'openPrice'=>$data['open_fee'] ,//开模费',
+									      'costPrice'=>$data['teach_fee'] ,//工艺费',
+									      'deliveryPrice'=>$data['delivery_fee'] ,//物流费',
+									      'sendType'=>$data['send_type'] ,//发货方式',
+									      'bkCreater'=>$data['bkcreater'] ,//备库申请人',
+									      'sendStatus'=>$data['send_status'] ,//发货状态',
+									      'wsendNum'=>$data['wsend_num'] ,//未发货数量',
+									      'sendNum'=>$data['send_num'] ,//已发货数量',
+									      'wareHouse'=>$data['wsm_code'] ,//仓库名称',
+									      'wsmCode'=>$data['wsm_code'] ,//仓库编号',
+									      'remark'=>'' ,//备注',
+									      'cxCode'=>$data['oldCode'] ?? "" ,//备注,
+									      'check_rate'=>'' ,//修正后的税率',
+									      'updatetime'=>$date ,
+								      ]
+							      );
 						    }
 					    } else {
 						    //新增

app/command/stat.php

@@ -77,9 +77,9 @@ class stat extends Command
 		              ->sum(Db::raw('totalPrice+th_fee'));
 		$day_thtotal=Db::name("th_source")->alias("a")
 		               ->leftJoin("qrd_info b","a.th_qrdNo=b.sequenceNo or a.th_qrdNo=b.cxCode")
-		               ->where([["b.ownerid","in",$uid],['a.th_companyNo',"=",$companyNo]])
+		               ->where([["b.ownerid","in",$uid],['b.companyNo',"=",$companyNo]])
 		               ->where($where)
-		               ->whereDay("a.createtime",$date)->sum('a.th_qrd_fee');
+		               ->whereDay("a.createtime",$date)->sum(Db::raw('a.th_num*b.goodPrice'));
 		return ["sale_total"=>$day_total,"th_total"=>$day_thtotal];
 	}
 

extend/TaxInvoice.php

@@ -156,7 +156,8 @@ class TaxInvoice {
         $token = Cache::get("TAXToken");
         if($token==false || $refresh==1){
             $result=$this->auth();
-            if(key_exists("access_token",$result)){
+             \think\facade\Log::info("参数:".json_encode($result,JSON_UNESCAPED_UNICODE));
+            if(key_exists("access_token",$result) && $result['access_token']!=''){
                 Cache::set("TAXToken",$result['access_token'],$result['expires_in']);
                 $token=$result['access_token'];
             }