src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/WrkMastExecuteService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/task/handler/JarBurialEscalationHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/WrkMastExecuteMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -30,6 +30,7 @@ Integer getWrkMastExecuteByJarIdCount(@Param("jarId") Integer jarId); Integer getWrkMastExecuteByjarReginCount(@Param("jarRegin") Integer jarId); Integer selectNoStart(@Param("jarRegin") Integer jarRegin); Integer selectNoStartCharge(@Param("jarRegin") Integer jarRegin); src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
@@ -23,6 +23,7 @@ List<WrkMastExecute> selectWrkMastExecuteByWrk(WrkMastExecute wrkMastExecute); Integer getWrkMastExecuteByJarIdCount(Integer jarId); Integer getWrkMastExecuteByjarReginCount(Integer jarId); Integer selectNoStart(Integer jarRegin); src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5278,6 +5278,10 @@ return false; } if (wrkMastExecuteService.getWrkMastExecuteByjarReginCount(basJar.getRegion())!=0){ return false; } //门作业 无 //自动、空闲、右门关闭、 Other左门关闭 if (jarProtocol.isAutoing() && jarProtocol.jarErr==0 @@ -5331,6 +5335,10 @@ BasJarMast basJarMastSign = basJarMastList.get(0); if (Cools.isEmpty(basJarMastSign)){ return false; } if (wrkMastExecuteService.getWrkMastExecuteByjarReginCount(basJarMastSign.getJarRegin())!=0){ return false; } // //判断小车状态 @@ -5413,6 +5421,10 @@ if (Cools.isEmpty(basJarMastSign)){ return false; } if (wrkMastExecuteService.getWrkMastExecuteByjarReginCount(basJarMastSign.getJarRegin())!=0){ return false; } // //判断小车状态 // if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarInSte().get(0).getSteNo(),2,SteStatusType.IDLE)){ // return false; @@ -5489,6 +5501,9 @@ BasJarMast jarMastByJarIdMin = basJarMastService.getJarMastByJarIdMin(jarSlave.getId(),8,8); if (Cools.isEmpty(jarMastByJarIdMin)){ return false; } if (wrkMastExecuteService.getWrkMastExecuteByjarReginCount(jarMastByJarIdMin.getJarRegin())!=0){ return false; } @@ -5577,6 +5592,10 @@ if (Cools.isEmpty(jarMastByJarIdMin)){ return false; } if (wrkMastExecuteService.getWrkMastExecuteByjarReginCount(jarMastByJarIdMin.getJarRegin())!=0){ return false; } // // //判断小车状态 // if (!jarWrkMastExecuteGenerateSteStatus(jarSlave.getJarOutSte().get(0).getSteNo(),3,SteStatusType.IDLE)){ src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -56,6 +56,11 @@ } @Override public Integer getWrkMastExecuteByjarReginCount(Integer jarId) { return this.baseMapper.getWrkMastExecuteByjarReginCount(jarId); } @Override public Integer selectNoStart(Integer jarRegin) { return this.baseMapper.selectNoStart(jarRegin); } src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
New file @@ -0,0 +1,52 @@ package com.zy.asrs.task; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.JarBurialEscalationHandler; import com.zy.asrs.task.handler.ScaleEscalationHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; /** * Created by Monkey D. Luffy on 2024.07.20 * 亳州煜星..............以下.............亳州煜星.............上传开式冷却信号 */ @Slf4j @Component public class JarBurialEscalationScheduler { @Autowired private JarBurialEscalationHandler jarBurialEscalationHandler; @Scheduled(cron = "0/3 * * * * ? ") private void execute(){//上传开式冷却信号 int[] jarList =new int[]{1,2,3,4,5,6}; for (int jarNo : jarList){ try{ ReturnT<String> result = jarBurialEscalationHandler.start(jarNo,10,11); if (result.getCode()==200){ break; } }catch (Exception e){ log.error("冷却池:"+jarNo+"==》上传开式冷却信号处理失败,异常信息:"+e); } } } @Scheduled(cron = "0/3 * * * * ? ") private void execute2(){//上传开式冷却信号 int[] jarList =new int[]{1,2,3,4,5,6}; for (int jarNo : jarList){ try{ ReturnT<String> result = jarBurialEscalationHandler.start(jarNo,11,12); if (result.getCode()==200){ break; } }catch (Exception e){ log.error("冷却池:"+jarNo+"==》上传开式冷却信号处理失败,异常信息:"+e); } } } } src/main/java/com/zy/asrs/task/handler/JarBurialEscalationHandler.java
New file @@ -0,0 +1,122 @@ package com.zy.asrs.task.handler; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.core.exception.CoolException; import com.zy.asrs.entity.BasJarMast; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.common.utils.HttpHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; /** * Created by Monkey D. Luffy on 2024.07.20 * 亳州煜星..............以下.............亳州煜星.............上传开式冷却信号 */ @Slf4j @Service @Transactional public class JarBurialEscalationHandler extends AbstractHandler<String> { private static final Integer jarMaxLoc = 6; @Autowired private ApiLogService apiLogService; @Autowired private BasJarMastService basJarMastService; // @Value("${srHangJia.url}") private String erpUrl = "10.10.11.100:8580"; // @Value("${srHangJia.reportOutPath}") private String reportOutPath = "mes/wms-service/boxWeight"; public ReturnT<String> start(int jarNo,Integer souStatus,Integer endStatus) { try{ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarNo, new ArrayList<Integer>() {{ add(souStatus);//硫化完成 }}); if (basJarMastList.size() != jarMaxLoc){ return FAIL; } else { // ReturnT<String> result = postMesData(reportOutPath,1); // if (result.getCode()==200){ Integer integer = basJarMastService.updateStatus(jarNo, souStatus, endStatus); if (basJarMastList.size()!=integer){ log.error("{}号硫化罐硫化完成后开门完成修改硫化档案状态结果数量不一致!!!查询资料数量={},更新返回数量={}",jarNo,basJarMastList.size(),integer); return FAIL; } return SUCCESS; // }else { // log.error("1楼翻转重量信息上传失败"); // } } }catch (Exception e){ log.error("异常!!!"+e); return FAIL; } } private ReturnT<String> postMesData(String erpPath,Object combParam){ if(combParam != null){ String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(erpUrl) .setPath(erpPath) .setJson(JSON.toJSONString(combParam)) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("Code")==200) { success = true; } else { log.error("1楼翻转重量信息上传请求接口失败!!!url:{};request:{};response:{}"+erpUrl+erpPath, JSON.toJSONString(combParam), response); throw new CoolException("上报mes系统失败"); } } catch (Exception e) { log.error("fail", e); // TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg(e.getMessage()); } finally { try { // 保存接口日志 apiLogService.save( "上报MES系统", erpUrl + erpPath, null, erpUrl, JSON.toJSONString(combParam), response, success ); } catch (Exception e) { log.error("", e); } } } return SUCCESS; } public Integer getStaOther(Integer staNo){ switch (staNo){ case 118: return 119; case 119: return 118; case 120: return 121; case 121: return 120; default: return 0; } } } src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -118,6 +118,12 @@ and jar_id = #{jarId} </select> <select id="getWrkMastExecuteByjarReginCount" resultType="Integer"> select count(1) from jar_wrk_mast_execute where 1=1 and jar_regin = #{jarRegin} </select> <select id="selectNoStart" resultType="Integer"> select count(1) from jar_wrk_mast_execute where 1=1