|
@@ -1805,13 +1805,13 @@ class U8XkyServerService extends Service
|
|
|
->first();
|
|
->first();
|
|
|
if(empty($state)) return [false,'操作来源单据暂未审批'];
|
|
if(empty($state)) return [false,'操作来源单据暂未审批'];
|
|
|
$state_array = $state->toArray();
|
|
$state_array = $state->toArray();
|
|
|
- if($state_array['state'] != U8State::state_one || empty($state_array['result']) || $state_array['is_submit']) return [false, '操作的来源单据不允许提交'];
|
|
|
|
|
|
|
+ if($state_array['state'] != U8State::state_one || empty($state_array['result'])) return [false, '操作的来源单据不允许提交'];
|
|
|
|
|
|
|
|
$record = Record::where("del_time",2)
|
|
$record = Record::where("del_time",2)
|
|
|
->where('login_type', $model_array['login_type'])
|
|
->where('login_type', $model_array['login_type'])
|
|
|
->where('order_number', $model_array['order_number'])
|
|
->where('order_number', $model_array['order_number'])
|
|
|
->where('type', $data['type'])
|
|
->where('type', $data['type'])
|
|
|
- ->where('msg', '<>', '')
|
|
|
|
|
|
|
+ ->where('result', '<>', '')
|
|
|
->orderBy('id', 'desc')
|
|
->orderBy('id', 'desc')
|
|
|
->first();
|
|
->first();
|
|
|
if(empty($record)) return [false, '提交记录数据不存在'];
|
|
if(empty($record)) return [false, '提交记录数据不存在'];
|