Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -1361,13 +1361,15 @@ class Consult extends Base
                            "action_remark" => '',//备注
                            "action_type" => "status"//新建create，编辑edit，更改状态status
                        ], "ZXD", $infos['status'], $infos);
+
+                       //维护台账信息
+                       Db::name('standing_book')->where('infoNo', $info['infoNo'])->update(['bargainNo' => $bargainNo,'updatetime' => date('Y-m-d H:i:s')]);
+
                        Db::commit();
                        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();

app/admin/controller/Purchin.php

@@ -255,7 +255,7 @@ class Purchin extends Base
                 $order = ["order_code"=>$cgdNo,"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
 
                 //维护台账信息
-                Db::name('standing_book')->where('cgdNo', $cgdNo)->update(['wsm_in_code' => $wsm_in_code, 'update' => date('Y-m-d H:i:s')]);
+                Db::name('standing_book')->where('cgdNo', $cgdNo)->update(['wsm_in_code' => $wsm_in_code, 'updatetime' => date('Y-m-d H:i:s')]);
 
                 if($status==1){
                             Db::commit();