diff --git a/app/Http/Controllers/Sync1cApiController.php b/app/Http/Controllers/Sync1cApiController.php index ef2e99d..8295fe4 100644 --- a/app/Http/Controllers/Sync1cApiController.php +++ b/app/Http/Controllers/Sync1cApiController.php @@ -51,10 +51,10 @@ class Sync1cApiController extends Controller } UniModel::model('pipi_auto', $segment->connector)->updateOrCreate( [ - 'code' => $value['Код'], + 'guid' => $value['СсылкаGUID'], ], [ - 'guid' => $value['СсылкаGUID'], + 'code' => $value['Код'], 'name' => $value['Наименование'], 'type_id' => UniModel::model('pipi_auto_types', $segment->connector) ->firstOrCreate(['name' => $value['Тип']])->id, @@ -119,10 +119,10 @@ class Sync1cApiController extends Controller foreach ($request->all() as $value) { UniModel::model('pipi_owners', $segment->connector)->updateOrCreate( [ - 'code' => $value['Код'], + 'guid' => $value['СсылкаGUID'], ], [ - 'guid' => $value['СсылкаGUID'], + 'code' => $value['Код'], 'is_group' => (bool)$value['ЭтоГруппа'], 'name' => $value['Наименование'], 'comments' => $value['Комментарий'], @@ -183,10 +183,10 @@ class Sync1cApiController extends Controller foreach ($request->all() as $value) { UniModel::model('pipi_owner_contracts', $segment->connector)->updateOrCreate( [ - 'code' => $value['Код'], + 'guid' => $value['СсылкаGUID'], ], [ - 'guid' => $value['СсылкаGUID'], + 'code' => $value['Код'], 'is_group' => (bool)$value['ЭтоГруппа'], 'name' => $value['Наименование'], 'comments' => $value['Комментарий'], @@ -236,11 +236,11 @@ class Sync1cApiController extends Controller foreach ($request->all() as $value) { UniModel::model('pipi_auto_calendar', $segment->connector)->updateOrCreate( [ - 'auto_id' => UniModel::model('pipi_auto')->where('name', $value['Имущество'])->first()?->id, + 'auto_id' => UniModel::model('pipi_auto')->where('guid', $value['ИмуществоGUID'])->first()?->id, 'date' => $this->formatDate($value['Дата']), ], [ - 'auto_id' => UniModel::model('pipi_auto')->where('name', $value['Имущество'])->first()?->id, + 'auto_id' => UniModel::model('pipi_auto')->where('guid', $value['ИмуществоGUID'])->first()?->id, 'date' => $this->formatDate($value['Дата']), 'status' => AutoStatusEnums::from($value['Статус'])->name ] diff --git a/modules/owner_contracts/script.php b/modules/owner_contracts/script.php index d86fb89..2f0dccf 100644 --- a/modules/owner_contracts/script.php +++ b/modules/owner_contracts/script.php @@ -77,6 +77,7 @@ return new class extends \A7kz\Platform\Commands\InstallScript { if ($value['ПометкаУдаления'] == 'Нет') { $model = UniModel::model('pipi_owner_contracts', $segment->connector); $model->is_group = (bool) $value['ЭтоГруппа']; + $model->guid = $value['СсылкаGUID']; $model->code = $value['Код']; $model->name = $value['Наименование']; $model->comments = $value['Комментарий']; diff --git a/modules/owners/script.php b/modules/owners/script.php index 12c004c..58f10d2 100644 --- a/modules/owners/script.php +++ b/modules/owners/script.php @@ -82,6 +82,7 @@ return new class extends \A7kz\Platform\Commands\InstallScript { if ($value['ПометкаУдаления'] == 'Нет') { $model = UniModel::model('pipi_owners', $segment->connector); $model->is_group = (bool) $value['ЭтоГруппа']; + $model->guid = $value['СсылкаGUID']; $model->code = $value['Код']; $model->name = $value['Наименование']; $model->comments = $value['Комментарий'];