生产版本增加是否超报

mes/src/main/java/com/ximai/mes/pro/domain/task/ProTask.java

@@ -315,6 +315,8 @@ public class ProTask extends BaseEntity {
 
     private String isExistTool = IS_EXIST_TOOL_NO;
 
+    @ApiModelProperty("超报标识")
+    private Boolean surpassState;
     public String getStatusName() {
         return TaskStatusEnum.getStatusCn(this.getStatus());
     }

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

@@ -26,6 +26,7 @@ import com.ximai.mes.pro.domain.*;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkOrderProcess;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkOrderProcessTool;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolution;
 import com.ximai.mes.pro.domain.task.*;
 import com.ximai.mes.pro.domain.vo.*;
 import com.ximai.mes.pro.domain.vo.task.FeedbackValidateSerialNoParams;
@@ -36,6 +37,7 @@ import com.ximai.mes.pro.mapper.ProRouteMapper;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkOrderProcessMapper;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkOrderProcessToolMapper;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkorderMapper;
+import com.ximai.mes.pro.mapper.productionSolution.ProProductionSolutionMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskAssistProcessMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskWorkorderMapper;
@@ -157,6 +159,8 @@ public class ProTaskServiceImpl implements IProTaskService {
     @Resource
     private IMdWorkunitService iMdWorkunitService;
 
+    @Autowired
+    ProProductionSolutionMapper proProductionSolutionMapper;
 
     /**
      * 查询生产任务
@@ -799,6 +803,18 @@ public class ProTaskServiceImpl implements IProTaskService {
         queryWrapper.notIn("t1.status", Arrays.asList(WorkorderStatusEnum.CLOSE.getValue(), WorkorderStatusEnum.CANCEL.getValue(), WorkorderStatusEnum.CANCELED.getValue()));
         List<ProWorkorder> proWorkorders = proWorkorderService.selectListByQw(queryWrapper);
         double maxWorkunitQuantityConst = taskWorkunit.getQuantity().doubleValue();
+        //检查该工单绑定的生产版本是否允许超报
+        if(proWorkorders.size() > 0 && proWorkorders.get(0).getProductionSolutionId() != null){
+            ProProductionSolution proProductionSolution
+                    = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proWorkorders.get(0).getProductionSolutionId());
+            if(proProductionSolution != null && proProductionSolution.getSurpassState() != null){
+                if(!proProductionSolution.getSurpassState()){
+                    //不允许超报 可报工数目 - 合格数 不能小于 0
+                    ExceptionUtil.checkTrueThrowException(
+                            taskQuantityWaitConst.compareTo(feedbackQualifyConst) < 0, "工单关联的生产版本不允许超报行为");
+                }
+            }
+        }
         if (workorderId != null && workorderId != 0) {
             // 查看当前工单已报工数量
             if (proWorkorders.size() == 1) {
@@ -1331,6 +1347,7 @@ public class ProTaskServiceImpl implements IProTaskService {
 
 
     @Override
+    @Transactional
     public List<ProTask> getTaskList(ProTaskQuery proTask) {
         ProTaskQuery proTaskQuery = new ProTaskQuery();
         BeanUtils.copyProperties(proTask, proTaskQuery);
@@ -1382,7 +1399,13 @@ public class ProTaskServiceImpl implements IProTaskService {
                     workorderQuery.setWorkorderCode(arrangeCode);
                     List<ProWorkorder> proWorkorders = proWorkorderService.selectProWorkorderList(workorderQuery);
                     task.setProWorkorderList(proWorkorders);
-
+                    if(proWorkorders.size() > 0 && proWorkorders.get(0).getProductionSolutionId() != null){
+                        ProProductionSolution proProductionSolution
+                                = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proWorkorders.get(0).getProductionSolutionId());
+                        if(proProductionSolution != null){
+                            task.setSurpassState(proProductionSolution.getSurpassState());
+                        }
+                    }
                     Double v = proFeedbackService.selectQuantityQualifySum(new ProFeedback(arrangeCode, null, null, task.getTaskWorkunitId()));
                     task.setArrangeFeedbackSum(v);
                 }