更新生产排产BUG

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProTaskVo.java

@@ -5,6 +5,7 @@ import com.ximai.common.annotation.Excel;
 import com.ximai.common.core.domain.BaseEntity;
 import com.ximai.mes.pro.domain.task.ProTaskWorkunit;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -270,6 +271,13 @@ public class ProTaskVo extends BaseEntity {
      */
     private Long idx;
 
+    @ApiModelProperty("标准工时")
+    private BigDecimal stdWorkingTime;
+
+    /**
+     * 工时单位
+     */
+    private String stdWorkingTimeUom;
 
     @TableField(exist = false)
     private ProTaskWorkunit taskWorkunit;

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

@@ -1205,7 +1205,7 @@ public class ProTaskServiceImpl implements IProTaskService {
         calPlanWorkunitQuery.orderByAsc("start_date");
         //查询可用工作日历
         List<CalPlanWorkunit> list = calPlanWorkunitService.selectListWithSchedule(calPlanWorkunitQuery);
-        if(insertTaskWorkunit.getStdWorkingTime() != null && insertTaskWorkunit.getStdWorkingTime().compareTo(BigDecimal.ZERO) > 0 &&  insertTaskWorkunit.getStdWorkingTimeUom() != null && list.size() < 1){
+        if(insertTaskWorkunit.getStdWorkingTime() != null && insertTaskWorkunit.getStdWorkingTime().compareTo(BigDecimal.ZERO) > 0 &&  insertTaskWorkunit.getStdWorkingTimeUom() != null ){
             Long endData = 0L;
             if(insertTaskWorkunit.getStdWorkingTimeUom().equals("HOUR")){
                 endData = insertTaskWorkunit.getStdWorkingTime().multiply(new BigDecimal(1000 * 60 * 60)).multiply(splitQuantityConst).longValue();
@@ -1214,19 +1214,25 @@ public class ProTaskServiceImpl implements IProTaskService {
             }else if(insertTaskWorkunit.getStdWorkingTimeUom().equals("SECOND")){
                 endData = insertTaskWorkunit.getStdWorkingTime().multiply(new BigDecimal(1000)).multiply(splitQuantityConst).longValue();
             }
-            insertTaskWorkunit.setScheduleStartDate(list.get(0).getStartDate());
+
             if(endData != 0){
-                for (CalPlanWorkunit calPlanWorkunit : list){
-                    if((calPlanWorkunit.getEndDate().getTime() - calPlanWorkunit.getStartDate().getTime()) >  endData){
-                        insertTaskWorkunit.setScheduleEndDate(new Date(calPlanWorkunit.getStartDate().getTime() + endData));
-                    }else{
-                        endData = endData - (calPlanWorkunit.getEndDate().getTime() - calPlanWorkunit.getStartDate().getTime());
+                if(list.size() > 0){
+                    insertTaskWorkunit.setScheduleStartDate(list.get(0).getStartDate());
+                    for (CalPlanWorkunit calPlanWorkunit : list){
+                        if((calPlanWorkunit.getEndDate().getTime() - calPlanWorkunit.getStartDate().getTime()) >  endData){
+                            insertTaskWorkunit.setScheduleEndDate(new Date(calPlanWorkunit.getStartDate().getTime() + endData));
+                        }else{
+                            endData = endData - (calPlanWorkunit.getEndDate().getTime() - calPlanWorkunit.getStartDate().getTime());
+                        }
                     }
+                    if(endData > 0){
+                        //不够用
+                        insertTaskWorkunit.setScheduleEndDate(new Date(list.get(list.size() - 1).getEndDate().getTime() + endData));
+                    }
+                }else{
+                    insertTaskWorkunit.setScheduleEndDate(new Date(insertTaskWorkunit.getScheduleStartDate().getTime() + endData));
                 }
-                if(endData > 0){
-                    //不够用
-                    insertTaskWorkunit.setScheduleEndDate(new Date(list.get(list.size() - 1).getEndDate().getTime() + endData));
-                }
+
             }else{
                 insertTaskWorkunit.setScheduleEndDate(insertTaskWorkunit.getScheduleStartDate());
             }