Commit 1de8103f authored by 温志超's avatar 温志超

更新生产报工报表排产数量BUG

parent cd58819d
...@@ -7,6 +7,7 @@ import com.ximai.common.core.domain.BaseEntity; ...@@ -7,6 +7,7 @@ import com.ximai.common.core.domain.BaseEntity;
import com.ximai.mes.md.domain.MdItem; import com.ximai.mes.md.domain.MdItem;
import com.ximai.mes.md.domain.MdWorkstation; import com.ximai.mes.md.domain.MdWorkstation;
import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder; import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
import com.ximai.mes.pro.domain.task.ProTaskWorkunit;
import com.ximai.mes.pro.domain.vo.proWorkOrder.ProWorkOrderSoDirectiveReport; import com.ximai.mes.pro.domain.vo.proWorkOrder.ProWorkOrderSoDirectiveReport;
import com.ximai.mes.pro.domain.vo.proWorkOrder.ProWorkOrderSoSizeItemReport; import com.ximai.mes.pro.domain.vo.proWorkOrder.ProWorkOrderSoSizeItemReport;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
...@@ -326,12 +327,12 @@ public class ProFeedback extends BaseEntity { ...@@ -326,12 +327,12 @@ public class ProFeedback extends BaseEntity {
private Boolean lastFeedback; private Boolean lastFeedback;
public void initValue(ProWorkorder workorder) { public void initValue(ProWorkorder workorder, ProTaskWorkunit proTaskWorkunit) {
this.setWorkorderCode(workorder.getWorkorderCode()); this.setWorkorderCode(workorder.getWorkorderCode());
this.setWorkorderName(workorder.getWorkorderName()); this.setWorkorderName(workorder.getWorkorderName());
this.setUnitOfMeasure(workorder.getUnitOfMeasure()); this.setUnitOfMeasure(workorder.getUnitOfMeasure());
this.setItemId(workorder.getProductId()); this.setItemId(workorder.getProductId());
this.setQuantity(workorder.getQuantity()); this.setQuantity(proTaskWorkunit.getQuantity());
this.setItemCode(workorder.getProductCode()); this.setItemCode(workorder.getProductCode());
this.setItemName(workorder.getProductName()); this.setItemName(workorder.getProductName());
} }
......
...@@ -282,7 +282,7 @@ public class ProTaskAssistProcessServiceImpl implements IProTaskAssistProcessSer ...@@ -282,7 +282,7 @@ public class ProTaskAssistProcessServiceImpl implements IProTaskAssistProcessSer
ProWorkorder workorder = proWorkorderMapper.selectWorkorderById(feedback.getWorkorderId()); ProWorkorder workorder = proWorkorderMapper.selectWorkorderById(feedback.getWorkorderId());
ExceptionUtil.checkTrueThrowException(taskWorkunit == null, MessageUtils.message("pro.schedule.data.not.exists")); ExceptionUtil.checkTrueThrowException(taskWorkunit == null, MessageUtils.message("pro.schedule.data.not.exists"));
ExceptionUtil.checkTrueThrowException(!taskWorkunit.getStatus().equals(TaskStatusEnum.BEGINNING.getStatus()), MessageUtils.message("pro.feedback.error.before.start")); ExceptionUtil.checkTrueThrowException(!taskWorkunit.getStatus().equals(TaskStatusEnum.BEGINNING.getStatus()), MessageUtils.message("pro.feedback.error.before.start"));
feedback.initValue(workorder); feedback.initValue(workorder,taskWorkunit);
Double feedbackSum = proFeedbackService.selectQuantityQualifySum(new ProFeedback(null, null, null, taskWorkunitId)); Double feedbackSum = proFeedbackService.selectQuantityQualifySum(new ProFeedback(null, null, null, taskWorkunitId));
double taskQuantityDouble = taskWorkunit.getQuantity().doubleValue(); double taskQuantityDouble = taskWorkunit.getQuantity().doubleValue();
double canBeWaitQuantity = taskQuantityDouble - feedbackSum; double canBeWaitQuantity = taskQuantityDouble - feedbackSum;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment