Merge remote-tracking branch 'origin/dev' into dev

mes/src/main/java/com/ximai/mes/pro/domain/ProFeedback.java

@@ -7,6 +7,7 @@ import com.ximai.common.core.domain.BaseEntity;
 import com.ximai.mes.md.domain.MdItem;
 import com.ximai.mes.md.domain.MdWorkstation;
 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.ProWorkOrderSoSizeItemReport;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -326,12 +327,12 @@ public class ProFeedback extends BaseEntity {
     private Boolean lastFeedback;
 
 
-    public void initValue(ProWorkorder workorder) {
+    public void initValue(ProWorkorder workorder, ProTaskWorkunit proTaskWorkunit) {
         this.setWorkorderCode(workorder.getWorkorderCode());
         this.setWorkorderName(workorder.getWorkorderName());
         this.setUnitOfMeasure(workorder.getUnitOfMeasure());
         this.setItemId(workorder.getProductId());
-        this.setQuantity(workorder.getQuantity());
+        this.setQuantity(proTaskWorkunit.getQuantity());
         this.setItemCode(workorder.getProductCode());
         this.setItemName(workorder.getProductName());
     }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskAssistProcessServiceImpl.java

@@ -282,7 +282,7 @@ public class ProTaskAssistProcessServiceImpl implements IProTaskAssistProcessSer
         ProWorkorder workorder = proWorkorderMapper.selectWorkorderById(feedback.getWorkorderId());
         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"));
-        feedback.initValue(workorder);
+        feedback.initValue(workorder,taskWorkunit);
         Double feedbackSum = proFeedbackService.selectQuantityQualifySum(new ProFeedback(null, null, null, taskWorkunitId));
         double taskQuantityDouble = taskWorkunit.getQuantity().doubleValue();
         double canBeWaitQuantity = taskQuantityDouble - feedbackSum;