ad

app/admin/command/GenerrateInvoice.php

@@ -24,7 +24,8 @@ class GenerrateInvoice extends Command
     protected function execute(Input $input, Output $output)
     {
     	$generrateinvoice= Cache::store("redis")->get("generrateinvoice");
-	    if($generrateinvoice==0) Cache::store("redis")->set("generrateinvoiceo",1,180);
+	    if($generrateinvoice==1) return '';
+	    	Cache::store("redis")->set("generrateinvoiceo",1,180);
 	  	    Db::startTrans();
         // 指令输出
         try {
@@ -97,7 +98,7 @@ class GenerrateInvoice extends Command
 
 			if(isset($result['ZTDM'])&&$result['ZTDM']=='010000'){
 				Db::name("invoice_interface")->where(['DDQQPCH'=>$result['DDQQPCH']])->update(['status'=>1,
-				"remark"=>$result['ZTXX'],"updatetime"=>date("Y-m-d H:i:s")]);
+				"remark"=>$result['ZTXX'],"updatetime"=>date("Y-m-d H:i:s",time()+60)]);
 			}else{
 				Db::name("invoice_interface")->where(['DDQQPCH'=>$value['DDPCXX']['DDQQPCH']])->update(['status'=>4,"remark"=>$result['ZTXX']??$result['message'],"updatetime"=>date("Y-m-d H:i:s")]);
 			}

