|
@@ -1982,7 +1982,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
|
|
|
MesNotice mesNotice = mesNoticeService.getOne(new LbqWrapper<MesNotice>().eq(MesNotice::getBatchNo, order.getBatchNo()).eq(MesNotice::getBuType, "TASKDISTRIBUTE").ne(MesNotice::getStatus, "3").last("limit 1"));
|
|
|
MesNoticeLog mesNoticeLog = mesNoticeLogService.getOne(new LbqWrapper<MesNoticeLog>().eq(MesNoticeLog::getStatus,"4").eq(MesNoticeLog::getNoticeId, mesNotice.getId()).orderByDesc(MesNoticeLog::getCreateTime).last("limit 1"));
|
|
|
double plmenge = Double.parseDouble(order.getProduceNum().toString());
|
|
|
- mesNotice.setStatus("3").setWorkReport(mesNoticeLog!=null? String.valueOf(plmenge - Double.parseDouble(mesNoticeLog.getOrderInfo())): String.valueOf(plmenge));
|
|
|
+ mesNotice.setStatus("3").setOrderInfo(String.valueOf(plmenge)).setWorkReport(mesNoticeLog!=null? String.format("%.1f",(plmenge - Double.parseDouble(mesNoticeLog.getOrderInfo()))): String.valueOf(plmenge));
|
|
|
mesNoticeService.updateNoticeById(mesNotice);
|
|
|
//订单完成报工推送
|
|
|
}
|