|
|
@@ -188,7 +188,8 @@ class FinancialManager extends Base{
|
|
|
$manager->relaArr=$params['relaArr'];
|
|
|
$this->model->startTrans();
|
|
|
try{
|
|
|
- $check = $this->model->outProduct($manager);
|
|
|
+ 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);
|
|
|
@@ -222,11 +223,12 @@ class FinancialManager extends Base{
|
|
|
if($manager['status']!=1) return error('当前待确认数据状态不允许操作');
|
|
|
if($manager->manager_status!=3) return error('当前数据不是待确认状态');
|
|
|
$manager->relaArr=$params['relaArr'];
|
|
|
- $manager->fz_date=$params['fz_date']??"";
|
|
|
+ $manager->fz_date=$params['fz_date']??$manager->fz_date;
|
|
|
$this->model->startTrans();
|
|
|
try{
|
|
|
- $check = $this->model->inProduct($manager);
|
|
|
- if(empty($check)) return error('待确认数据处理失败');
|
|
|
+ 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; //调整单需要创建人
|
|
|
@@ -258,8 +260,9 @@ class FinancialManager extends Base{
|
|
|
try{
|
|
|
foreach ($manager as $item){
|
|
|
$item->relaArr=$params['relaArr'];
|
|
|
- $item->fz_date=$params['fz_date']??"";
|
|
|
- $check = $this->model->inProduct($item);
|
|
|
+ $item->fz_date=$params['fz_date']??$item->fz_date;
|
|
|
+ if($item->type==1 || $item->type==4)$check = $this->model->inProduct($item);
|
|
|
+ else $check = $this->model->outProduct($item);
|
|
|
if(empty($check)) return error('待确认数据处理失败');
|
|
|
if($item->balance_num!=0) return error('待确认数据数量未处理完不可提交');
|
|
|
ManagerProduct::AddProduct($item->id,$check);
|
