ad

app/admin/controller/Consult.php

@@ -570,9 +570,10 @@ class Consult extends Base
 //                ]);
 				if($isbids==1){
 					 $bidlist = Db::name("consult_bids")->where(["infoNo"=>$zxinfo['infoNo'],"is_del"=>0])->select()->toArray();
-				                if (!empty($bidlist)){
+				          if (!empty($bidlist)){
 				                    foreach ($bidlist as $value){
 				                        unset($value['id']);
+				                        $bidno=$value['bidNo'];
 				                        $value['infoNo']=$innew;
 				                        $value['bidNo']=makeNo("BD");
 				                        $value['spuCode']=makeNo("SKU");
@@ -590,6 +591,18 @@ class Consult extends Base
 				                            "action_remark" => '',//备注
 				                            "action_type" => "create"//新建create，编辑edit，更改状态status
 				                        ], "FKD", 1, $this->post);
+				                        if($value['is_combind']==1){
+				                            $combine = ConsultTemp::where(["bidNo"=>$bidno,"is_del"=>0])->select();
+				                            if(!$combine->isEmpty()){
+				                                (new ConsultTemp)->saveAll(array_map(function(&$v,$key)use($value){
+				                                    $v['id']=null;
+				                                    $v['bidNo']=$value['bidNo'];
+				                                    $v['spuCode']= substr(makeNo('SKU'), 0, -2) . str_pad($key, 2, '0', STR_PAD_LEFT);;
+				                                    $v['out_tax_id'] =0;
+				                                    $v['out_tax'] ="";
+				                                }));
+				                            }
+				                        }
 				                    }
 
 				                }

app/admin/controller/Sale.php

@@ -709,16 +709,9 @@ class Sale extends Base
             return error_show(1004, "参数addrlist不能为空");
         }
 
-//        $userCommon = \app\admin\common\User::getIns();
         Db::startTrans();
         try {
-//            $GoodModel = Db::name("good");
-//            if (in_array($etid['order_type'], [3, 4])) {
-//                $GoodModel = Db::name("good_zixun");
-//            }
-//			$goodStock=$GoodModel->where(["spuCode"=>$etid['good_code']])->lock(true)->findOrEmpty();
             $i = 1;
-//        	$goodStock_num =$goodStock['usable_stock']??0;
             $total_num = array_sum(array_column($addrlist, "receipt_quantity"));
             $goodStock_num = Db::name('good_stock')->alias("a")
                         ->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")