ad

app/admin/controller/Sale.php

@@ -839,7 +839,14 @@ class Sale extends Base
         if($sendtype==""){
             return error_show(1003,"参数sendtype不能为空");
         }
-
+         $companyNo = isset($this->post['companyNo'])&&$this->post['companyNo']!="" ? trim($this->post['companyNo']):"";
+        if($companyNo==""){
+            return error_show(1003,"参数 companyNo 不能为空");
+        }
+        $company = Db::name("bussiness")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
+        if($company==false){
+             return error_show(1003,"业务公司数据未找到");
+        }
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']):"";
 
         $orderCode = makeNo("QR");
@@ -848,7 +855,7 @@ class Sale extends Base
         $is_stock=0;
         $cgd=[
             "supplierNo"=>$zxinfo['supplierNo'],
-            "companyNo"=>$zxorder['companyNo'],
+            "companyNo"=>$companyNo,
             "spuCode"=>$spuCode,
             "skuCode"=>$skuCode,
             "orderCode"=>$orderCode,
@@ -915,6 +922,13 @@ class Sale extends Base
                 Db::rollback();
                 return error_show(1003,"未找到咨询单信息");
             }
+            if($companyNo!=$zxorder['companyNo']){
+                 $zxord =Db::name("consult_order")->where($zxorder)->update(["companyNo"=>$companyNo,"updatetime"=>date("Y-m-d H:i:s")]);
+                if($zxord==false){
+                    Db::rollback();
+                    return error_show(1003,"咨询单更新业务公司失败");
+                }
+            }
             $data=[
                 "orderCode"=>$orderCode,
                 "good_code"=>$spuCode,
@@ -934,7 +948,7 @@ class Sale extends Base
                 "send_status"=>1,
                 "good_type"=>1,
                 "send_type"=>$sendtype,
-                "supplierNo"=>$zxorder['companyNo'],
+                "supplierNo"=>$companyNo,
                 "is_del"=>0,
                 "zxNo"=>$bidNo,
                 "platform_order"=>$platform_order,
@@ -981,9 +995,7 @@ class Sale extends Base
                     "order_status" => $data['status'],"before_status"=> 0
                 ]);
                     $old_zx_status = $zx['status'];
-                    $zx['status']=5;
-                    $zx['updatetime']=date("Y-m-d H:i:s");
-                    $sa=Db::name("consult_info")->save($zx);
+                    $sa=Db::name("consult_info")->where($zx)->save(["status"=>5,"updatetime"=>date("Y-m-d H:i:s")]);
                     if($sa==false){
                         Db::rollback();
                         return error_show(1002,"咨询单修改失败");
@@ -1032,7 +1044,7 @@ class Sale extends Base
                         "supply_area"=>$zxinfo['supply_area'],
                         "pay_way"=>$zxinfo['pay_way'],
                         "send_way"=>$zxinfo['send_way'],
-                        "companyNo"=>$zxorder['companyNo'],
+                        "companyNo"=>$companyNo,
                         "status"=>1,
                         "is_del"=>0,
                         "createrid"=>$zxinfo['createrid'],
@@ -1287,9 +1299,7 @@ class Sale extends Base
                     }
                 }
                 $old_fk_status= $feedback['status'];
-                $feedback['status']=2;
-                $feedback['updatetime']=date("Y-m-d H:i:s");
-                $fed =Db::name("project_feedback")->save($feedback);
+                $fed =Db::name("project_feedback")->where($feedback)->save(['status'=>2,"updatetime"=>date("Y-m-d H:i:s")]);
                 if($fed==false){
                     Db::rollback();
                     return error_show(1002, "项目订单生成失败");
@@ -1321,9 +1331,9 @@ class Sale extends Base
 
             }
             $old_plan_status = $plan['status'];
-            $plan['status']=2;
-            $plan['updatetime']=date("Y-m-d H:i:s");
-            $in =Db::name("project_plan")->save($plan);
+//            $plan['status']=2;
+//            $plan['updatetime']=date("Y-m-d H:i:s");
+            $in =Db::name("project_plan")->where($plan)->save(['status'=>2,"updatetime"=>date("Y-m-d H:i:s")]);
             if($in==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
@@ -1337,9 +1347,9 @@ class Sale extends Base
                 ], "PRP", 2, $plan);
             }
             $old_project_status = $project["status"];
-            $project["status"]=6;
-            $project['updatetime']=date("Y-m-d H:i:s");
-            $pr =Db::name("project")->save($project);
+//            $project["status"]=6;
+//            $project['updatetime']=date("Y-m-d H:i:s");
+            $pr =Db::name("project")->where($project)->save(["updatetime"=>date("Y-m-d H:i:s"),"status"=>6]);
             if($pr==false){
                 Db::rollback();
                 return error_show(1002, "项目订单生成失败");
@@ -2801,7 +2811,6 @@ class Sale extends Base
                 $order=["order_type"=>"CKD","order_code"=>$outCode,"order_id"=>$codeinfo['id'],"order_status"=>$codeinfo['status'],"before_status"=> 0];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 1) {
-
                     $stokc =Db::name("good_stock")->where(['spuCode'=>$codeinfo['spuCode'],"wsm_code"=>$codeinfo['wsm_code'],
                         "is_del"=>0])->find();
                     if($stokc==false){
@@ -3513,9 +3522,7 @@ class Sale extends Base
         }
     }
 
-    public function outdel(){
 
-    }
 
     //库管发货
     public function outSend(){
@@ -3622,7 +3629,7 @@ class Sale extends Base
                 }
                 $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$stokc['id'], "type" => 2,'stock'=>$outinfo['send_num'],"stock_name" => "wait_out_stock"];
                 GoodLog::LogAdd($this->post['token'],$good_data,"CKD");
-//                Cache::store("redis")->handler()->lPush("SENDOUT",$outCode,1800);
+                Cache::store("redis")->handler()->lPush("SENDOUT",$outCode,1800);
                 Db::commit();
                 return app_show(0,"发货成功");
             }else{

app/command/NowReportHandle.php

@@ -553,6 +553,7 @@ ShortText1617865626160 '一级分类',
         $data=[];
         foreach($list as $value){
             $value['销售货款'] = $db->name("qrd_info")->where(['sequenceNo'=>$value['确认单编号']])->value('Number1618248813613','');
+            $value['财务核算编码'] = $db->name("cat")->where(['cat_name'=>$value['一级分类']])->value('fund_code','');
             yield $data[] = $value;
         }
         return $data;