app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -25,7 +25,8 @@ class GetOrderInfoAndInvoiceInfo extends Command
     {
         // 指令输出
        $GetOrderInfoAndInvoiceInfo= Cache::store("redis")->get("GetOrderInfoAndInvoiceInfo");
-       if($GetOrderInfoAndInvoiceInfo==0) Cache::store("redis")->set("GetOrderInfoAndInvoiceInfo",1,180);
+       if($GetOrderInfoAndInvoiceInfo==1) return '';
+       	Cache::store("redis")->set("GetOrderInfoAndInvoiceInfo",1,180);
 	    Db::startTrans();
 		try{
 			$data = $this->GetData();

app/admin/command/QueryInvalidInvoice.php

@@ -23,7 +23,8 @@ class QueryInvalidInvoice extends Command
     protected function execute(Input $input, Output $output)
     {
 		$generrateinvoice= Cache::store("redis")->get("queryinvalidinvoice");
-	    if($generrateinvoice==0) Cache::store("redis")->set("queryinvalidinvoice",1,180);
+	    if($generrateinvoice==1) return '';
+	    	Cache::store("redis")->set("queryinvalidinvoice",1,180);
     	$date=date("Y-m-d H:i:s");
     	Db::startTrans();
     	try{

app/command/CopySupplier.php

@@ -13,6 +13,13 @@ use think\facade\Db;
 
 class CopySupplier extends Command
 {
+	private $_delaway=["供应商发货","公司自提"];
+	private $_applyway=["正式供应商","临时供应商"];
+	private $_source=["客户提供","供应商","公司开发"];
+	private $_cat=["生产厂家","代理商","经销商","分销商","电商平台"];
+	private $_level=["生产厂家","一级代理","二级代理"];
+	private $_payway=["现结","月清","双月请"];
+	private $_catpay=["个人独私企业","合伙企业","有限责任公司","供应商","股份有限责任公司","有限责任公司（自然人独资）","有限责任公司（自然人独资或控股）","村级集体经济组织","股份有限公司"];
     protected function configure()
     {
         // 指令配置
@@ -24,6 +31,7 @@ class CopySupplier extends Command
     {
 		$supplier= Cache::store("redis")->handler()->rpop("companycopy");
 		if($supplier==false) return;
+		$supplier =json_decode($supplier,true);
 		if($supplier['type']==1){
 			$this->checkcompany($supplier);
 		}
@@ -104,31 +112,32 @@ class CopySupplier extends Command
     }
 
      private function checkSupplier($supplier){
-		$comp= Db::name("supplier_info")->where(["companyNo"=>$supplier["companyNo"],"is_del"=>0])->findOrEmpty();
+		$comp= Db::name("supplier_info")->where(["code"=>$supplier["code"]])->findOrEmpty();
+		var_dump($supplier);
 		if(empty($comp)){
 			$data= [
 				            'name' => $supplier['name'],
                             'code' => $supplier['code'],
-                            'source' => $supplier['source'],
+                            'source' => $this->_source[$supplier['source']]??$this->_source[0],
                             'contector' => $supplier['contactor'],
                             'post' => $supplier['position'],
-                            'type' => $supplier['type'],
-                            'nature' => $supplier['supplier_type'],
+                            'type' => 1,
+                            'nature' =>  $supplier['nature'],
                             'corporation' => $supplier['legaler'],
                             'registertime' => $supplier['registertime'],
-                            'capital' => $supplier['capital'],
-                            'supplier_type' => $supplier['supplier_type'],
-                            'pay_method' => $supplier['pay_type'],
+                            'capital' => $supplier['capital']??"",
+                            'supplier_type' => $this->_cat[$supplier['supplier_type']]??"",
+                            'pay_method' => $this->_payway[$supplier['pay_type']],
                             'paydays' => $supplier['pay_day'],
                             'mobile' => $supplier['mobile'],
                             'address' => $supplier['addr'],
                             'return_ticket' => $supplier['ticket_type'],
-                            'delivery' => $supplier['delivery_way'],
+                            'delivery' => $this->_delaway[$supplier['delivery_way']]??"",
                             'status' => $supplier['status'],
                             'addtime' => $supplier['addtime'],
                             'updatetime' => $supplier['updatetime'],
                             'registercode' => $supplier['registercode'],
-                            'level' => $supplier['level'],
+                            'level' => $this->_level[$supplier['level']]??"",
                             'product_category' => $supplier['product_category'],
                             'license_img' => $supplier['license_img']
 
@@ -136,29 +145,27 @@ class CopySupplier extends Command
 		}else{
 			$datas = [
 	                        'name' => $supplier['name'],
-                            'code' => $supplier['code'],
                             'source' => $supplier['source'],
                             'contector' => $supplier['contactor'],
                             'post' => $supplier['position'],
-                            'type' => $supplier['type'],
-                            'nature' => $supplier['supplier_type'],
+
+                            'nature' =>  $supplier['nature'],
                             'corporation' => $supplier['legaler'],
                             'registertime' => $supplier['registertime'],
-                            'capital' => $supplier['capital'],
-                            'supplier_type' => $supplier['supplier_type'],
-                            'pay_method' => $supplier['pay_type'],
-                            'paydays' => $supplier['pay_day'],
+                            'capital' => $supplier['capital']??"",
+							'supplier_type' => $this->_cat[$supplier['supplier_type']]??"",
+							'pay_method' => $this->_payway[$supplier['pay_type']],
+                            'paydays' => $supplier['pay_day']??"0",
                             'mobile' => $supplier['mobile'],
                             'address' => $supplier['addr'],
                             'return_ticket' => $supplier['ticket_type'],
-                            'delivery' => $supplier['delivery_way'],
+							'delivery' => $this->_delaway[$supplier['delivery_way']]??"",
                             'status' => $supplier['status'],
                             'addtime' => $supplier['addtime'],
                             'updatetime' => $supplier['updatetime'],
                             'registercode' => $supplier['registercode'],
-                            'level' => $supplier['level'],
+							'level' => $this->_level[$supplier['level']]??"",
                             'product_category' => $supplier['product_category'],
-                            'license_img' => $supplier['license_img']
 
              ];
 			$data=array_merge($comp,$datas);

app/command/Report.php

@@ -477,7 +477,7 @@ class Report extends Command
              a.total_plan_price 预计采购总额')
 		          ->leftJoin('cgd_info b', 'b.sequenceNo=a.cgdNo and b.is_del=0')
 		          ->where($where)
-		          ->order(['a.id' => 'desc'])
+		          ->order(['a.id' => 'asc'])
 		          ->cursor();
 
 		$list = [];
@@ -486,9 +486,9 @@ class Report extends Command
 			$value['订单来源'] = $this->qrdSource[$value['订单来源']] ?? '';
 			$value['库存性质'] = $this->qrdType[$value['库存性质']] ?? '';
 			$value['发货方式'] = $this->sendType[$value['发货方式']] ?? '';
-			$value['毛利润'] = round(bcsub($value['销售总额'], $value['采购总货款'], 3), 2);
-			$value['毛利率'] = $value['销售总额'] == 0 ? 0 : round(bcmul(bcsub(1, bcdiv($value['采购总货款'], $value['销售总额'], 5),5), 100,2), 2) . '%';
-			$value['不含税采购成本'] = round(bcdiv($value['采购总货款'], bcadd(1,$value['采购税点'],3), 3), 2);
+			$value['毛利润'] = round(bcsub($value['销售总额'], $value['实际采购总货款'], 3), 2);
+			$value['毛利率'] = $value['销售总额'] == 0 ? 0 : round(bcmul(bcsub(1, bcdiv($value['实际采购总货款'], $value['销售总额'], 5),5), 100,2), 2) . '%';
+			$value['不含税采购成本'] = round(bcdiv($value['实际采购总货款'], bcadd(1,$value['采购税点'],3), 3), 2);
 
 			yield $value;
 		}
@@ -892,9 +892,9 @@ class Report extends Command
 	if(a.is_th=1,'是','否') 供应商是否同意退货,
 	'' as 付款方式,
 	b.fundCode 财务核算码,
+	round(a.th_num * (b.total_plan_price/b.goodNum),2) 预计采购总额,
 	a.th_remark 退货备注,
-	c.bkCode 备库单号,
-	round(a.th_num * (b.total_plan_price/b.goodNum),2) 预计采购总额
+	c.bkCode 备库单号
 		")->cursor();
 		foreach ($list as $value) {
 			$value['销售来源']= $this->qrdSource[$value['销售来源']]??"";

app/command/companyStats.php

@@ -113,7 +113,7 @@ class companyStats extends Command
 		->whereDay("createdTime",$date)
 		->field("sum(totalPrice+th_fee) as total")->findOrEmpty();
 		$day_thtotal=Db::name("th_source")->alias("a")
-		 ->leftJoin("cgd_info b","(a.th_cgdNo=b.sequenceNo and a.is_th=1) or (a.th_qrdNo=b.cxCode)")
+		 ->leftJoin("cgd_info b","(a.th_cgdNo=b.sequenceNo and a.is_th=1)")
 		 ->where([['b.supplierNo',"=",$sup],["b.is_del","=",0]])
 		 ->whereDay("a.createtime",$date)
 	    ->field("sum(a.th_num*b.goodPrice) as th_total")->findOrEmpty();