|
@@ -366,9 +366,9 @@ class Resign extends BaseController
|
|
|
try{
|
|
|
$in = Db::name('purchease_feedback')->insert($data);
|
|
|
if($in){
|
|
|
- $info['status']=3;
|
|
|
+ $info['status']=2;
|
|
|
$info['addtime']=date("Y-m-d H:i:s");
|
|
|
- $ood=Db::name('purchease_feedback')->save($info);
|
|
|
+ $ood=Db::name('purchease')->save($info);
|
|
|
if($ood){
|
|
|
Db::commit();
|
|
|
return app_show(0,"新建成功");
|
|
@@ -431,7 +431,7 @@ class Resign extends BaseController
|
|
|
if($id==""){
|
|
|
return error_show(1001,'id不能为空');
|
|
|
}
|
|
|
- $feed = Db::name("purchease_feedback")->where(['id'=>$id,'is_del'=>0])->find();
|
|
|
+ $feed = Db::name("purchease")->where(['id'=>$id,'is_del'=>0])->find();
|
|
|
if(empty($feed)){
|
|
|
return error_show(1004,'未找到数据');
|
|
|
}
|
|
@@ -445,21 +445,21 @@ class Resign extends BaseController
|
|
|
$feed['remark']= $remark;
|
|
|
$feed['status']= $status;
|
|
|
$feed['updatetime']=date("Y-m-d H:i:s");
|
|
|
- $up = Db::name("purchease_feedback")->update($feed);
|
|
|
+ $up = Db::name("purchease")->update($feed);
|
|
|
if($up){
|
|
|
- if($status==1){
|
|
|
+ if($status==3){
|
|
|
// $ware = Db::name("warehouse_addr")->where(["wsm_code"=>$feed['warehouse'],"is_del"=>0])->find();
|
|
|
- $purse = Db::name("purchease")->where(['bk_code'=>$feed['bkcode'],"is_del"=>0])->find();
|
|
|
+ $purse = Db::name("purchease_feedback")->where(['bkcode'=>$feed['bk_code'],"is_del"=>0])->find();
|
|
|
if(empty($purse)){
|
|
|
Db::rollback();
|
|
|
- return error_show(1001,'未找到备库申请数据');
|
|
|
+ return error_show(1001,'未找到备库反馈数据');
|
|
|
}
|
|
|
- $purse['status']=4;
|
|
|
+ $purse['status']=1;
|
|
|
$purse['addtime']=date("Y-m-d H:i:s");
|
|
|
- $up = Db::name("purchease")->save($purse);
|
|
|
+ $up = Db::name("purchease_feedback")->save($purse);
|
|
|
if($up==false){
|
|
|
Db::rollback();
|
|
|
- return error_show(1001,'备库申请数据状态修改失败');
|
|
|
+ return error_show(1001,'备库反馈数据状态修改失败');
|
|
|
}
|
|
|
$supplier = Db::name("supplier")->where(["code"=>$feed['supplier']])->find();
|
|
|
$inw = makeNo("CG");
|
|
@@ -499,18 +499,18 @@ class Resign extends BaseController
|
|
|
return app_show(0,"更新成功",['cgdNo'=>$inw]);
|
|
|
}
|
|
|
}else{
|
|
|
- if($status==2){
|
|
|
- $purse = Db::name("purchease")->where(['bk_code'=>$feed['bkcode'],"is_del"=>0])->find();
|
|
|
+ if($status==4){
|
|
|
+ $purse = Db::name("purchease_feedback")->where(['bkcode'=>$feed['bk_code'],"is_del"=>0])->find();
|
|
|
if(empty($purse)){
|
|
|
Db::rollback();
|
|
|
- return error_show(1001,'未找到备库申请数据');
|
|
|
+ return error_show(1001,'未找到备库反馈数据');
|
|
|
}
|
|
|
- $purse['status']=5;
|
|
|
+ $purse['status']=1;
|
|
|
$purse['addtime']=date("Y-m-d H:i:s");
|
|
|
- $up = Db::name("purchease")->save($purse);
|
|
|
+ $up = Db::name("purchease_feedback")->save($purse);
|
|
|
if($up==false){
|
|
|
Db::rollback();
|
|
|
- return error_show(1001,'备库申请数据状态修改失败');
|
|
|
+ return error_show(1001,'备库反馈数据状态修改失败');
|
|
|
}
|
|
|
}
|
|
|
Db::commit();
|