|
@@ -712,8 +712,15 @@ class Decision extends Api
|
|
|
if ($value['印刷方式'] === '卷对卷' && $value['版距'] != 0) {
|
|
if ($value['印刷方式'] === '卷对卷' && $value['版距'] != 0) {
|
|
|
$value['产量'] = (int)round($value['产量'] / $value['版距'] * 1000);
|
|
$value['产量'] = (int)round($value['产量'] / $value['版距'] * 1000);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ if($value['墨色数'] == 0 && $value['设备编组'] !== '11、检品机组'){
|
|
|
|
|
+ $value['墨色数'] = 1;
|
|
|
|
|
+ }
|
|
|
|
|
+ if($value['设备编组'] === '11、检品机组'){
|
|
|
|
|
+ $value['墨色数'] = 0;
|
|
|
|
|
+ }
|
|
|
$data[$key] = [
|
|
$data[$key] = [
|
|
|
|
|
+ 'gdbh' => $value['工单编号'],
|
|
|
|
|
+ 'ms' => $value['墨色数'],
|
|
|
'产量' => $value['产量'],
|
|
'产量' => $value['产量'],
|
|
|
'墨色' => $value['产量'] * $value['墨色数'],
|
|
'墨色' => $value['产量'] * $value['墨色数'],
|
|
|
'设备编组' => $value['设备编组']
|
|
'设备编组' => $value['设备编组']
|
|
@@ -726,23 +733,22 @@ class Decision extends Api
|
|
|
$key = substr($item['设备编组'], 5, 6);
|
|
$key = substr($item['设备编组'], 5, 6);
|
|
|
if (!isset($grouped[$key])) {
|
|
if (!isset($grouped[$key])) {
|
|
|
$grouped[$key] = [
|
|
$grouped[$key] = [
|
|
|
- '产量合计' => 0, // Will be integer after operations
|
|
|
|
|
|
|
+ '产量合计' => 0,
|
|
|
'工序名称' => $key,
|
|
'工序名称' => $key,
|
|
|
'色度数' => 0
|
|
'色度数' => 0
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Force integer casting during summation
|
|
|
|
|
|
|
+
|
|
|
$grouped[$key]['产量合计'] += (int)$item['产量'];
|
|
$grouped[$key]['产量合计'] += (int)$item['产量'];
|
|
|
$grouped[$key]['色度数'] += (int)$item['墨色'];
|
|
$grouped[$key]['色度数'] += (int)$item['墨色'];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Explicitly cast final sums to integers
|
|
|
|
|
|
|
+
|
|
|
foreach ($grouped as &$group) {
|
|
foreach ($grouped as &$group) {
|
|
|
$group['产量合计'] = (int)$group['产量合计'];
|
|
$group['产量合计'] = (int)$group['产量合计'];
|
|
|
$group['色度数'] = (int)$group['色度数'];
|
|
$group['色度数'] = (int)$group['色度数'];
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
$this->success('成功', array_values($grouped));
|
|
$this->success('成功', array_values($grouped));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|