ERP-256 Сделать отправку документов Пересортица в 1с

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 14f3f64348dad1525ded81ba3faaaf6eb3f59b3c..8d0c688929238c347f10c97bb1ac0883557bc80e 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -53,15 +53,18 @@ use yii_app\records\WriteOffsProductsErp;
 use yii_app\services\InfoLogService;
 use yii_app\services\LogService;
 
-class DataController extends BaseController {
+class DataController extends BaseController
+{
 
     const OUT_DIR =
 //        __DIR__ . "/../json";
-    //    "/www/api2/json";
-   "/var/www/erp24/api2/json";
+        //    "/www/api2/json";
+        "/var/www/erp24/api2/json";
+
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
 
-    public function actionRequest() {
+    public function actionRequest()
+    {
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
 
         $request = Yii::$app->request->getRawBody();
@@ -238,7 +241,8 @@ class DataController extends BaseController {
         return $this->asJson(json_decode($json, true));
     }
 
-    private function getWriteOffsSetStatusSend($writeOffIds) {
+    private function getWriteOffsSetStatusSend($writeOffIds)
+    {
         try {
             $writeOffsErp = WriteOffsErp::find()->where(['in', 'id', $writeOffIds])->all();
             foreach ($writeOffsErp as $writeOffsErpElem) {
@@ -255,7 +259,8 @@ class DataController extends BaseController {
         }
     }
 
-    private function getWaybillWriteOffsSetStatusSend($waybillWriteOffIds) {
+    private function getWaybillWriteOffsSetStatusSend($waybillWriteOffIds)
+    {
         try {
             $waybillWriteOffsErp = WaybillWriteOffs::find()->where(['in', 'id', $waybillWriteOffIds])->all();
             foreach ($waybillWriteOffsErp as $waybillWriteOffsErpElem) {
@@ -268,11 +273,12 @@ class DataController extends BaseController {
                 }
             }
         } catch (Exception $e3) {
-            file_put_contents(self::OUT_DIR . '/log_created_waybill_write_offs_erp_error.txt', PHP_EOL . date("d.m.Y H:i:s",time()). $e3->getMessage(), FILE_APPEND);
+            file_put_contents(self::OUT_DIR . '/log_created_waybill_write_offs_erp_error.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . $e3->getMessage(), FILE_APPEND);
         }
     }
 
-    private function getWaybillIncomingSetStatusSend($waybillIncomingIds) {
+    private function getWaybillIncomingSetStatusSend($waybillIncomingIds)
+    {
         try {
             $waybillIncoming = WaybillIncoming::find()->where(['in', 'id', $waybillIncomingIds])->all();
             foreach ($waybillIncoming as $waybillIncomingElem) {
@@ -409,7 +415,7 @@ class DataController extends BaseController {
                 foreach ($additionalProducts as $product) {
                     $waybillWriteOffProducts[$product['waybill_write_offs_id']][] = [
                         'product_id' => $product['product_id'],
-                        'quantity' => (string) $product['product_count'],
+                        'quantity' => (string)$product['product_count'],
                         'price' => $product['product_price'],
                     ];
                 }
@@ -444,7 +450,8 @@ class DataController extends BaseController {
         ];
     }
 
-    private function getWaybillIncomingDoc() : array {
+    private function getWaybillIncomingDoc(): array
+    {
         $waybillIncoming = [];
         $waybillIncomingIds = [];
         $waybillIncomingResult = [];
@@ -480,7 +487,7 @@ class DataController extends BaseController {
                 foreach ($products as $product) {
                     $waybillIncomingProducts[$product['waybill_incoming_id']][] = [
                         'product_id' => $product['product_id'],
-                        'quantity' => (string) $product['product_count'],
+                        'quantity' => (string)$product['product_count'],
                         'price' => $product['product_self_cost'],
                     ];
                 }
@@ -592,7 +599,7 @@ class DataController extends BaseController {
                         'store_id' => $row['store_guid'],
                         'type' => 'ревизия пересортица при передаче смены',
                         'cause' => $cause,
-                        'comment' => $cause .' '. $row['comment'],
+                        'comment' => $cause . ' ' . $row['comment'],
                         'items' => $row['items'],
 
                     ];
@@ -648,7 +655,8 @@ class DataController extends BaseController {
         return $result;
     }
 
-    public function actionUpload() {
+    public function actionUpload()
+    {
         set_time_limit(600);
         file_put_contents(self::OUT_DIR . '/a2_upload_in.json', PHP_EOL . date('Y-m-d H:i:s') . ' ', FILE_APPEND | LOCK_EX);
 
@@ -1096,7 +1104,7 @@ class DataController extends BaseController {
                                         json_encode(
                                             [
                                                 "error_id" => 11,
-                                            "error" => $writeOffsErp->getErrors()
+                                                "error" => $writeOffsErp->getErrors()
                                             ],
                                             JSON_UNESCAPED_UNICODE
                                         )
@@ -2237,8 +2245,8 @@ class DataController extends BaseController {
 
     private function insertDataSales($values, $tableName, $columns, $chunks = 1000)
 
-        {
-            $chunkValues = array_chunk($values, $chunks);
+    {
+        $chunkValues = array_chunk($values, $chunks);
 
         foreach ($chunkValues as $key => $rows) {
 
@@ -2250,11 +2258,12 @@ class DataController extends BaseController {
                 $errorString = substr($e->getMessage(), 0, 2000);
                 file_put_contents(self::OUT_DIR . '/error_upload.txt',
                     PHP_EOL . $errorString, FILE_APPEND
-                );$transaction->rollBack();
+                );
+                $transaction->rollBack();
                 InfoLogService::setInfoLog(__FILE__, __LINE__, $tableName, 'error_id_25');
                 InfoLogService::setInfoLog(__FILE__, __LINE__, $errorString, 'error_id_25_22');
                 LogService::apiErrorLog(json_encode(["error_id" => 25, "error" => $errorString], JSON_UNESCAPED_UNICODE)
-                    );
+                );
             }
         }
     }

diff --git a/erp24/migrations/m241219_102318_change_replacement_invocie_column.php b/erp24/migrations/m241219_102318_change_replacement_invocie_column.php
new file mode 100644 (file)
index 0000000..40ce430
--- /dev/null
+++ b/erp24/migrations/m241219_102318_change_replacement_invocie_column.php
@@ -0,0 +1,35 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m241219_102318_change_replacement_invocie_column
+ */
+class m241219_102318_change_replacement_invocie_column extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $tableSchema = $this->db->getTableSchema('erp24.replacement_invoice', true);
+        $column = $tableSchema->getColumn('number_1c');
+
+        if ($column && $column->type === 'string' && $column->size === 100) {
+            $this->alterColumn('erp24.replacement_invoice', 'number_1c', $this->text()->comment('Название документа в 1с'));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $tableSchema = $this->db->getTableSchema('erp24.replacement_invoice', true);
+        $column = $tableSchema->getColumn('number_1c');
+
+        if ($column && $column->type === 'text') {
+            $this->alterColumn('erp24.replacement_invoice', 'number_1c', $this->string(100)->null()->comment('Название документа в 1с'));
+        }
+    }
+}

diff --git a/erp24/records/ReplacementInvoice.php b/erp24/records/ReplacementInvoice.php
index 5e5f78a641ab4af396f931d8fca801a323eba2c5..14b19d2304b599f519d679875b7048992e7ffa12 100644 (file)
--- a/erp24/records/ReplacementInvoice.php
+++ b/erp24/records/ReplacementInvoice.php
@@ -69,7 +69,7 @@ class ReplacementInvoice extends \yii\db\ActiveRecord
             [['status', 'created_admin_id', 'updated_admin_id', 'confirm_admin_id', 'store_id'], 'default', 'value' => null],
             [['status', 'created_admin_id', 'updated_admin_id', 'confirm_admin_id', 'store_id','shift_transfer_id'], 'integer'],
             [['date', 'created_at', 'updated_at', 'send_at'], 'safe'],
-            [['comment'], 'string'],
+            [['comment', 'text'], 'string'],
             [['summ', 'summ_self_cost',  'quantity'], 'number'],
             [['guid', 'store_guid', 'number', 'number_1c'], 'string', 'max' => 100],
             [['guid'], 'unique'],