6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/ScreenController.java

@@ -35,7 +35,6 @@ import javax.annotation.Resource;
 import javax.validation.groups.Default;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -127,8 +126,6 @@ public class ScreenController extends BaseController {
                 Integer setupTime = 1;
                 //剩余时间
                 Integer remainingTime = 0;
-
-
                 if (kilnInfo.getType() != 4) {
                     if (kilnInfo.getType() == 3) {
                         remainingTime = readPlc(nameSpace, "ProgramTimeRemaining").intValue();
@@ -614,8 +611,6 @@ public class ScreenController extends BaseController {
         map.put("rot2", rot2ConsumeList);
         map.put("temp", tempConsumeList);
         map.put("oilTemp", oilTempConsumeList);
-        map.put("outerZone1Temp",outerZone1TempConsumeList);
-        map.put("outerZone2Temp",outerZone2TempConsumeList);
         return successful(JSONObject.parseObject(JSON.toJSONString(map)));
     }
 

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/EleServiceImpl.java

@@ -1,16 +1,12 @@
 package com.mt.wms.empty.service.impl;
 
 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.empty.mapper.EleMapper;
 import com.mt.wms.empty.service.EleService;
-import com.mt.wms.empty.vo.CountEleVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @Author: LGH
@@ -21,26 +17,9 @@ public class EleServiceImpl extends BaseService implements EleService {
 
     @Resource
     EleMapper eleMapper;
-    @Resource
-    CurrTaskServiceBiz currTaskServiceBiz;
 
     @Override
     public R list(Long 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);
+        return successful(eleMapper.list(kilnId));
     }
 }

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java

@@ -314,7 +314,7 @@ public class ScheduledTask extends BaseService {
                     Double oilStirringSpeed2 = readPlc(nameSpaceNote, "OilStirringSpeed2");
                     ParRotSpeedValue parRotSpeedValue = new ParRotSpeedValue();
                     parRotSpeedValue.setOilStiSpeedAValue(oilStirringSpeed1.floatValue());
-                    parRotSpeedValue.setOilStiSpeedBValue(oilStirringSpeed2.floatValue());
+                    parRotSpeedValue.setOilStiSpeedAValue(oilStirringSpeed2.floatValue());
                     parRotSpeedValue.setKilnId(kilnId);
                     parRotSpeedValue.setTaskId(currTaskId);
                     parRotSpeedValue.setCreateTime(LocalDateTime.now());
@@ -555,7 +555,7 @@ public class ScheduledTask extends BaseService {
                     //A向电压
                     Double phaseAVoltage = readPlc(nameSpaceNote, "AVoltage");
                     Double phaseBVoltage = readPlc(nameSpaceNote, "BVoltage");
-                    Double phaseCVoltage = readPlc(nameSpaceNote, "Cvoltage");
+                    Double phaseCVoltage = readPlc(nameSpaceNote, "CVoltage");
                     //ABC三向电流
                     Double aCurrent = readPlc(nameSpaceNote, "ACurrent");
                     Double bCurrent = readPlc(nameSpaceNote, "BCurrent");

6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CountEleVo.java

@@ -35,10 +35,4 @@ public class CountEleVo {
      */
     @ApiModelProperty(value = "任务id", example = "0.0")
     private Long taskId;
-
-    /**
-     * 炉号
-     */
-    @ApiModelProperty(value = "炉号", example = "0.0")
-    private String stoveCode;
 }

6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/NowCurrTaskDetVo.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -80,11 +79,6 @@ public class NowCurrTaskDetVo extends BaseVo implements PageVo.ConvertVo {
      */
     @ApiModelProperty(value = "工艺进度", example = "0")
     private Integer completeness;
-    /**
-     * 开始加工时间
-     */
-    @ApiModelProperty(value = "开始加工时间", example = "0")
-    private LocalDateTime beginTime;
 
     /**
      * 标识卡list

6.program/wms-empty/src/main/resources/mapper/EleMapper.xml

@@ -18,17 +18,26 @@
     <select id="list"
             resultType="com.mt.wms.empty.vo.CountEleVo">
         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 ,
         task_id
         from
         t_par_ele_value tpev2
-        where
-        kiln_id = #{kilnId}
         group by
         task_id
-        order by
-        total_bat desc
-        limit 11
+        )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
     </select>