Merge branch 'dev_temp_台账' into dev_wf

app/admin/controller/Consult.php

@@ -198,6 +198,10 @@ class Consult extends Base
             ];
             $zx = Db::name("consult_order")->insert($data);
             if($zx){
+
+                //判断是否是项目，且该项目是否存在台账记录中
+                if($is_project==1) $stand_exists=Db::name('standing_book')->field('id')->where('projectNo',$projectNo)->find();
+
                 foreach ($ladder as $value){
                     $infoNo=makeNo("IF");
                     $specinfo=[];
@@ -261,6 +265,28 @@ class Consult extends Base
 //                            "order_id" => 0,
 //                            "order_status" => 1
 //                        ]);
+
+
+                        //如果存在该项目编码，更新对应的第一个竞价单编码，其他竞价单编码新增(带着项目编码)
+                        if (isset($stand_exists)) {
+                            Db::name('standing_book')
+                                ->where('id', $stand_exists['id'])
+                                ->update([
+                                    'infoNo' => $infoNo,
+                                    'updatetime' => date('Y-m-d H:i:s')
+                                ]);
+                            unset($stand_exists);//后面的竞价单编码不用更新，都是新增
+                        } else {
+                            //添加台账信息
+                            Db::name('standing_book')
+                                ->insert([
+                                    'standBookNo' => makeNo("IO"),
+                                    'projectNo' => isset($projectNo) ? $projectNo : '',
+                                    'infoNo' => $infoNo,
+                                    'addtime' => date('Y-m-d H:i:s'),
+                                    'updatetime' => date('Y-m-d H:i:s')
+                                ]);
+                        }
                     }
                 }
                 Db::commit();
@@ -1205,6 +1231,8 @@ class Consult extends Base
             return error_show(1004,$e->getMessage());
         }
     }
+
+    //生成议价单
     public function bargain_add(){
         $bidNo = isset($this->post['bidNo'])&& $this->post['bidNo']!=""?trim($this->post['bidNo']):"";
         if($bidNo===""){
@@ -1337,6 +1365,10 @@ class Consult extends Base
                        return app_show(0,"议价单生成成功",["bargainNo"=>$bargainNo]);
                    }
                }
+
+               //维护台账信息
+               Db::name('standing_book')->where('infoNo', $info['infoNo'])->update(['bargainNo' => $bargainNo,'updatetime' => date('Y-m-d H:i:s')]);
+
             }
             Db::rollback();
             return error_show(1004,"议价单新建失败");

app/admin/controller/Project.php

@@ -87,8 +87,8 @@ class Project extends Base
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
-            $pro=Db::name("project")->insert($data);
-            if($pro){
+            $pro=Db::name("project")->insertGetId($data);
+            if($pro>0){
                 if(!empty($ladder)){
                     $la=[];
                     foreach ($ladder as $value){
@@ -142,9 +142,21 @@ class Project extends Base
                         ], "PRO", 1, $this->post);
                         $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>1, "order_type" =>"PRO","before_status"=>1];
                         ProcessOrder::AddProcess($this->post['token'], $process);
+
+                    //台账记录
+                    Db::name('standing_book')
+                        ->insert([
+                            'standBookNo' => makeNo("IO"),
+                            'projectNo' => $projectNo,
+                            'addtime' => date('Y-m-d H:i:s'),
+                            'updatetime' => date('Y-m-d H:i:s')
+                        ]);
+
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                 }
+
+
             }
             Db::rollback();
             return error_show(1004,"项目新建失败");

app/admin/controller/Resign.php

@@ -148,8 +148,7 @@ class Resign extends Base
         if($supplier==false)  return error_show(1004,"未找到供应商数据");
         $bk= Db::name("purchease")->where([["spuCode","=",$good_code],["status","<>",2],["is_del","=",0]])->find();
         if($bk!=false) return error_show(1004,"存在未完成备库单数据");
-        $cgd =Db::name("purchease_order")->where([["spuCode","=",$good_code],["status","in",[0,1]],["is_del","=",0]])
-        ->find();
+        $cgd =Db::name("purchease_order")->where([["spuCode","=",$good_code],["status","in",[0,1]],["is_del","=",0]])->find();
         if($cgd!=false) return error_show(1004,"存在未完成采购单数据");
         //查验仓库库存数量
         $stock =Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b","a.wsm_code=b.wsm_code")->where
@@ -203,6 +202,15 @@ class Resign extends Base
             ProcessOrder::AddProcess($token,$order);
             $ste = ["order_code"=>$bk_code,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($token,$ste,"BHD",1,$info);
+
+            //台账记录
+            Db::name('standing_book')
+                ->insert([
+                    'standBookNo' => makeNo("IO"),
+                    'bk_code' => $bk_code,
+                    'addtime' => date('Y-m-d H:i:s'),
+                    'updatetime' => date('Y-m-d H:i:s')
+                ]);
           return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
           return error_show(1005,"新建失败");