wugg před 1 rokem
rodič
revize
66e9d8657e
1 změnil soubory, kde provedl 12 přidání a 6 odebrání
  1. 12 6
      app/command/SplitSale.php

+ 12 - 6
app/command/SplitSale.php

@@ -19,7 +19,7 @@ class SplitSale extends Command
     private $cgd_key = 0;//新增到wsm_cgd_caixiao的数组下标,从0开始
     private $order_source = 8;//支付渠道
 	private  $Tcode = '';
-	private  $comOrder;
+	private  $comOrder=null;
     protected function configure()
     {
         $this->setName('split_sale')->setDescription('销售订单拆分');
@@ -59,6 +59,7 @@ class SplitSale extends Command
                 	//处理采购销售同一数据
                 	$tempOrder=[
                 		"cxCode"=>$sale["orderCode"],
+                		"tyCode"=>makeNo("TY"),
                 		"orderCode"=>"",
                 		"cgdNo"=>"",
                 		"order_type"=>$sale['order_type'],
@@ -341,18 +342,17 @@ class SplitSale extends Command
         ];
 
         $tmp = Db::name('cgd_caixiao')
-            ->field('id,cgdNo')
+            ->field('id,cgdNo,supplier_name,supplierNo')
             ->where(['oldCode' => $sale['orderCode'], 'companyNo' => $pay_rate['companyNo']])
             ->findOrEmpty();
-
         if (!empty($tmp)) {
             Db::name('cgd_caixiao')
                 ->where('id', $tmp['id'])
                 ->update($tmp_cgd);
             if(isset($tempOrder['cgdNo'])){
             	$tempOrder['cgdNo']= $tmp['cgdNo'];
-            	$tempOrder['supplierName'] =$cgd['supplier_name'];
-            	$tempOrder['supplierNo'] = $cgd['supplierNo'];
+            	$tempOrder['supplierName'] =$tmp['supplier_name'];
+            	$tempOrder['supplierNo'] = $tmp['supplierNo'];
             }
         } else {
              if(isset($tempOrder['cgdNo']))$tempOrder['cgdNo']=$cgdNo;
@@ -420,7 +420,13 @@ class SplitSale extends Command
     protected function OrderSave($order){
         if(empty($order)) return ;
         foreach ($order as &$item){
-        	$item['id'] = $this->comOrder->where("cxCode",$item['cxCode'])->value("id",null);
+        	$com = $this->comOrder->where('cxCode',$item['cxCode'])->findOrEmpty();
+        	if($com->isEmpty()==false){
+        		$item['id'] = $com->id;
+        		$item['tyCode'] = $com->tyCode;
+        	}else{
+        		$item['id']=null;
+        	}
         }
         $this->comOrder->saveAll($order);
     }