|
|
@@ -33,7 +33,6 @@ class ReturnExchangeOrderService extends Service
|
|
|
foreach ($data['product_one'] as $value){
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
- 'depart_id' => $data['depart_id'] ?? 0,
|
|
|
'product_id' => $value['product_id'],
|
|
|
'number' => $value['number'],
|
|
|
'mark' => $value['mark'] ?? '',
|
|
|
@@ -45,7 +44,8 @@ class ReturnExchangeOrderService extends Service
|
|
|
'cost' => $value['cost'] ?? 0,
|
|
|
'depart_price' => $value['depart_price'] ?? 0,
|
|
|
'retail_price' => $value['retail_price'] ?? 0,
|
|
|
- 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one
|
|
|
+ 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one,
|
|
|
+ 'crt_time' => $time,
|
|
|
];
|
|
|
}
|
|
|
ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
@@ -56,7 +56,6 @@ class ReturnExchangeOrderService extends Service
|
|
|
foreach ($data['product_two'] as $value){
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
- 'depart_id' => $data['depart_id'] ?? 0,
|
|
|
'product_id' => $value['product_id'],
|
|
|
'number' => $value['number'],
|
|
|
'mark' => $value['mark'] ?? '',
|
|
|
@@ -68,7 +67,8 @@ class ReturnExchangeOrderService extends Service
|
|
|
'cost' => $value['cost'] ?? 0,
|
|
|
'depart_price' => $value['depart_price'] ?? 0,
|
|
|
'retail_price' => $value['retail_price'] ?? 0,
|
|
|
- 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two
|
|
|
+ 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two,
|
|
|
+ 'crt_time' => $time,
|
|
|
];
|
|
|
}
|
|
|
ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
@@ -82,7 +82,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
$insert = [];
|
|
|
foreach ($data['depart'] as $value){
|
|
|
$insert[] = [
|
|
|
- 'return_exchange_id' => $data['id'],
|
|
|
+ 'return_exchange_id' => $material_model->id,
|
|
|
'depart_id' => $value,
|
|
|
'type' => ReturnExchangeOrderRange::type_one,
|
|
|
'crt_time' => $time,
|
|
|
@@ -95,7 +95,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
$insert = [];
|
|
|
foreach ($data['employee'] as $value){
|
|
|
$insert[] = [
|
|
|
- 'return_exchange_id' => $data['id'],
|
|
|
+ 'return_exchange_id' => $material_model->id,
|
|
|
'employee_id' => $value,
|
|
|
'type' => ReturnExchangeOrderRange::type_two,
|
|
|
'crt_time' => $time,
|
|
|
@@ -139,7 +139,6 @@ class ReturnExchangeOrderService extends Service
|
|
|
foreach ($data['product_one'] as $value){
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
- 'depart_id' => $data['depart_id'] ?? 0,
|
|
|
'product_id' => $value['product_id'],
|
|
|
'number' => $value['number'],
|
|
|
'mark' => $value['mark'] ?? '',
|
|
|
@@ -151,7 +150,8 @@ class ReturnExchangeOrderService extends Service
|
|
|
'cost' => $value['cost'] ?? 0,
|
|
|
'depart_price' => $value['depart_price'] ?? 0,
|
|
|
'retail_price' => $value['retail_price'] ?? 0,
|
|
|
- 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one
|
|
|
+ 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_one,
|
|
|
+ 'crt_time' => $time,
|
|
|
];
|
|
|
}
|
|
|
ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
@@ -162,7 +162,6 @@ class ReturnExchangeOrderService extends Service
|
|
|
foreach ($data['product_two'] as $value){
|
|
|
$sub[] = [
|
|
|
'return_exchange_id' => $material_model->id,
|
|
|
- 'depart_id' => $data['depart_id'] ?? 0,
|
|
|
'product_id' => $value['product_id'],
|
|
|
'number' => $value['number'],
|
|
|
'mark' => $value['mark'] ?? '',
|
|
|
@@ -174,7 +173,8 @@ class ReturnExchangeOrderService extends Service
|
|
|
'cost' => $value['cost'] ?? 0,
|
|
|
'depart_price' => $value['depart_price'] ?? 0,
|
|
|
'retail_price' => $value['retail_price'] ?? 0,
|
|
|
- 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two
|
|
|
+ 'return_or_exchange' => ReturnExchangeOrderProductInfo::type_two,
|
|
|
+ 'crt_time' => $time,
|
|
|
];
|
|
|
}
|
|
|
ReturnExchangeOrderProductInfo::insert($sub);
|
|
|
@@ -184,7 +184,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
$insert = [];
|
|
|
foreach ($data['depart'] as $value){
|
|
|
$insert[] = [
|
|
|
- 'return_exchange_id' => $data['id'],
|
|
|
+ 'return_exchange_id' => $material_model->id,
|
|
|
'depart_id' => $value,
|
|
|
'type' => ReturnExchangeOrderRange::type_one,
|
|
|
'crt_time' => $time,
|
|
|
@@ -197,7 +197,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
$insert = [];
|
|
|
foreach ($data['employee'] as $value){
|
|
|
$insert[] = [
|
|
|
- 'return_exchange_id' => $data['id'],
|
|
|
+ 'return_exchange_id' => $material_model->id,
|
|
|
'employee_id' => $value,
|
|
|
'type' => ReturnExchangeOrderRange::type_two,
|
|
|
'crt_time' => $time,
|
|
|
@@ -421,7 +421,7 @@ class ReturnExchangeOrderService extends Service
|
|
|
|
|
|
public function getSaveReturnCompareMessage($id = 0, $sales_order_id = 0){
|
|
|
$product_save = [];
|
|
|
- $sub = ReturnExchangeOrderProductInfo::where('type',ReturnExchangeOrderProductInfo::type_one)
|
|
|
+ $sub = ReturnExchangeOrderProductInfo::where('return_or_exchange',ReturnExchangeOrderProductInfo::type_one)
|
|
|
->where('del_time',0)
|
|
|
->when(! empty($id), function ($query) use ($id) {
|
|
|
return $query->where('return_exchange_id', '<>',$id);
|
cqpCow