From: Alexander Smirnov <fredeom@mail.ru>
Date: Mon, 16 Dec 2024 13:31:00 +0000 (+0300)
Subject: изменения
X-Git-Tag: 1.7~164^2~2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=4830986b168a81062ca30cc07e115585606a3173;p=erp24_rep%2Fyii-erp24%2F.git

изменения
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index bbd1af1f..41622665 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -141,7 +141,7 @@ class DataController extends BaseController {
             $waybillIncomingIds = $waybillIncomingArray['waybillIncomingIds'];
 
             if (!empty($waybillIncoming)) {
-                $mess['create_waybill_incoming'] = $waybillIncoming;
+                $mess['create_write_ons'] = $waybillIncoming;
             }
 
             $createEmployeeArray = $this->getCreateEmployee();
@@ -348,13 +348,12 @@ class DataController extends BaseController {
                     'store_guid',
                     'number',
                     'date',
-//                    'write_offs_type',
                     'comment',
                     'quantity',
                     'summ'
                 ])
                 ->indexBy('id')
-                ->andWhere(['and', ['status' => 2], ['active' => 1]])
+                ->andWhere(['status' => 2])
                 ->asArray()
                 ->all();
 
@@ -393,8 +392,8 @@ class DataController extends BaseController {
                     $waybillIncomingResult[] = [
                         'id' => $row['guid'],
                         'store_id' => $row['store_guid'],
-//                        'type' => $row['write_offs_type'],
-//                        'cause' => 'Документ списания в ERP ' . $row['number'],
+                        'type' => 'ревизия при передаче смены',
+                        'cause' => 'Документ ревизии при передаче смены в ERP ' . $row['number'],
                         'items' => $row['items'],
                         'summ' => $row['summ'],
                         'comment' => $row['comment'],