From: fomichev Date: Wed, 18 Dec 2024 09:29:22 +0000 (+0300) Subject: Добавил смену статуса в $result['write_offs'] для waybill_write_offs X-Git-Tag: 1.7~151^2~1 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=cb61dbb76d09103ed76302cb507b12d3376ecb51;p=erp24_rep%2Fyii-erp24%2F.git Добавил смену статуса в $result['write_offs'] для waybill_write_offs --- diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index f8ed5f60..7819bccf 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -1028,12 +1028,25 @@ class DataController extends BaseController { if (empty($arr["error"]) && !empty($arr["id"])) { $writeOffsErp = WriteOffsErp::find()->where(['guid' => $arr["id"]])->one(); if ($writeOffsErp) { - $writeOffsErp->status = 4; + $writeOffsErp->status = WriteOffsErp::STATUS_CREATED_1С; $writeOffsErp->number_1c = $arr["number"]; $writeOffsErp->save(); if ($writeOffsErp->getErrors()) { LogService::apiErrorLog(json_encode(["error_id" => 11, "error" => $writeOffsErp->getErrors()], JSON_UNESCAPED_UNICODE)); } + } else { + $waybillWriteOffsErp = WaybillWriteOffs::find()->where(['guid' => $arr["id"]])->one(); + if ($waybillWriteOffsErp) { + $waybillWriteOffsErp->status = WriteOffsErp::STATUS_CREATED_1С; + $waybillWriteOffsErp->number_1c = $arr["number"]; + $waybillWriteOffsErp->save(); + if ($waybillWriteOffsErp->getErrors()) { + LogService::apiErrorLog( + json_encode(["error_id" => 11, "error" => $waybillWriteOffsErp->getErrors()], + JSON_UNESCAPED_UNICODE) + ); + } + } } } @@ -1989,25 +2002,29 @@ class DataController extends BaseController { - private function insertDataSales($values, $tableName, $columns, $chunks = 1000 ) { - $chunkValues = array_chunk($values, $chunks); - - foreach ($chunkValues as $key => $rows) { - - try { - $transaction = \Yii::$app->db->beginTransaction(); - Yii::$app->db->createCommand()->batchInsert($tableName, $columns, $rows)->execute(); - $transaction->commit(); - } catch (Exception $e) { - $errorString = substr($e->getMessage(), 0, 2000); - file_put_contents(self::OUT_DIR . '/error_upload.txt', - PHP_EOL . $errorString, FILE_APPEND); - $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)); - + private function insertDataSales($values, $tableName, $columns, $chunks = 1000) + { + $chunkValues = array_chunk($values, $chunks); + + foreach ($chunkValues as $key => $rows) { + try { + $transaction = \Yii::$app->db->beginTransaction(); + Yii::$app->db->createCommand()->batchInsert($tableName, $columns, $rows)->execute(); + $transaction->commit(); + } catch (Exception $e) { + $errorString = substr($e->getMessage(), 0, 2000); + file_put_contents( + self::OUT_DIR . '/error_upload.txt', + PHP_EOL . $errorString, + FILE_APPEND + ); + $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) + ); + } + } } - } - } }