Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -58,6 +58,7 @@ class GetOrderInfoAndInvoiceInfo extends Command
 				}
 				if($value['status']==3 || $value['status']==4){
 					if($value['KPLX']==1){
+						$red=Db::name('invoice_red')->where(['invRed'=>$value['invNo'],'is_del'=>0])->find();
 						Db::name("invoice_red")->where(["invRed"=>$value['invNo'],"is_del"=>0])->update(["status"=>6,"remark"=>"红冲开票失败","updatetime"=>date("Y-m-d H:i:s")]);
 						Db::name("invoice_return")->where(["returnCode"=>$red['returnCode'],"status"=>1])->update(["status"=>4,"remark"=>"红冲开票失败","updatetime"=>date("Y-m-d H:i:s")]);
 					}else{

app/admin/command/downredinvres.php

@@ -76,7 +76,7 @@ class downredinvres extends Command
 			}
 		}else{
 			$data['remark']=$result['ZTXX'];
-			Db::name("invoice_red")->where($row)->update($data);
+			Db::name("invoice_red")->where(["id"=>$row['id']])->update($data);
 		}
 
 		Db::commit();

app/admin/controller/Payment.php

@@ -2136,18 +2136,18 @@ class Payment extends BaseController
 		excelExport("{$param['payNo']}对账采购单详情",array_keys($cgdlist[0]),$cgdlist);
 	}
 
-	/**校验供应商下面是否有操作账户
-	* @param $supplierNo 供应商账户
-	 * @return array
-	 */
-	private function checkSupplier($supplierNo){
-		        $companyinfo = UserHandle("/userCompanyBasicList", ["companyNo" =>$supplierNo]);
-                if ($companyinfo['code'] != 0) return ["code"=>$companyinfo['code'],"message"=> $companyinfo['message']];
-                if (!empty($companyinfo['data']) && $companyinfo['data']['count'] > 0) {
-                    return ["code"=>1004,"message"=> "供应商公司存在操作账户,请用供应商账户操作"];
-                }
-                else{
-                	  return ["code"=>0,"message"=> "业务账户可操作"];
-                }
-	}
+//	/**校验供应商下面是否有操作账户
+//	* @param $supplierNo 供应商账户
+//	 * @return array
+//	 */
+//	private function checkSupplier($supplierNo){
+//		        $companyinfo = UserHandle("/userCompanyBasicList", ["companyNo" =>$supplierNo]);
+//                if ($companyinfo['code'] != 0) return ["code"=>$companyinfo['code'],"message"=> $companyinfo['message']];
+//                if (!empty($companyinfo['data']) && $companyinfo['data']['count'] > 0) {
+//                    return ["code"=>1004,"message"=> "供应商公司存在操作账户,请用供应商账户操作"];
+//                }
+//                else{
+//                	  return ["code"=>0,"message"=> "业务账户可操作"];
+//                }
+//	}
 }

app/command/Report.php

@@ -15,7 +15,7 @@ class Report extends Command
 		//相关字段的文字转换
 	private $key='Reportexec';
 	private $param=[];
-	private $qrdType = [1 => '库存品', 2 => '非库存品', 3 => '采购反馈'];
+	private $qrdType = [1 => '库存品', 2 => '非库存品', 3 => '采购反馈',"4"=>"报备单"];
 	private $qrdSource = [1 => '直接下单', 2 => '竞价转单', 3 => '项目转单', 4 => '平台导入', 5 => '有赞平台', 6 => '售后补换货',7=>'报备转单',8=>'支付渠道拆单',9=>"采销补录",10=>"结算补录"];
 	private $cgdSource = [0=>"备库单",1 => '直接下单', 2 => '竞价转单', 3 => '项目转单', 4 => '平台导入', 5 => '有赞平台', 6 => '售后补换货',7=>'报备转单',8=>'支付渠道拆单',9=>"采销补录",10=>"结算补录"];
 	private $sendType = [1 => '包邮', 2 => '自提'];
@@ -24,10 +24,11 @@ class Report extends Command
 	private $cgd_inv_status = [1 => '未回', 2 => '部分回票', 3 => '已回'];
 	private $cgd_pay_status = [1 => '未付', 2 => '部分付款', 3 => '已付'];
 	private $invoice_pool_status = [1 => '财务审核通过', 2 => '待财务上传发票', 3 => '金税开票中/验票中', 4 => '开票成功', 5 => '开票失败', 6 => '发票退票/废弃', 7 => '取消申请', 8 => '财务驳回', 9 => '验票失败'];
