|
@@ -88,8 +88,6 @@ class ImportOrdersService extends ImportBaseService
|
|
|
|
|
|
|
|
$logMessage = "Row $strNumber: " . $r['orders.object_address'] . '. ';
|
|
$logMessage = "Row $strNumber: " . $r['orders.object_address'] . '. ';
|
|
|
$year = (int)$r['orders.year'];
|
|
$year = (int)$r['orders.year'];
|
|
|
- session(['year' => $year]);
|
|
|
|
|
-
|
|
|
|
|
// округ
|
|
// округ
|
|
|
if (!($districtId = $this->findId('districts.shortname', $r['districts.name']))) {
|
|
if (!($districtId = $this->findId('districts.shortname', $r['districts.name']))) {
|
|
|
if((string)$r['districts.name'] !== '') {
|
|
if((string)$r['districts.name'] !== '') {
|
|
@@ -162,6 +160,7 @@ class ImportOrdersService extends ImportBaseService
|
|
|
|
|
|
|
|
// order
|
|
// order
|
|
|
$order = Order::query()
|
|
$order = Order::query()
|
|
|
|
|
+ ->withoutGlobalScopes()
|
|
|
->where('year', $year)
|
|
->where('year', $year)
|
|
|
->where('object_address', $r['orders.object_address'])
|
|
->where('object_address', $r['orders.object_address'])
|
|
|
->first();
|
|
->first();
|
|
@@ -189,6 +188,7 @@ class ImportOrdersService extends ImportBaseService
|
|
|
// maf order
|
|
// maf order
|
|
|
if ($r['maf_orders.order_number'] != '') {
|
|
if ($r['maf_orders.order_number'] != '') {
|
|
|
$mafOrder = MafOrder::query()
|
|
$mafOrder = MafOrder::query()
|
|
|
|
|
+ ->withoutGlobalScopes()
|
|
|
->where('year', $year)
|
|
->where('year', $year)
|
|
|
->where('product_id', $product->id)
|
|
->where('product_id', $product->id)
|
|
|
->where('order_number', $r['maf_orders.order_number'])
|
|
->where('order_number', $r['maf_orders.order_number'])
|
|
@@ -221,6 +221,7 @@ class ImportOrdersService extends ImportBaseService
|
|
|
$statement_date = is_int($r['products_sku.statement_date']) ? DateHelper::excelDateToISODate($r['products_sku.statement_date']) : null;
|
|
$statement_date = is_int($r['products_sku.statement_date']) ? DateHelper::excelDateToISODate($r['products_sku.statement_date']) : null;
|
|
|
|
|
|
|
|
$productSKU = ProductSKU::query()
|
|
$productSKU = ProductSKU::query()
|
|
|
|
|
+ ->withoutGlobalScopes()
|
|
|
->where('year', $year)
|
|
->where('year', $year)
|
|
|
->where('rfid', $r['products_sku.rfid'])
|
|
->where('rfid', $r['products_sku.rfid'])
|
|
|
->where('product_id', $product->id)
|
|
->where('product_id', $product->id)
|