|
@@ -1261,8 +1261,8 @@ class OrderSuperLoss extends Api
|
|
|
}
|
|
}
|
|
|
//计算工单实际投料
|
|
//计算工单实际投料
|
|
|
$data['实际投料'] = str_replace(',', '', number_format($data['投料'] * $data['ls'] * $data['ks'] / 10000, 4));
|
|
$data['实际投料'] = str_replace(',', '', number_format($data['投料'] * $data['ls'] * $data['ks'] / 10000, 4));
|
|
|
- if ($data['实际投料'] == 0){
|
|
|
|
|
-
|
|
|
|
|
|
|
+ if ($data['实际投料'] == 0 || $data['实际投料'] == null){
|
|
|
|
|
+ echo $workOrderData['jjcp_gdbh'];
|
|
|
}
|
|
}
|
|
|
//工单入仓数量
|
|
//工单入仓数量
|
|
|
$data['warehousing_num'] = $total_number[0];
|
|
$data['warehousing_num'] = $total_number[0];
|
|
@@ -1739,7 +1739,7 @@ class OrderSuperLoss extends Api
|
|
|
`计量单位`,
|
|
`计量单位`,
|
|
|
DATE(`入仓日期`) AS warehousing_date,
|
|
DATE(`入仓日期`) AS warehousing_date,
|
|
|
`入仓数量` AS warehousing_num,
|
|
`入仓数量` AS warehousing_num,
|
|
|
- SUM(DISTINCT `计划损耗`) AS `计划损耗`,
|
|
|
|
|
|
|
+ SUM(DISTINCT `班组分摊计划损耗`) AS `计划损耗`,
|
|
|
`废品合计`,
|
|
`废品合计`,
|
|
|
`印件无形损` as intangible_loss,
|
|
`印件无形损` as intangible_loss,
|
|
|
`材料废`,
|
|
`材料废`,
|