-	private $cgdType = [1 => '库存', 2 => '非库存', 3 => '咨询'];
+	private $cgdType = [1 => '库存', 2 => '非库存', 3 => '咨询','4'=>'报备单'];
 	private $invoice_return_status = [0 => '待财务审核', 1 => '退票中', 2 => '退票成功', 3 => '审核驳回', 4 => '退票失败'];
 	private $sendStatus = [1=>'未发货',2=>'部分发货',3=>'全部发货'];
 	private $TagName = [1=>'采购单付款',2=>'采购单回票',3=>'销售回款',4=>"销售开票"];
+	private $paltType = ['无',"ToB","ToC"];
 
     protected function configure()
     {
@@ -959,26 +960,33 @@ class Report extends Command
 		strtotime($param['start'])),date("Y-m-d 23:59:59",strtotime($param['end']))]];
 //		if ($param['companyNo'] != '') $where[] = ['supplierNo', '=', $param['companyNo']];
 		$Db= Db::connect("mysql_wsm");
-		$list =$Db->name("order_out")->alias("a")
+		$list =$Db->name("order_out_child")->alias("a")
 		->leftjoin("sale b","a.orderCode=b.orderCode")
 		->leftjoin("order_send c","a.outCode=c.outCode")
 		->leftjoin("purchease_order d","c.cgdNo=d.cgdNo")
 		->field("
+			a.outChildCode 发货工单号,
 			a.outCode 发货单号,
 			c.cgdNo 采购单号,
 			a.orderCode 销售单号,
 			b.platform_id 平台类型,
+			b.platform_id 平台名称,
 			d.cgder_id 业务部门,
-			d.cgder 采购人员,
-			b.order_source 咨询类型,
-			a.sendtime 发货时间,
+			d.cgder 供应商负责人,
+			d.cgder 发货操作人,
+			b.order_source 订单类型,
+			b.order_type 商品类型,
+			a.sendtime 发货工单发货时间,
 			b.cat_id `一级分类`,
 			b.good_name 商品名称,
 			a.post_name 物流公司,
 			a.post_code 物流单号,
-			d.supplier_name `供应商名称`,
-			a.send_num 本次发货数量,
-			a.send_num*d.good_price 本次发货金额,
+			a.companyNo `业务公司编号`,
+			a.companyName  `业务公司名称`,
+			a.supplierNo `供应商编号`,
+			a.supplierName `供应商名称`,
+			a.num 本次发货数量,
+			a.num*d.good_price 本次发货金额,
 			d.good_price 采购单价,
 			d.send_num-d.th_num 采购总数,
 			d.total_fee-d.th_fee 采购金额,
@@ -988,16 +996,32 @@ class Report extends Command
 		->where($where)
 		->cursor();
 		$depart=[];
+		$hasAccount=[];
+		$platform=[];
 		foreach ($list as $value){
 			if(!isset($depart[$value['业务部门']])){
 				$temp = getDepartByUid($value['业务部门']);
 				if(isset($temp['data']) && !empty($temp['data']))
 					$depart[$value['业务部门']]=$temp['data'][$value['业务部门']];
 			}
+			
+			if(!isset($hasAccount[$value['供应商编号']])){
+				$temp = check_has_account_by_supplierNos($value['供应商编号']);
+				if(isset($temp['data']) && !empty($temp['data']))
+					$hasAccount[$value['供应商编号']]=isset($temp['data'][$value['供应商编号']])?$value['供应商名称']:$value['供应商负责人'];
+			}
 			$value['业务部门'] = $depart[$value['业务部门']]??"";
+			$value['发货操作人'] = $hasAccount[$value['供应商编号']];
 			$value['一级分类'] = $Db->name("cat")->where(["id"=>$value['一级分类']])->value("search","");
-			$value['平台类型'] = $Db->name("platform")->where(["id"=>$value['平台类型']])->value("platform_name","");
-			$value['咨询类型']=$this->qrdSource[$value['咨询类型']]??"";
+			if(!isset($platform[$value['平台类型']])){
+				$pal = $Db->name('platform')->where(['id'=>$value['平台类型']])->field('platform_name,use_type')
+				->findOrEmpty();
+				$platform[$value['平台类型']] = $pal;
+			}
+			$value['平台类型'] =$this->paltType[$platform[$value['平台类型']]["use_type"]??0];
+			$value['平台名称'] =$platform[$value['平台类型']]["platform_name"]??'';
+			$value['订单类型']=$this->qrdSource[$value['订单类型']]??"";
+			$value['商品类型']=$this->qrdType[$value['商品类型']]??"";
 			$value['物流单号'].='';
 			yield $value;
 		}