|
|
@@ -1182,22 +1182,25 @@ class OrderSuperLoss extends Api
|
|
|
})
|
|
|
->select();
|
|
|
$data = [];
|
|
|
+
|
|
|
foreach ($list as $item) {
|
|
|
- $workshop = $item["车间名称"] ?? ''; // 获取车间名称
|
|
|
+ $workshop = $item["车间名称"] ?? '';
|
|
|
|
|
|
- // 遍历 8 个可能的员工字段
|
|
|
for ($i = 1; $i <= 8; $i++) {
|
|
|
$bh = $item["sczl_bh{$i}"] ?? '';
|
|
|
$xm = $item["Xm{$i}"] ?? '';
|
|
|
- $rate = (float)($item["sczl_rate{$i}"] ?? 0);
|
|
|
+ $rateValue = $item["sczl_rate{$i}"] ?? '';
|
|
|
+
|
|
|
+ // 关键修改:rate 为空时默认为 1
|
|
|
+ $rate = ($rateValue === '') ? 1 : (float)$rateValue;
|
|
|
|
|
|
if (!empty($bh)) {
|
|
|
$je = round((float)$item["CjsJe"] * $rate, 4);
|
|
|
|
|
|
- $data[] = [
|
|
|
+ $result[] = [
|
|
|
"bh" => $bh,
|
|
|
"xm" => $xm,
|
|
|
- "je" => (float)number_format($je, 4, '.', ''), // 保证4位小数
|
|
|
+ "je" => (float)number_format($je, 4, '.', ''),
|
|
|
"cj" => $workshop
|
|
|
];
|
|
|
}
|