@@ -35,6 +35,7 @@ import javax.annotation.Resource; | |||||
import javax.validation.groups.Default; | import javax.validation.groups.Default; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.time.LocalDateTime; | |||||
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.List; | import java.util.List; | ||||
@@ -126,6 +127,8 @@ public class ScreenController extends BaseController { | |||||
Integer setupTime = 1; | Integer setupTime = 1; | ||||
//剩余时间 | //剩余时间 | ||||
Integer remainingTime = 0; | Integer remainingTime = 0; | ||||
if (kilnInfo.getType() != 4) { | if (kilnInfo.getType() != 4) { | ||||
if (kilnInfo.getType() == 3) { | if (kilnInfo.getType() == 3) { | ||||
remainingTime = readPlc(nameSpace, "ProgramTimeRemaining").intValue(); | remainingTime = readPlc(nameSpace, "ProgramTimeRemaining").intValue(); | ||||
@@ -611,6 +614,8 @@ public class ScreenController extends BaseController { | |||||
map.put("rot2", rot2ConsumeList); | map.put("rot2", rot2ConsumeList); | ||||
map.put("temp", tempConsumeList); | map.put("temp", tempConsumeList); | ||||
map.put("oilTemp", oilTempConsumeList); | map.put("oilTemp", oilTempConsumeList); | ||||
map.put("outerZone1Temp",outerZone1TempConsumeList); | |||||
map.put("outerZone2Temp",outerZone2TempConsumeList); | |||||
return successful(JSONObject.parseObject(JSON.toJSONString(map))); | return successful(JSONObject.parseObject(JSON.toJSONString(map))); | ||||
} | } | ||||
@@ -1,12 +1,16 @@ | |||||
package com.mt.wms.empty.service.impl; | package com.mt.wms.empty.service.impl; | ||||
import com.mt.wms.core.base.BaseService; | import com.mt.wms.core.base.BaseService; | ||||
import com.mt.wms.core.dal.entity.CurrTask; | |||||
import com.mt.wms.core.dal.service.CurrTaskServiceBiz; | |||||
import com.mt.wms.core.vo.R; | import com.mt.wms.core.vo.R; | ||||
import com.mt.wms.empty.mapper.EleMapper; | import com.mt.wms.empty.mapper.EleMapper; | ||||
import com.mt.wms.empty.service.EleService; | import com.mt.wms.empty.service.EleService; | ||||
import com.mt.wms.empty.vo.CountEleVo; | |||||
import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
import javax.annotation.Resource; | import javax.annotation.Resource; | ||||
import java.util.List; | |||||
/** | /** | ||||
* @Author: LGH | * @Author: LGH | ||||
@@ -17,9 +21,26 @@ public class EleServiceImpl extends BaseService implements EleService { | |||||
@Resource | @Resource | ||||
EleMapper eleMapper; | EleMapper eleMapper; | ||||
@Resource | |||||
CurrTaskServiceBiz currTaskServiceBiz; | |||||
@Override | @Override | ||||
public R list(Long kilnId) { | public R list(Long kilnId) { | ||||
return successful(eleMapper.list(kilnId)); | |||||
List<CountEleVo> list = eleMapper.list(kilnId); | |||||
for (CountEleVo countEleVo:list | |||||
) { | |||||
CurrTask currTask = currTaskServiceBiz.getById(countEleVo.getTaskId()); | |||||
if (currTask.getStoveCode()==null){ | |||||
if (currTask.getSheetNo()!=null){ | |||||
currTask.setStoveCode(currTask.getSheetNo()); | |||||
}else { | |||||
currTask.setStoveCode(currTask.getTaskCode()); | |||||
} | |||||
} | |||||
countEleVo.setStoveCode(currTask.getStoveCode()); | |||||
countEleVo.setCreateTime(currTask.getCreateTime()); | |||||
} | |||||
return successful(list); | |||||
} | } | ||||
} | } |
@@ -555,7 +555,7 @@ public class ScheduledTask extends BaseService { | |||||
//A向电压 | //A向电压 | ||||
Double phaseAVoltage = readPlc(nameSpaceNote, "AVoltage"); | Double phaseAVoltage = readPlc(nameSpaceNote, "AVoltage"); | ||||
Double phaseBVoltage = readPlc(nameSpaceNote, "BVoltage"); | Double phaseBVoltage = readPlc(nameSpaceNote, "BVoltage"); | ||||
Double phaseCVoltage = readPlc(nameSpaceNote, "CVoltage"); | |||||
Double phaseCVoltage = readPlc(nameSpaceNote, "Cvoltage"); | |||||
//ABC三向电流 | //ABC三向电流 | ||||
Double aCurrent = readPlc(nameSpaceNote, "ACurrent"); | Double aCurrent = readPlc(nameSpaceNote, "ACurrent"); | ||||
Double bCurrent = readPlc(nameSpaceNote, "BCurrent"); | Double bCurrent = readPlc(nameSpaceNote, "BCurrent"); | ||||
@@ -35,4 +35,10 @@ public class CountEleVo { | |||||
*/ | */ | ||||
@ApiModelProperty(value = "任务id", example = "0.0") | @ApiModelProperty(value = "任务id", example = "0.0") | ||||
private Long taskId; | private Long taskId; | ||||
/** | |||||
* 炉号 | |||||
*/ | |||||
@ApiModelProperty(value = "炉号", example = "0.0") | |||||
private String stoveCode; | |||||
} | } |
@@ -9,6 +9,7 @@ import lombok.Data; | |||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import java.time.LocalDateTime; | |||||
import java.util.List; | import java.util.List; | ||||
/** | /** | ||||
@@ -79,6 +80,11 @@ public class NowCurrTaskDetVo extends BaseVo implements PageVo.ConvertVo { | |||||
*/ | */ | ||||
@ApiModelProperty(value = "工艺进度", example = "0") | @ApiModelProperty(value = "工艺进度", example = "0") | ||||
private Integer completeness; | private Integer completeness; | ||||
/** | |||||
* 开始加工时间 | |||||
*/ | |||||
@ApiModelProperty(value = "开始加工时间", example = "0") | |||||
private LocalDateTime beginTime; | |||||
/** | /** | ||||
* 标识卡list | * 标识卡list | ||||
@@ -18,26 +18,17 @@ | |||||
<select id="list" | <select id="list" | ||||
resultType="com.mt.wms.empty.vo.CountEleVo"> | resultType="com.mt.wms.empty.vo.CountEleVo"> | ||||
select | select | ||||
tpev .task_id , | |||||
tpev.total_bat, | |||||
tpev .create_time , | |||||
tpev .kiln_id | |||||
from | |||||
t_par_ele_value tpev | |||||
inner join( | |||||
select | |||||
max(total_bat) as total_bat , | max(total_bat) as total_bat , | ||||
task_id | task_id | ||||
from | from | ||||
t_par_ele_value tpev2 | t_par_ele_value tpev2 | ||||
where | |||||
kiln_id = #{kilnId} | |||||
group by | group by | ||||
task_id | task_id | ||||
)tpev3 on | |||||
tpev .task_id = tpev3.task_id | |||||
and tpev .total_bat = tpev3.total_bat | |||||
where tpev .kiln_id =#{kilnId} | |||||
order by tpev .create_time desc | |||||
limit 10 | |||||
order by | |||||
total_bat desc | |||||
limit 11 | |||||
</select> | </select> | ||||