功能修改-sjx

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java

@@ -35,6 +35,7 @@ public enum WorkOrderEnum {
 	STATUS_PART_TYPE_1("壳体最大外径", 1),
 	STATUS_PART_TYPE_2("玻璃饼直径", 2),
 	STATUS_PART_TYPE_3("芯数", 3),
+	STATUS_PART_TYPE_4("涂色标", 4),
 	;
 	final String name;
 	final int code;

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -61,6 +61,7 @@ import org.springblade.scheduling.scheduling.service.*;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
+import org.springblade.system.cache.DictCache;
 import org.springblade.wms.feign.StGlassCakeOutClient;
 import org.springblade.wms.pojo.dto.StGlassCakeOutDTO;
 import org.springframework.beans.BeanUtils;
@@ -848,6 +849,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         } else {
                                             totalTime = Math.ceil(totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue());
                                         }
+                                        if(ability.getPartType() == WorkOrderEnum.STATUS_PART_TYPE_4.getCode()){
+                                            Double tsb = DictCache.getKey("part_info", "涂色标") == null ? 0 : Double.valueOf(DictCache.getKey("part_info", "涂色标"));
+                                            Double tsd = DictCache.getKey("part_info", "涂色带") == null ? 0 : Double.valueOf(DictCache.getKey("part_info", "涂色带"));
+                                            Double tjt = DictCache.getKey("part_info", "涂箭头") == null ? 0 : Double.valueOf(DictCache.getKey("part_info", "涂箭头"));
+                                            int tsbNum = part.getTsbNum() == null ? 0 : Integer.parseInt(part.getTsbNum());
+                                            int tsdNum = part.getTsdNum() == null ? 0 : Integer.parseInt(part.getTsdNum());
+                                            int tjtNum = part.getTjtNum() == null ? 0 : Integer.parseInt(part.getTsdNum());
+                                            totalTime += tsbNum * tsb + tsdNum * tsd + tjtNum * tjt;
+                                        }
                                         hourMap.put("totalTime",totalTime);
                                         hourMap.put("standardTime",ability.getStandardTime());
                                         hourMap.put("prepareTime",ability.getPrepareTime());