生产日报表逻辑修改

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -250,7 +250,7 @@ public class MesReportWorkController extends BaseController {
 
 	@RequiresPermissions("mes:dailyReport:list")
 	@GetMapping("/getDailyReportNew")
-	@Log(title = "生成日报表查询", businessType = BusinessType.QUERY)
+	@Log(title = "生产日报表查询", businessType = BusinessType.QUERY)
 	public TableDataInfo getDailyReportNew(MesDailyReportVo mesDailyReportVo) {
 		startPage();
 		List<MesDailyReportVo> list = mesReportWorkService.getDailyReportNew(mesDailyReportVo);

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -456,10 +456,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 				sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto);
 			}
 			//三层订单
-			QuantityDto quantityDtothree = new QuantityDto();
+			QuantityDto threeMesReport =new QuantityDto();
-			quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode());
+			if (sonMesReport != null ){
-			quantityDtothree.setMachineCode(machineCode);
+				QuantityDto quantityDtothree = new QuantityDto();
-			QuantityDto threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree);
+				quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode());
+				quantityDtothree.setMachineCode(machineCode);
+				threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree);
+			}
+
 			// 产量
 			Long sumQua = 0L;
 			// 实际产量