提交 c15c9e94 authored 作者: 窦斌's avatar 窦斌

edit

上级 68007149
...@@ -151,7 +151,7 @@ class OrderListController extends Controller ...@@ -151,7 +151,7 @@ class OrderListController extends Controller
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]); return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
} }
$return_data = OrderListService::addPic($request->all(),$request->ip()); $return_data = OrderListService::addPic($request,$request->ip());
return response()->json($return_data); return response()->json($return_data);
} }
//删除图片 //删除图片
......
...@@ -241,7 +241,7 @@ class OrderListValidator extends FormRequest ...@@ -241,7 +241,7 @@ class OrderListValidator extends FormRequest
// 数据验证 // 数据验证
$validator = Validator::make($data, [ $validator = Validator::make($data, [
'id' => 'required|integer|min:1', 'id' => 'required|integer|min:1',
'file' => 'required|string', 'file' => 'required|file',
'type' => [//1获取技师2改派 'type' => [//1获取技师2改派
'required', 'required',
Rule::in(['1', '2', '3', '4', '5', '6']), Rule::in(['1', '2', '3', '4', '5', '6']),
......
...@@ -954,8 +954,8 @@ class OrderListService extends Model ...@@ -954,8 +954,8 @@ class OrderListService extends Model
->where('is_delete', 1) ->where('is_delete', 1)
->first(); ->first();
if($orderListArr) { if($orderListArr) {
$upPath='./Feekimages/'.date('Ym'); $request['path']='./FeekBack/'.date('Ym');
$rea = DealPicService::addPic($request['file'], $upPath, $request['type']); $rea = DealPicService::upload($request);
if($rea){ if($rea){
$feedback = Feedback::where('type',$request['type']) $feedback = Feedback::where('type',$request['type'])
->where('gl_id',$orderListArr['id']) ->where('gl_id',$orderListArr['id'])
...@@ -1090,7 +1090,8 @@ class OrderListService extends Model ...@@ -1090,7 +1090,8 @@ class OrderListService extends Model
$setArr['fahuo_type']=1;//已发货 $setArr['fahuo_type']=1;//已发货
$setArr['setfeeds_time']=$time;//反馈时间 $setArr['setfeeds_time']=$time;//反馈时间
$ree = SettlementList::where('list_id',$orderListArr['serial_number'])->update($setArr); $ree = SettlementList::where('list_id',$orderListArr['serial_number'])->update($setArr);
if ($rea && $res && $ree) { $resa = self::updateLineSrate($request['coordinate']??'', 6, $orderListArr['serial_number'], $orderListArr['sys_num'], $orderListArr['order_num']);
if ($rea && $res && $ree && $resa) {
DB::commit(); DB::commit();
$content = "订单(".$orderListArr['serial_number'].")"; $content = "订单(".$orderListArr['serial_number'].")";
CommonService::inserting_log('完成施工,',$orderListArr['sys_num'],$content,'派工单web',$session,$ip);//日志 CommonService::inserting_log('完成施工,',$orderListArr['sys_num'],$content,'派工单web',$session,$ip);//日志
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论