|
|
@@ -162,7 +162,10 @@ class InspectService extends Service
|
|
|
|
|
|
$model = DeviceOrder::where('id',$data['id'])->first();
|
|
|
if($model->del_time > 0) return [false, '单据不存在或已被删除'];
|
|
|
+ $order_number = $model->order_number;
|
|
|
+ if($data['hand_time'] != $model->hand_time) $order_number = $this->createOrderNumber($data['type'], $data['hand_time']);
|
|
|
|
|
|
+ $model->order_number = $order_number;
|
|
|
$model->mark = $data['mark'] ?? '';
|
|
|
$model->state = $data['state'] ?? 0;
|
|
|
$model->hand_time = $data['hand_time'] ?? 0;
|
|
|
@@ -181,7 +184,7 @@ class InspectService extends Service
|
|
|
'type' => $data['type'],
|
|
|
'device_order_id' => $data['id'],
|
|
|
'dxj_id' => $value['dxj_id'] ?? 0,
|
|
|
- 'order_number' => $model->order_number,
|
|
|
+ 'order_number' => $order_number,
|
|
|
'equipment_id' => $value['equipment_id'],
|
|
|
'equipment_no' => $value['equipment_no'],
|
|
|
'state' => $value['state'],
|
|
|
@@ -210,7 +213,7 @@ class InspectService extends Service
|
|
|
try {
|
|
|
DB::beginTransaction();
|
|
|
|
|
|
- $order_number = $this->createOrderNumber($data['type']);
|
|
|
+ $order_number = $this->createOrderNumber($data['type'], $data['hand_time']);
|
|
|
$model = new DeviceOrder();
|
|
|
$model->type = $data['type'];
|
|
|
$model->order_number = $order_number;
|
|
|
@@ -570,8 +573,13 @@ class InspectService extends Service
|
|
|
return [true, $customer];
|
|
|
}
|
|
|
|
|
|
- public function createOrderNumber($type = 1){
|
|
|
- $str = DeviceOrder::$prefix[$type] . date('Ymd',time());
|
|
|
+ public function createOrderNumber($type = 1, $time = 0){
|
|
|
+ if(empty($time)) {
|
|
|
+ $day = date('Ymd',time());
|
|
|
+ }else{
|
|
|
+ $day = $time;
|
|
|
+ }
|
|
|
+ $str = DeviceOrder::$prefix[$type] . $day;
|
|
|
|
|
|
$order_number = DeviceOrder::where('order_number','Like','%'. $str . '%')
|
|
|
->where('type',$type)
|
cqp