| src/main/java/com/zy/asrs/controller/TestMastController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/StandingScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/StandingHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/TestMastController.java
@@ -40,6 +40,8 @@ EntityWrapper<TestMast> wrapper = new EntityWrapper<>(); excludeTrash(param); convert(param, wrapper); orderByField="status"; orderByType="asc"; if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(testMastService.selectPage(new Page<>(curr, limit), wrapper)); } src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -517,12 +517,12 @@ LocMast loc = locMastService.selectById(locNo); if (Cools.isEmpty(loc)){ throw new CoolException("未找到库位"); } if (loc.getPackStatus()==2){ }else if (sourceLoc.getPackStatus()==2){ throw new CoolException("产品在测试中，禁止库位移栽"); } if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) { throw new CoolException("移转库位属于不同堆垛机"); // }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) { // throw new CoolException("移转库位属于不同堆垛机"); }else if(sourceLoc.getLocType1()!=loc.getLocType1()){ throw new CoolException("源库为与目标库位的库位类型不同"); } Date now = new Date(); // 获取工作号 @@ -534,7 +534,7 @@ wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID wrkMast.setIoType(11); // 入出库状态： 11.库格移载 wrkMast.setIoPri(10D); wrkMast.setCrnNo(sourceLoc.getCrnNo()); wrkMast.setCrnNo(1); wrkMast.setSourceLocNo(sourceLocNo); // 源库位 wrkMast.setLocNo(locNo); // 目标库位 wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 满板：Y src/main/java/com/zy/asrs/task/StandingScheduler.java
New file @@ -0,0 +1,33 @@ package com.zy.asrs.task; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.StandingHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @Component @Slf4j public class StandingScheduler { @Value("${wcs-slave.doubleDeep}") private boolean confirmDeep; @Autowired private StandingHandler standingHandler; /** * */ @Scheduled(cron = "0/60 * * * * ? ") private void execute() { if (confirmDeep) return; ReturnT<String> result = standingHandler.start(); if (!result.isSuccess()) { log.error("静置完成出库失败"); } } } src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -1,6 +1,7 @@ package com.zy.asrs.task.handler; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; @@ -72,15 +73,19 @@ } // 生成工作档明细 LocDetl detlDto=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo())); WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(detlDto); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(now); wrkDetl.setAnfme(1.0); // 数量 wrkDetl.setAppeTime(now); wrkDetl.setModiTime(now); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("保存工作档明细失败"); if (Cools.isEmpty(detlDto)){ log.error("库位:"+locMast.getLocNo()+"\t没有明细"); }else { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(detlDto); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(now); wrkDetl.setAnfme(1.0); // 数量 wrkDetl.setAppeTime(now); wrkDetl.setModiTime(now); if (!wrkDetlService.insert(wrkDetl)) { log.error("库位:"+locMast.getLocNo()+"\t保存工作档明细失败"); } } // 修改库位状态: F.在库 ====>>> R.出库预约 if (locMast.getLocSts().equals("F")) { src/main/java/com/zy/asrs/task/handler/StandingHandler.java
New file @@ -0,0 +1,121 @@ package com.zy.asrs.task.handler; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.common.model.enums.WorkNoType; import com.zy.common.service.CommonService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.Date; import java.util.List; /** * Created by vincent on 2020/7/6 */ @Service @Slf4j public class StandingHandler extends AbstractHandler<String> { @Autowired private LocDetlService locDetlService; @Autowired private LocMastService locMastService; @Autowired private WrkMastService wrkMastService; @Autowired private CommonService commonService; @Autowired private WrkDetlService wrkDetlService; @Transactional public ReturnT<String> start() { try { Date now = new Date(); List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() .eq("fire_status", 0) .eq("loc_sts", "F") .eq("pack_status", 3)); Integer ioType = 101; //入出库类型 //静置完成出库站104 for(LocMast locMast : locMasts){ LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo())); if (Cools.isEmpty(locDetl)){ log.error("库位:"+locMast.getLocNo()+"没有明细"); } else if (Cools.isEmpty(locDetl.getDeadWarn())){ log.error("库位:"+locMast.getLocNo()+"没有静置时间"); } else if (Cools.isEmpty(locMast.getModiTime())){ log.error("库位:"+locMast.getLocNo()+"modiTime为空"); } else if (Cools.isEmpty(locMast.getBarcode())){ log.error("库位:"+locMast.getLocNo()+"Pack码为空"); } else if (now.getTime()-locMast.getModiTime().getTime() >= locDetl.getDeadWarn()*60*1000){ // 生成工作号 int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType)); // 生成工作档 WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID wrkMast.setIoType(ioType); // 入出库状态 wrkMast.setIoPri(13D); // 优先级：13 wrkMast.setCrnNo(1); wrkMast.setSourceStaNo(107); // 源站 wrkMast.setStaNo(104); // 目标站 wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位 wrkMast.setFullPlt("Y"); // 满板：Y wrkMast.setPicking("N"); // 拣料 wrkMast.setExitMk("N"); // 退出 wrkMast.setEmptyMk("N"); // 空板 wrkMast.setLinkMis("N"); wrkMast.setBarcode(locMast.getBarcode()); wrkMast.setAppeTime(now); wrkMast.setModiTime(now); if (!wrkMastService.insert(wrkMast)) { throw new CoolException("保存工作档失败，出库库位号："+locMast.getLocNo()); } // 生成工作档明细 WrkDetl wrkDetl = new WrkDetl(); wrkDetl.sync(locDetl); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(now); wrkDetl.setAnfme(1.0); // 数量 wrkDetl.setAppeTime(now); wrkDetl.setModiTime(now); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("保存工作档明细失败"); } // 修改库位状态: F.在库 ====>>> R.出库预约 if (locMast.getLocSts().equals("F")) { locMast.setLocSts("R"); locMast.setModiTime(now); if (!locMastService.updateById(locMast)) { throw new CoolException("预约库位状态失败，库位号："+locMast.getLocNo()); } } else { throw new CoolException(locMast.getLocNo() + "库位不是在库状态"); } } else { } } } catch (Exception e) { e.printStackTrace(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return FAIL.setMsg(e.getMessage()); } return SUCCESS; } }
