|
@@ -810,7 +810,7 @@ class CheckService extends Service
|
|
|
->where('number','<',0)
|
|
|
->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type')
|
|
|
->get()->toArray();
|
|
|
- if(empty($result)) return false;
|
|
|
+ if(empty($result)) return [false,'施工出库流水数据未找到'];
|
|
|
|
|
|
//生成对冲数据
|
|
|
$time = time();
|
|
@@ -819,8 +819,11 @@ class CheckService extends Service
|
|
|
$result[$key]['crt_time'] = $time;
|
|
|
}
|
|
|
|
|
|
+ $bool = InOutRecord::insert($result);
|
|
|
+ if(! $bool) return [false,'流水写入失败'];
|
|
|
+
|
|
|
//写入流水
|
|
|
- return InOutRecord::insert($result);
|
|
|
+ return [true, ''];
|
|
|
}
|
|
|
|
|
|
public function reject_record_purchase($data,$order){
|
|
@@ -839,7 +842,7 @@ class CheckService extends Service
|
|
|
->where('number','>',0)
|
|
|
->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type')
|
|
|
->get()->toArray();
|
|
|
- if(empty($result)) return false;
|
|
|
+ if(empty($result)) return [false,'采购入库流水数据未找到'];
|
|
|
|
|
|
//生成对冲数据
|
|
|
$time = time();
|
|
@@ -848,8 +851,11 @@ class CheckService extends Service
|
|
|
$result[$key]['crt_time'] = $time;
|
|
|
}
|
|
|
|
|
|
+ $bool = InOutRecord::insert($result);
|
|
|
+ if(! $bool) return [false,'流水写入失败'];
|
|
|
+
|
|
|
//写入流水
|
|
|
- return InOutRecord::insert($result);
|
|
|
+ return [true, ''];
|
|
|
}
|
|
|
|
|
|
public function reject_record_return_exchange($data,$order){
|
|
@@ -1178,7 +1184,7 @@ class CheckService extends Service
|
|
|
|
|
|
if($data['type'] == self::TYPE_THREE){
|
|
|
//通过后弃审
|
|
|
- if(! isset(self::$opt_case_reject[$data['opt_case']])) return [false, ''];
|
|
|
+ if(! isset(self::$opt_case_reject[$data['opt_case']])) return [false, '该操作不存在'];
|
|
|
|
|
|
//具体方法
|
|
|
$function = self::$opt_case_reject[$data['opt_case']];
|
|
@@ -1192,23 +1198,23 @@ class CheckService extends Service
|
|
|
list($bool,$msg) = $this->$function($data);
|
|
|
if(! $bool){
|
|
|
DB::rollBack();
|
|
|
- return [false, ''];
|
|
|
+ return [false, $msg];
|
|
|
}
|
|
|
$order = $msg;
|
|
|
|
|
|
if($function2) {
|
|
|
//流水
|
|
|
- $boolean = $this->$function2($data,$order);
|
|
|
+ list($boolean,$msg) = $this->$function2($data,$order);
|
|
|
if(! $boolean) {
|
|
|
DB::rollBack();
|
|
|
- return [false, ''];
|
|
|
+ return [false, $msg];
|
|
|
}
|
|
|
|
|
|
//库存
|
|
|
- $bool = $this->changeInventoryReject($data,$order,$user);
|
|
|
+ list($bool,$msg) = $this->changeInventoryReject($data,$order,$user);
|
|
|
if(! $bool){
|
|
|
DB::rollBack();
|
|
|
- return [false, ''];
|
|
|
+ return [false, $msg];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1225,7 +1231,7 @@ class CheckService extends Service
|
|
|
return [true, ''];
|
|
|
}catch (\Throwable $exception){
|
|
|
DB::rollBack();
|
|
|
- return [false, $exception->getLine(). $exception->getMessage()];
|
|
|
+ return [false, $exception->getMessage() . $exception->getLine() . $exception->getFile()];
|
|
|
}
|
|
|
}else{
|
|
|
//具体方法
|
|
@@ -1283,7 +1289,7 @@ class CheckService extends Service
|
|
|
return [true, ''];
|
|
|
}catch (\Throwable $exception){
|
|
|
DB::rollBack();
|
|
|
- return [false, $exception->getMessage().$exception->getLine()];
|
|
|
+ return [false, $exception->getMessage() . $exception->getLine() . $exception->getFile()];
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1325,7 +1331,7 @@ class CheckService extends Service
|
|
|
return [true, ''];
|
|
|
}catch (\Throwable $exception){
|
|
|
DB::rollBack();
|
|
|
- return [false, $exception->getMessage().$exception->getLine()];
|
|
|
+ return [false, $exception->getMessage() . $exception->getLine() . $exception->getFile()];
|
|
|
}
|
|
|
}
|
|
|
}
|