Shohrat
/
g_sto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sewer attributes

This commit is contained in:
Shohrat 2023-11-23 18:47:30 +05:00
parent 68dbfd617e
commit c67d1f8001
28 changed files with 577 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/romanah/gokbakja/components/LoadTransport.php
View File

@ -211,14 +211,18 @@ class LoadTransport extends ComponentBase
$stock = Stock::where("type", 'rulon')->first();
$bag_type = $currentOrderItem->type_id;
$bag_size = $currentOrderItem->size_id;
$bag_size = $currentOrderItem->width;
$bag_gram = $currentOrderItem->rulon_gram;
$rulon_layer = $currentOrderItem->rulon_layer;
$color = $currentOrderItem->color_id;
$amountCalc = $currentOrderItem->amount;
$rulonCalc = RulonAction::with('product')
->whereHas('product', function($q)use($bag_type, $bag_size, $color){
->whereHas('product', function($q)use($bag_type, $bag_size, $color, $rulon_layer, $bag_gram){
$q->where('type_id', $bag_type)
->where('size_id', $bag_size)
->where('width', $bag_size)
->where('gram', $bag_gram)
->where('layer', $rulon_layer)
->where('color_id', $color);
})
->where("stock_id", $stock->id)
@ -232,9 +236,11 @@ class LoadTransport extends ComponentBase
if($rulonCalc > 0){
$rulonProducts = RulonAction::select('romanah_gokbakja_rulon_action.*')
->with('product')
->whereHas('product', function($q)use($bag_type, $bag_size, $color){
->whereHas('product', function($q)use($bag_type, $bag_size, $color, $rulon_layer, $bag_gram){
$q->where('type_id', $bag_type)
->where('size_id', $bag_size)
->where('width', $bag_size)
->where('gram', $bag_gram)
->where('layer', $rulon_layer)
->where('color_id', $color);
})
->with(['product' => function($q){

4
plugins/romanah/gokbakja/components/MachineProduction.php
View File

@ -300,7 +300,7 @@ class MachineProduction extends ComponentBase
<td><a href="#">' . ($machineProductions[$x]->date == null ? "" : Carbon::parse($machineProductions[$x]->date)->format('d.m.Y')) . '</a></td>
<td>' . $machineProductions[$x]->machine->name . '</td>
<td>' . $machineProductions[$x]->width . '</td>
<td>' . $machineProductions[$x]->gram . '</td>
<td>' . $machineProductions[$x]->gram . ' m2</td>
<td>' . $machineProductions[$x]->bag_type->name . '</td>
<td>' . ($machineProductions[$x]->color->name ?? "") . ', '. $machineProductions[$x]->layer .' gat</td>
<td><span class="badge badge-soft-success"
@ -412,7 +412,7 @@ class MachineProduction extends ComponentBase
<td><a href="#">' . ($machineProductionsFiltered[$x]->date == null ? "" : Carbon::parse($machineProductionsFiltered[$x]->date)->format('d.m.Y')) . '</a></td>
<td>' . $machineProductionsFiltered[$x]->machine->name . '</td>
<td>' . $machineProductionsFiltered[$x]->width . '</td>
<td>' . $machineProductionsFiltered[$x]->gram . '</td>
<td>' . $machineProductionsFiltered[$x]->gram . ' m2</td>
<td>' . $machineProductionsFiltered[$x]->bag_type->name . '</td>
<td>' . ($machineProductionsFiltered[$x]->color->name ?? "") . ', '. $machineProductionsFiltered[$x]->layer .' gat</td>
<td><span class="badge badge-soft-success"

17
plugins/romanah/gokbakja/components/OrderItem.php
View File

@ -12,6 +12,7 @@ use Carbon\Carbon;
use Flash;
use DB;
use October\Rain\Support\Facades\Flash as FacadesFlash;
use Romanah\Gokbakja\Models\LoadTransport as ModelsLoadTransport;
use Romanah\Gokbakja\Models\BagAction;
use Romanah\Gokbakja\Models\RulonAction;
use Romanah\Gokbakja\Models\Stock;
@ -126,6 +127,20 @@ class OrderItem extends ComponentBase
$editBtnPrice = '';
$editAmount = '';
$editDelete = '';
$status = '';
$loadedAmount = ModelsLoadTransport::where('order_item_id', $orderItems[$x]->id)->sum('loaded_amount');
if($loadedAmount > $orderItems[$x]->amount){
$diffLoaded = ($loadedAmount - $orderItems[$x]->amount);
$status = '<font style="color: darkgreen;">Tamamlandy (+'.$diffLoaded.')</font';
}else if($loadedAmount < $orderItems[$x]->amount){
$diffLoaded = ($orderItems[$x]->amount - $loadedAmount);
$status = '<font style="color: darkred;">Ýetmezçilik (-'.$diffLoaded.')</font';
}else if($loadedAmount == $orderItems[$x]->amount){
$status = '<font style="color: darkgreen;">Tamalandy</font';
}
if($orderItems[$x]->user_id != $user->id){
$editBtnPrice = '<a href="#"
@ -200,6 +215,8 @@ class OrderItem extends ComponentBase
$html_data .= '</td>
<td>'.$notCompleteCalc.'</td>
<td>'.$loadedAmount.'</td>
<td>'.$status.'</td>
<td>'.$orderItems[$x]->note.'</td>
<td>'.$editDelete.'</td>
</tr>';

101
plugins/romanah/gokbakja/components/Sewer.php
View File

@ -14,6 +14,8 @@ use Romanah\Gokbakja\Models\BagAction;
use Romanah\Gokbakja\Models\ProductionMachine;
use Romanah\Gokbakja\Models\PivotSewer;
use Romanah\Gokbakja\Models\RulonAction;
use Romanah\Gokbakja\Models\SewerMachine;
use Romanah\Gokbakja\Models\Shift;
use Romanah\Gokbakja\Models\Stock;
class Sewer extends ComponentBase
@ -36,6 +38,8 @@ class Sewer extends ComponentBase
$data = post();
$sewerProd = SewerModel::where("id", $data["sewerId"])->with("employee", "pivot_sewer")->first();
$shifts = Shift::get();
$sewerMachines = SewerMachine::get();
$html_data = '<div class="modal-header">
<h5 class="modal-title" id="mySmallModalLabel">Önümçilik No #' . $sewerProd->id . ', Rulon: ' . $sewerProd->pivot_sewer[0]->amount . ' kg</h5>
@ -43,19 +47,44 @@ class Sewer extends ComponentBase
aria-label="Close"></button>
</div>
<div class="modal-body">
<form data-request="onUpdateSewerItem" method="POST" data-request-flash data-request-confirm="BRAK halta sanyna seretdinizmi?">
<form data-request="onUpdateSewerItem" method="POST" data-request-flash data-request-confirm="BRAK halta sanyna seretdinizmi? Maglumatlar dogry bolsa Tassyklan.">
<div class="row">
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Status</label>
<select class="form-control select2" name="status">
<select class="form-control select2" name="status" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>
<option value="working"' . ($sewerProd->pivot_sewer[0]->status == 'working' ? "selected" : "") . '>Işlenýär</option>
<option value="complated" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "selected" : "") . '>Tamamlandy</option>
</select>
</div>
</div>
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Smen Saýlaň</label>
<select class="form-control select2" name="shift_id" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>';
for ($x = 0; $x < count($shifts); $x++) {
$html_data .= '<option value="'.$shifts[$x]->id.'" '.($sewerProd->shift_id == $shifts[$x]->id ? ' selected' : '').'>'.$shifts[$x]->desc.'</option>';
}
$html_data .='</select>
</div>
</div>
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Stanok Saýlaň</label>
<select class="form-control select2" name="sewer_machine_id" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>';
for ($x = 0; $x < count($sewerMachines); $x++) {
$html_data .= '<option value="'.$sewerMachines[$x]->id.'" '.($sewerProd->sewer_machine_id == $sewerMachines[$x]->id ? ' selected' : '').'>'.$sewerMachines[$x]->name.'</option>';
}
$html_data .='</select>
</div>
</div>
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Ugramaly Senesi</label>
@ -88,7 +117,7 @@ class Sewer extends ComponentBase
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Tikilen Halta</label>
<label class="form-label">Tikilen Halta (arassa)</label>
<input type="number" name="produced_bag_qty" class="form-control"
placeholder="tikilen halta sany" value="' . ($sewerProd->produced_bag_qty ?? 0) . '" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>
@ -101,7 +130,29 @@ class Sewer extends ComponentBase
<label class="form-label">BRAK Halta sany</label>
<input type="number" name="defective_bag_qty" class="form-control"
placeholder="brak halta sany" value="' . ($sewerProd->defective_bag_qty ?? 0) . '" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>
placeholder="brak halta sany" value="' . ($sewerProd->defective_bag_qty ?? '') . '" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>
</div>
</div>
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Sürülmedik Halta sany</label>
<input type="number" name="defective_repair_qty" class="form-control"
placeholder="Sürülmedik Halta sany" value="' . ($sewerProd->defective_repair_qty ?? 0) . '" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . '>
</div>
</div>
<div class="col-md-12 mt-3">
<div>
<label class="form-label">Turba agramy</label>
<input type="number" name="pipe_weight" class="form-control"
placeholder="Turba agramy" value="' . ($sewerProd->pipe_weight ?? 0) . '" ' . ($sewerProd->pivot_sewer[0]->status == 'complated' ? "disabled" : "") . ' step="0.01"
pattern="/^-?\d+\.?\d*$/"
onKeyPress="if(this.value.length==4) return false;">
</div>
</div>
@ -148,9 +199,16 @@ class Sewer extends ComponentBase
// $spentCalc = (float)((float) $pivotSewer->amount - (float) $data["left_amount"]);
$spentCalc = (float)((float) $data["produced_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000;
$spentCalcDefective = (float)((float) $data["defective_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000;
$spentCalcDefectiveRepair = (float)((float) $data["defective_repair_qty"] * (float) $pivotSewer->bag_gram) / 1000;
$spentCalcDefectiveAll = (float)($spentCalcDefective + $spentCalcDefectiveRepair);
$leftCalc = (float)((float)$pivotSewer->amount - $spentCalc);
$sewer->shift_id = $data["shift_id"];
$sewer->sewer_machine_id = $data["sewer_machine_id"];
$sewer->defective_repair_qty = (float) $data["defective_repair_qty"];
$sewer->pipe_weight = (float) $data["pipe_weight"];
$sewer->produced_bag_qty = (float) $data["produced_bag_qty"];
$sewer->defective_bag_qty = (float) $data["defective_bag_qty"];
@ -160,9 +218,9 @@ class Sewer extends ComponentBase
$sewer->note = $data["note"];
$sewer->save();
$pivotSewer->left_amount = (float) ((float)$leftCalc - (float)$spentCalcDefective);
$pivotSewer->spent_amount = (float) ((float)$spentCalc + (float)$spentCalcDefective);
$pivotSewer->spent_defective_amount = (float) $spentCalcDefective;
$pivotSewer->left_amount = (float) ((float)$leftCalc - (float)$spentCalcDefectiveAll);
$pivotSewer->spent_amount = (float) ((float)$spentCalc + (float)$spentCalcDefectiveAll);
$pivotSewer->spent_defective_amount = (float) $spentCalcDefectiveAll;
$pivotSewer->status = $data["status"];
$pivotSewer->save();
@ -215,7 +273,7 @@ class Sewer extends ComponentBase
$crudSewerProductionq = $this->page["crudSewerProduction"];
$sewerDatas = SewerModel::with(["employee"])->with(["pivot_sewer" => function ($q) {
$sewerDatas = SewerModel::with(["employee", "shift", "sewer_machine"])->with(["pivot_sewer" => function ($q) {
$q->with(["rulon_action.product.bag_type", "rulon_action.product.bag_size", "rulon_action.product.color"]);
}])->orderBy('id', 'DESC')->get();
@ -270,28 +328,32 @@ class Sewer extends ComponentBase
$html_data .= '<tr>
<td style="font-weight: bold;">' . ($x + 1) . '</td>
<td>' . $dateTitle . '</td>
<td style="font-weight: bold;"> #Dikiş' . $sewerDatas[$x]->id . '</td>
<td> #Rulon' . $sewerDatas[$x]->pivot_sewer[0]->rulon_action->product_id . '- ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->width ?? "") . 'x' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->height ?? "") . 'm2, ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_type->name ?? "") . ', ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->color->name ?? "") . '
</td>
<td><span class="badge badge-soft-success"
style="font-size: 14px;">' . number_format($sewerDatas[$x]->pivot_sewer[0]->amount, 2) . ' kg</span>
</td>
<td><span class="badge badge-soft-primary"
style="font-size: 14px;">ini: ' . ($sewerDatas[$x]->width ?? "") . '- boyy:' . ($sewerDatas[$x]->height ?? "") . ' </span>
</td>
<td> #Rulon' . $sewerDatas[$x]->pivot_sewer[0]->rulon_action->product_id . '- ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->width ?? "") . 'x' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->height ?? "") . 'm2, ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_type->name ?? "") . ', ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->color->name ?? "") . '
</td>
<td><a href="#" style="font-weight: bold;">' . ($sewerDatas[$x]->employee_id == 0 ? 'Tikinçi ýok' : $sewerDatas[$x]->employee->name) . '</a></td>
<td>' . $dateTitle . '</td>
<td><a href="#" style="font-weight: bold;">' . ($sewerDatas[$x]->sewer_machine->name ?? "") . '</a></td>
<td>' . (number_format($sewerDatas[$x]->pivot_sewer[0]->bag_gram ?? 0, 2)) . ' gr</td>
<td><span class="badge badge-soft-success"
style="font-size: 14px;">' . number_format($sewerDatas[$x]->pivot_sewer[0]->amount, 2) . ' kg</span>
</td>
<td>' . ($sewerDatas[$x]->produced_bag_qty ?? 0) . '</td>
<td>' . ($sewerDatas[$x]->defective_bag_qty ?? 0) . '</td>
<td style="color: darkgreen !important;">' . ($sewerDatas[$x]->produced_bag_qty ?? 0) . '</td>
<td style="color: darkred !important;">' . ($sewerDatas[$x]->defective_bag_qty ?? 0) . '</td>
<td style="color: darkred !important;">' . ($sewerDatas[$x]->defective_repair_qty ?? 0) . '</td>
<td>' . number_format($sewerDatas[$x]->pivot_sewer[0]->spent_amount, 2) . ' kg</td>
<td>' . number_format($sewerDatas[$x]->pivot_sewer[0]->left_amount, 2) . ' kg</td>
<td><span class="badge badge-soft-warning"
style="font-size: 14px;">' . $statusTitle . '</span></td>
<td>' . $sewerDatas[$x]->note . '</td>
<td>' . $sewerDatas[$x]->note . ' turba: '.$sewerDatas[$x]->pipe_weight.'</td>
<td>
' . $editBtn . '
</td>
@ -467,7 +529,8 @@ class Sewer extends ComponentBase
// dd($leftAmount);
$createSewer = new SewerModel();
$createSewer->employee_id = $data["employee_id"];
$createSewer->shift_id = $data["shift_id"];
$createSewer->sewer_machine_id = $data["sewer_machine_id"];
$createSewer->produced_bag_qty = 0;
$createSewer->defective_bag_qty = 0;
$createSewer->user_id = $user->id;

18
plugins/romanah/gokbakja/controllers/SewerMachine.php Normal file
View File

@ -0,0 +1,18 @@
<?php namespace Romanah\Gokbakja\Controllers;
use Backend\Classes\Controller;
use BackendMenu;
class SewerMachine extends Controller
{
public $implement = [ 'Backend\Behaviors\ListController', 'Backend\Behaviors\FormController' ];
public $listConfig = 'config_list.yaml';
public $formConfig = 'config_form.yaml';
public function __construct()
{
parent::__construct();
BackendMenu::setContext('Romanah.Gokbakja', 'main-menu-item5', 'side-menu-item4');
}
}

18
plugins/romanah/gokbakja/controllers/sewermachine/_list_toolbar.htm Normal file
View File

@ -0,0 +1,18 @@
<div data-control="toolbar">
<a href="<?= Backend::url('romanah/gokbakja/sewermachine/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
<button
class="btn btn-default oc-icon-trash-o"
disabled="disabled"
onclick="$(this).data('request-data', {
checked: $('.control-list').listWidget('getChecked')
})"
data-request="onDelete"
data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
data-trigger-action="enable"
data-trigger=".control-list input[type=checkbox]"
data-trigger-condition="checked"
data-request-success="$(this).prop('disabled', true)"
data-stripe-load-indicator>
<?= e(trans('backend::lang.list.delete_selected')) ?>
</button>
</div>

10
plugins/romanah/gokbakja/controllers/sewermachine/config_form.yaml Normal file
View File

@ -0,0 +1,10 @@
name: SewerMachine
form: $/romanah/gokbakja/models/sewermachine/fields.yaml
modelClass: Romanah\Gokbakja\Models\SewerMachine
defaultRedirect: romanah/gokbakja/sewermachine
create:
redirect: 'romanah/gokbakja/sewermachine/update/:id'
redirectClose: romanah/gokbakja/sewermachine
update:
redirect: romanah/gokbakja/sewermachine
redirectClose: romanah/gokbakja/sewermachine

12
plugins/romanah/gokbakja/controllers/sewermachine/config_list.yaml Normal file
View File

@ -0,0 +1,12 @@
list: $/romanah/gokbakja/models/sewermachine/columns.yaml
modelClass: Romanah\Gokbakja\Models\SewerMachine
title: SewerMachine
noRecordsMessage: 'backend::lang.list.no_records'
showSetup: true
showCheckboxes: true
recordsPerPage: 20
toolbar:
buttons: list_toolbar
search:
prompt: 'backend::lang.list.search_prompt'
recordUrl: 'romanah/gokbakja/sewermachine/update/:id'

46
plugins/romanah/gokbakja/controllers/sewermachine/create.htm Normal file
View File

@ -0,0 +1,46 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>">SewerMachine</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

1
plugins/romanah/gokbakja/controllers/sewermachine/index.htm Normal file
View File

@ -0,0 +1 @@
<?= $this->listRender() ?>

22
plugins/romanah/gokbakja/controllers/sewermachine/preview.htm Normal file
View File

@ -0,0 +1,22 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>">SewerMachine</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<div class="form-preview">
<?= $this->formRenderPreview() ?>
</div>
<?php else: ?>
<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<?php endif ?>
<p>
<a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>" class="btn btn-default oc-icon-chevron-left">
<?= e(trans('backend::lang.form.return_to_list')) ?>
</a>
</p>

54
plugins/romanah/gokbakja/controllers/sewermachine/update.htm Normal file
View File

@ -0,0 +1,54 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>">SewerMachine</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>
<?php if (!$this->fatalError): ?>
<?= Form::open(['class' => 'layout']) ?>
<div class="layout-row">
<?= $this->formRender() ?>
</div>
<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-request-data="redirect:0"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<button
type="button"
class="oc-icon-trash-o btn-icon danger pull-right"
data-request="onDelete"
data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>
<?= Form::close() ?>
<?php else: ?>
<p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
<p><a href="<?= Backend::url('romanah/gokbakja/sewermachine') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
<?php endif ?>

27
plugins/romanah/gokbakja/models/SewerMachine.php Normal file
View File

@ -0,0 +1,27 @@
<?php namespace Romanah\Gokbakja\Models;
use Model;
/**
* Model
*/
class SewerMachine extends Model
{
use \October\Rain\Database\Traits\Validation;
use \October\Rain\Database\Traits\SoftDelete;
protected $dates = ['deleted_at'];
/**
* @var string The database table used by the model.
*/
public $table = 'romanah_gokbakja_sewer_machine';
/**
* @var array Validation rules
*/
public $rules = [
];
}

8
plugins/romanah/gokbakja/models/SewerProduction.php
View File

@ -30,6 +30,14 @@ class SewerProduction extends Model
'Romanah\Gokbakja\Models\RulonAction',
'key' => 'rulon_action_id'
],
'shift' => [
'Romanah\Gokbakja\Models\Shift',
'key' => 'shift_id'
],
'sewer_machine' => [
'Romanah\Gokbakja\Models\SewerMachine',
'key' => 'sewer_machine_id'
],
];
/**

10
plugins/romanah/gokbakja/models/sewermachine/columns.yaml Normal file
View File

@ -0,0 +1,10 @@
columns:
id:
label: id
type: number
name:
label: name
type: text
note:
label: note
type: text

10
plugins/romanah/gokbakja/models/sewermachine/fields.yaml Normal file
View File

@ -0,0 +1,10 @@
fields:
name:
label: Ady
span: auto
type: text
note:
label: Bellik
span: auto
size: ''
type: textarea

6
plugins/romanah/gokbakja/plugin.yaml
View File

@ -72,13 +72,17 @@ navigation:
label: Tikinçiler
url: romanah/gokbakja/sewerproduction
icon: icon-simplybuilt
side-menu-item4:
label: 'Tikinçi enjamlar'
url: romanah/gokbakja/sewermachine
icon: icon-sitemap
main-menu-item6:
label: Korpslar
url: romanah/gokbakja/building
icon: icon-building
sideMenu:
side-menu-item:
label: Enjamlar
label: 'Rulon Enjamlar'
url: romanah/gokbakja/machine
icon: icon-codepen
side-menu-item2:

26
plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_sewer_machines.php Normal file
View File

@ -0,0 +1,26 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableCreateRomanahGokbakjaSewerMachines extends Migration
{
public function up()
{
Schema::create('romanah_gokbakja_sewer_machines', function($table)
{
$table->engine = 'InnoDB';
$table->increments('id')->unsigned();
$table->timestamp('created_at')->nullable();
$table->timestamp('updated_at')->nullable();
$table->timestamp('deleted_at')->nullable();
$table->string('name');
$table->text('note');
});
}
public function down()
{
Schema::dropIfExists('romanah_gokbakja_sewer_machines');
}
}

17
plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_machine.php Normal file
View File

@ -0,0 +1,17 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateRomanahGokbakjaSewerMachine extends Migration
{
public function up()
{
Schema::rename('romanah_gokbakja_sewer_machines', 'romanah_gokbakja_sewer_machine');
}
public function down()
{
Schema::rename('romanah_gokbakja_sewer_machine', 'romanah_gokbakja_sewer_machines');
}
}

29
plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_10.php Normal file
View File

@ -0,0 +1,29 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateRomanahGokbakjaSewerProduction10 extends Migration
{
public function up()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->double('defective_repair_qty', 10, 0)->nullable();
$table->integer('machine_id')->nullable();
$table->double('pipe_weight', 10, 0)->nullable();
$table->integer('shift_id')->nullable();
});
}
public function down()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->dropColumn('defective_repair_qty');
$table->dropColumn('machine_id');
$table->dropColumn('pipe_weight');
$table->dropColumn('shift_id');
});
}
}

23
plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_11.php Normal file
View File

@ -0,0 +1,23 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateRomanahGokbakjaSewerProduction11 extends Migration
{
public function up()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->renameColumn('machine_id', 'sewer_machine_id');
});
}
public function down()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->renameColumn('sewer_machine_id', 'machine_id');
});
}
}

23
plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_12.php Normal file
View File

@ -0,0 +1,23 @@
<?php namespace Romanah\Gokbakja\Updates;
use Schema;
use October\Rain\Database\Updates\Migration;
class BuilderTableUpdateRomanahGokbakjaSewerProduction12 extends Migration
{
public function up()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->integer('employee_id')->nullable()->change();
});
}
public function down()
{
Schema::table('romanah_gokbakja_sewer_production', function($table)
{
$table->integer('employee_id')->nullable(false)->change();
});
}
}

15
plugins/romanah/gokbakja/updates/version.yaml
View File

@ -411,3 +411,18 @@
1.0.138:
- 'Updated table romanah_gokbakja_order_item'
- builder_table_update_romanah_gokbakja_order_item_10.php
1.0.139:
- 'Updated table romanah_gokbakja_sewer_production'
- builder_table_update_romanah_gokbakja_sewer_production_10.php
1.0.140:
- 'Created table romanah_gokbakja_sewer_machines'
- builder_table_create_romanah_gokbakja_sewer_machines.php
1.0.141:
- 'Updated table romanah_gokbakja_sewer_production'
- builder_table_update_romanah_gokbakja_sewer_production_11.php
1.0.142:
- 'Updated table romanah_gokbakja_sewer_machines'
- builder_table_update_romanah_gokbakja_sewer_machine.php
1.0.143:
- 'Updated table romanah_gokbakja_sewer_production'
- builder_table_update_romanah_gokbakja_sewer_production_12.php

2
themes/gokbakja/assets/js/pages/datatables.init.js
View File

@ -176,4 +176,4 @@ $(document).ready(function () {
$(".dataTables_paginate > .pagination").addClass("pagination-rounded"), $(".dataTables_length select").addClass("form-select form-select-sm")
}
})
});
});

8
themes/gokbakja/pages/orders/order-detail.htm
View File

@ -216,7 +216,9 @@ function onStart(){
<th>Mukdary</th>
<th>Jemi</th>
<th>SKLATDA</th>
<th>Ýetmezçilik</th>
<th>Sklatda Ýetmezçilik</th>
<th style="background: peachpuff !important;">ÝÜKLENEN</th>
<th>Status</th>
<th>Bellik</th>
<th>POZ</th>
</tr>
@ -233,7 +235,9 @@ function onStart(){
<th>Mukdary</th>
<th>Jemi</th>
<th>SKLATDA</th>
<th>Ýetmezçilik</th>
<th>Sklatda Ýetmezçilik</th>
<th style="background: peachpuff !important;">ÝÜKLENEN</th>
<th>Status</th>
<th>Bellik</th>
<th>POZ</th>
</tr>

6
themes/gokbakja/pages/orders/order-detaillogistics.htm
View File

@ -201,7 +201,7 @@ function onStart(){
</td>
<td>
{% if transport.status != "complated" %}
{% if transport.shipping.order.user_id == user.id %}
@ -215,11 +215,13 @@ function onStart(){
<a href="/orders/transport/loaded/{{orderId}}/{{transport.id}}" type="button" class="btn btn-primary waves-light waves-effect"><i class="fa fa-truck-loading"></i></a>
{% else %}
<a href="/orders/transport/loaded/{{orderId}}/{{transport.id}}" type="button" class="btn btn-primary waves-light waves-effect"><i class="fa fa-truck-loading"></i></a>
{% endif %}
{% endif %}
</td>
</tr>

31
themes/gokbakja/pages/orders/transportloaded.htm
View File

@ -28,7 +28,7 @@ function onStart(){
$this["transport"] = Romanah\Gokbakja\Models\ShippingTransport::where("id", $this["transportId"] )->first();
$this["loadedItemsSum"] = Romanah\Gokbakja\Models\LoadTransport::where("order_id", $orderId)->where("transport_id", $this["transportId"])->with("order_item")->sum("loaded_amount");
@ -146,7 +146,7 @@ function onStart(){
{% endif %}
, Sene: {{transport.date|date('d.m.Y')}},
{{transport.transport_no}},
{{transport.note}}
<font style="color: darkgreen;">JEMI ÝÜKLENEN: {{loadedItemsSum}} kg</font>
</h3>
<p class="card-title-desc" style="color: #6c6ff5;font-size: 17px;" ></p>
</div>
@ -155,10 +155,15 @@ function onStart(){
<i class="ri-arrow-left-line align-middle ms-2" style="font-size: 17px;"></i> Yza
</a>
{% if crudOrders %}
{% if order.user_id == user.id %}
<a class="btn btn-primary" data-bs-toggle="collapse" href="#multiCollapseExample1"
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">Haryt Ýükle</a>
{% endif %}
{% if order.user_id == user.id %}
{% if transport.status == 'loading' or transport.status == 'loaded' %}
<a class="btn btn-primary" data-bs-toggle="collapse" href="#multiCollapseExample1"
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">Haryt Ýükle</a>
{% endif %}
{% endif %}
{% endif %}
</div>
@ -201,10 +206,14 @@ function onStart(){
data-request-data="itemId: {{loadedItem.id}}"
data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1" type="button" class="btn btn-warning waves-light waves-effect"><i class="fa fa-pen"></i></button> -->
{% if crudOrders %}
<button data-request="onDeleteItem"
data-request-confirm="Tapgyr #{{loadedItem.id}} pozmak isleýäňizmi?"
data-request-data="itemId: {{loadedItem.id}}"
type="button" class="btn btn-danger waves-light waves-effect"><i class="fa fa-trash-alt"></i></button>
{% if transport.status == 'loading' or transport.status == 'loaded' %}
<button data-request="onDeleteItem"
data-request-confirm="Tapgyr #{{loadedItem.id}} pozmak isleýäňizmi?"
data-request-data="itemId: {{loadedItem.id}}"
type="button" class="btn btn-danger waves-light waves-effect"><i class="fa fa-trash-alt"></i></button>
{% endif %}
{% endif %}
{% else %}
@ -275,7 +284,7 @@ function onStart(){
if(data.productFromStock.orderItemType == "rulon"){
var option = '';
for (var item of data.productFromStock.products) {
option += `<option value="`+item.product_id+`">#Rulon` + (item.product_id) + `- sklatda: ` + (item.quantity) + ` kg, ` + (item.product.bag_type.name)+`,`+ (item.product.bag_size.name)+`,`+ (item.product.color.name) +`</option>`;
option += `<option value="`+item.product_id+`">#Rulon` + (item.product_id) + `- sklatda: ` + (item.quantity) + ` kg, ` + (item.product.bag_type.name)+`, Ölçegi: `+ (item.product.width)+`, ` + (item.product.gram)+ `m2, `+ (item.product.layer) + ` gat, ` + (item.product.color.name) +`</option>`;
}
dropDownProducts +=option;
// console.log(option);

91
themes/gokbakja/pages/sewer/new.htm
View File

@ -7,7 +7,8 @@ is_hidden = 0
==
<?php
function onStart(){
$this["employees"] = Romanah\Gokbakja\Models\Employee::where("status", 1)->where("is_sewer", 1)->get();
$this["shifts"] = Romanah\Gokbakja\Models\Shift::get();
$this["sewerMachines"] = Romanah\Gokbakja\Models\SewerMachine::get();
//dd($pivotSewersWorking);
@ -16,7 +17,7 @@ function onStart(){
$this["rulonsInStock"] = Romanah\Gokbakja\Models\RulonAction::select('romanah_gokbakja_rulon_action.*')
->with(['product' => function($q){
$q->with(['bag_type', 'bag_size', 'color']);
$q->with(['bag_type', 'bag_size', 'color', 'machine']);
}])
->where("stock_id", $stockId)
->addSelect(DB::raw("SUM(amount) as quantity"))
@ -49,11 +50,21 @@ function onStart(){
<div class="card-body">
<div class="row">
<div class="col">
<label class="form-label">Tikinçi Saýlaň</label>
<select class="form-control select2" name="employee_id">
<label class="form-label">Smen Saýlaň</label>
<select class="form-control select2" name="shift_id">
<option value="0">Saýla</option>
{% for employee in employees %}
<option value="{{employee.id}}">{{employee.name}}</option>
{% for shift in shifts %}
<option value="{{shift.id}}">{{shift.desc}}</option>
{% endfor %}
</select>
</div>
<div class="col">
<label class="form-label">Stanok Saýlaň</label>
<select class="form-control select2" name="sewer_machine_id">
<option value="0">Saýla</option>
{% for sewerMachine in sewerMachines %}
<option value="{{sewerMachine.id}}">{{sewerMachine.name}}</option>
{% endfor %}
</select>
</div>
@ -63,7 +74,7 @@ function onStart(){
<div class="input-group" id="datepicker2">
<input type="text" class="form-control" name="date" placeholder="Sene"
data-date-format="d.m.yyyy" data-date-container='#datepicker2' data-provide="datepicker"
data-date-autoclose="true">
data-date-autoclose="true" required>
<span class="input-group-text"><i class="mdi mdi-calendar"></i></span>
</div>
@ -76,9 +87,12 @@ function onStart(){
{% if machineProduction.quantity > 0 %}
<option value="{{machineProduction.id}}">
#Rulon{{machineProduction.product_id}}-
{{machineProduction.product.bag_size.width}} x
{{machineProduction.product.bag_size.height}} m2,
{{machineProduction.product.bag_type.name}}, {{machineProduction.product.color.name}}
{{machineProduction.product.machine.name}} /
{{machineProduction.product.width}} x
{{machineProduction.product.gram}} m2,
{{machineProduction.product.bag_type.name}},
{{machineProduction.product.color.name}}
--({{machineProduction.quantity}} kg)
</option>
@ -91,7 +105,7 @@ function onStart(){
<label class="form-label">Halta Ini</label>
<input type="number" name="width" step="0.01" class="form-control"
placeholder="Halta Ini">
placeholder="Halta Ini" required>
</div>
</div>
@ -100,7 +114,7 @@ function onStart(){
<label class="form-label">Halta Boýy</label>
<input type="number" name="height" step="0.01" class="form-control"
placeholder="Halta Boýy">
placeholder="Halta Boýy" required>
</div>
</div>
<div class="col">
@ -108,10 +122,11 @@ function onStart(){
<label class="form-label">Halta agramy (gr)</label>
<input type="number" step="0.01" name="bag_gram" class="form-control"
placeholder="Halta gramy">
placeholder="Halta gramy" required>
</div>
</div>
<div class="col">
<div>
<label class="form-label">Bellik</label>
@ -142,8 +157,8 @@ function onStart(){
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Tikinçiler boýunça</h3>
<p class="card-title-desc" style="color: #6c6ff5;">Hasabat</p>
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Halta Tikýän Staboklar</h3>
<p class="card-title-desc" style="color: #6c6ff5;">Hasabaty</p>
</div>
<div class="col-md-6" style="text-align: right;">
{% if crudSewerProduction %}
@ -160,21 +175,34 @@ function onStart(){
style="border-collapse: collapse; border-spacing: 0; width: 100%;" data-page-length='13'>
<thead>
<tr>
<th style="width: 5%;">№</th>
<th>Önümçilik No</th>
<th>Halta Görnüş</th>
<td rowspan="2">No</td>
<th rowspan="2">Senesi</th>
<th rowspan="2">Önümçilik No</th>
<th colspan="2">Berilen Rulon</th>
<th colspan="3">Halta Maglumaty</th>
<th colspan="3">Tikilen Halta</th>
<th colspan="2" >Ulanylan Rulon</th>
<th rowspan="2">Status</th>
<th rowspan="2">Bellik</th>
<th rowspan="2">Sazlamalar</th>
</tr>
<tr>
<th>Rulon Görnüş</th>
<th>Tikinçi</th>
<th>Senesi</th>
<th>Gram</th>
<th>Çig mal mukdary</th>
<th>Tikilen Halta</th>
<th>Halta Görnüş</th>
<th>Stanok</th>
<th>Gram</th>
<th>Halta (arassa)</th>
<th>BRAK Halta</th>
<th>Sürülmedik</th>
<th>Ulanylan</th>
<th>Galyndy</th>
<th>Status</th>
<th>Bellik</th>
<th>Sazlamalar</th>
<!-- <th>Настройки</th> -->
</tr>
</thead>
@ -186,15 +214,16 @@ function onStart(){
<tfoot>
<tr>
<th style="width: 5%;">№</th>
<th>Önümçilik No</th>
<th>Halta Görnüş</th>
<th>Rulon Görnüş</th>
<th>Tikinçi</th>
<th>Senesi</th>
<th>Gram</th>
<th>Önümçilik No</th>
<th>Rulon Görnüş</th>
<th>Çig mal mukdary</th>
<th>Tikilen Halta</th>
<th>Halta Görnüş</th>
<th>Stanok</th>
<th>Gram</th>
<th>Halta (arassa)</th>
<th>BRAK Halta</th>
<th>Sürülmedik</th>
<th>Ulanylan</th>
<th>Galyndy</th>
<th>Status</th>