Merge pull request 'changed logic against quality validation in production target plan' (#1087) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #1087
This commit was merged in pull request #1087.
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Livewire;
|
|||||||
use App\Exports\ProductionPlanExport;
|
use App\Exports\ProductionPlanExport;
|
||||||
use App\Models\ProductionPlan;
|
use App\Models\ProductionPlan;
|
||||||
use App\Models\ProductionQuantity;
|
use App\Models\ProductionQuantity;
|
||||||
|
use App\Models\QualityValidation;
|
||||||
use Livewire\Component;
|
use Livewire\Component;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use DB;
|
use DB;
|
||||||
@@ -23,10 +24,8 @@ class ProductionTargetPlan extends Component
|
|||||||
|
|
||||||
public $productionPlanDates = '';
|
public $productionPlanDates = '';
|
||||||
|
|
||||||
|
|
||||||
protected $listeners = [
|
protected $listeners = [
|
||||||
'loadData' => 'loadProductionData',
|
'loadData' => 'loadProductionData',
|
||||||
'loadCategoryData' => 'loadProductionDataCategory',
|
|
||||||
'loadData1' => 'exportProductionData',
|
'loadData1' => 'exportProductionData',
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -175,7 +174,6 @@ class ProductionTargetPlan extends Component
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function loadProductionData($year, $month, $plantId, $lineId, $category)
|
public function loadProductionData($year, $month, $plantId, $lineId, $category)
|
||||||
{
|
{
|
||||||
if (!$plantId || !$lineId || !$month || !$year) {
|
if (!$plantId || !$lineId || !$month || !$year) {
|
||||||
@@ -224,7 +222,7 @@ class ProductionTargetPlan extends Component
|
|||||||
|
|
||||||
$this->leaveDates = $leaveDates;
|
$this->leaveDates = $leaveDates;
|
||||||
|
|
||||||
$producedData = ProductionQuantity::selectRaw("
|
$producedData = QualityValidation::selectRaw("
|
||||||
plant_id,
|
plant_id,
|
||||||
line_id,
|
line_id,
|
||||||
item_id,
|
item_id,
|
||||||
@@ -301,7 +299,6 @@ class ProductionTargetPlan extends Component
|
|||||||
$this->records = $records;
|
$this->records = $records;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// public function loadProductionDataCategory($year, $month, $plantId, $lineId, $category)
|
// public function loadProductionDataCategory($year, $month, $plantId, $lineId, $category)
|
||||||
// {
|
// {
|
||||||
// if (!$plantId || !$lineId || !$month || !$year || !$category) {
|
// if (!$plantId || !$lineId || !$month || !$year || !$category) {
|
||||||
|
|||||||
Reference in New Issue
Block a user