|
@@ -168,46 +168,7 @@ class FinancialManager extends Base{
|
|
|
if($info->isEmpty()) return error("数据不存在");
|
|
|
return success("获取成功",$info);
|
|
|
}
|
|
|
-
|
|
|
-// //处理计提数据
|
|
|
-// public function CheckAccrue(){
|
|
|
-// $params = $this->request->param(["manager_id"=>"","relaArr"=>[],"checkFee"=>"","is_ChekOrder"=>0],"post","trim");
|
|
|
-// $valid = $this->validate($params,[
|
|
|
-// 'manager_id|出库明细ID'=>'require|integer',
|
|
|
-// 'relaArr|关联数据'=>'require|array',
|
|
|
-// 'checkFee|调整费用'=>'require|float',
|
|
|
-// 'is_ChekOrder|是否添加调整单'=>'require|in:0,1',
|
|
|
-// ]);
|
|
|
-// if($valid!==true) return error($valid);
|
|
|
-// $manager = $this->model->findOrEmpty($params['manager_id']);
|
|
|
-// if($manager->isEmpty()) return error("计提数据不存在");
|
|
|
-// if($manager['status']!=1) return error("当前数据状态不允许操作");
|
|
|
-// if($manager->manager_status!=2) return error("当前数据不是计提状态");
|
|
|
-// $manager->relaArr=$params['relaArr'];
|
|
|
-// $this->model->startTrans();
|
|
|
-// try{
|
|
|
-// if($manager->type==1 || $manager->type==4)$check = $this->model->inProduct($manager);
|
|
|
-// else $check = $this->model->outProduct($manager);
|
|
|
-// if(empty($check)) return error("商品数据计提处理失败");
|
|
|
-// if($manager->balance_num!=0) return error("计提数据数量未处理完不可提交");
|
|
|
-// ManagerProduct::AddProduct($manager->id,$check);
|
|
|
-// $manager->uid=$this->uid; //调整单需要创建人
|
|
|
-// $manager->uname=$this->uname;//调整单需要创建人
|
|
|
-// $manager->checkFee=$params['checkFee'];
|
|
|
-// $manager->is_chekOrder=$params['is_ChekOrder'];
|
|
|
-// $manager->status=2;
|
|
|
-// $manager->error_remark='';
|
|
|
-// $manager->save();
|
|
|
-// $this->model->commit();
|
|
|
-// }catch (\Exception $e){
|
|
|
-// $this->model->rollback();
|
|
|
-// return error($e->getMessage());
|
|
|
-// }
|
|
|
-// return success("操作成功");
|
|
|
-// }
|
|
|
-
|
|
|
-
|
|
|
- //处理待确认数据
|
|
|
+ //处理待确认数据
|
|
|
public function CheckSure(){
|
|
|
$params = $this->request->param(['manager_id'=>'','relaArr'=>[],"fz_date"=>"","is_checkOrder"=>0],'post','trim');
|
|
|
$valid = $this->validate($params,[
|
|
@@ -286,7 +247,7 @@ class FinancialManager extends Base{
|
|
|
$info=$this->model->whereIn('id',$ids)->select();
|
|
|
if($info->isEmpty()) return error("数据不存在");
|
|
|
foreach ($info as $item){
|
|
|
- if($item->status!=1) return error("当前数据[$item->id]状态不允许删除");
|
|
|
+ if($item->status!=1 || $item->status!=4) return error("当前数据[$item->id]状态不允许删除");
|
|
|
if($item->balance_num!=$item->total_num) return error("数据[$item->id]数量已处理过不可删除");
|
|
|
}
|
|
|
$info->delete();
|