src/main/java/com/zy/asrs/controller/CrnController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/LocMastService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/LocMastMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/CrnController.java
@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.domain.enums.CrnStatusType; @@ -16,6 +17,8 @@ import com.zy.asrs.mapper.BasCrnErrorMapper; import com.zy.asrs.service.BasCrnpService; import com.zy.asrs.service.WrkMastService; import com.zy.asrs.service.impl.MainServiceImpl; import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.OutputQueue; import com.zy.core.cache.SlaveConnection; @@ -28,7 +31,6 @@ import com.zy.core.model.command.CrnCommand; import com.zy.core.model.protocol.CrnProtocol; import com.zy.core.properties.SlaveProperties; import com.zy.core.CrnThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -55,6 +57,8 @@ private BasCrnErrorMapper basCrnErrorMapper; @Autowired private BasCrnpService basCrnpService; @Autowired private MainServiceImpl mainService; @ManagerAuth(memo = "进行中的命令") @@ -188,6 +192,23 @@ return R.ok().add(str.toString()); } @PostMapping("/demo/switch") @ManagerAuth(memo = "堆垛机演示") public R crnDemo(CrnDemoParam param) throws InterruptedException { if (Cools.isEmpty(param.getCrnId())){ return R.error(); } if (Cools.isEmpty(param.getPassword())){ return R.error("请输入口令"); } if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){ return R.error("口令错误"); } Thread.sleep(200L); mainService.crnDemoOfLocMove(param.getCrnId()); return R.ok(); } /****************************************************************/ /************************** 手动操作 ******************************/ src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -21,4 +21,8 @@ @Select("select top 1 bay1 from asr_loc_mast order by bay1 desc") Short selectTotalBay(); LocMast queryDemoSourceLoc(@Param("crnNo") Integer crnNo); LocMast queryDemoLoc(@Param("crnNo") Integer crnNo); } src/main/java/com/zy/asrs/service/LocMastService.java
@@ -18,4 +18,20 @@ * @return 同组空库位集合 */ List<String> queryGroupEmptyStock(String sourceLocNo); /** * 堆垛机演示获取源库位 * @param crn * @return */ LocMast queryDemoSourceLoc(Integer crn); /** * 堆垛机演示获取目标库位 * @param crn * @return */ LocMast queryDemoLoc(Integer crn); } src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -28,4 +28,15 @@ } return this.baseMapper.queryGroupEmptyStock(sourceStock.getCrnNo()); } @Override public LocMast queryDemoSourceLoc(Integer crn) { return this.baseMapper.queryDemoSourceLoc(crn); } @Override public LocMast queryDemoLoc(Integer crn) { return this.baseMapper.queryDemoLoc(crn); } } src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -9,10 +9,12 @@ import com.zy.asrs.mapper.WaitPakinMapper; import com.zy.asrs.mapper.WrkMastMapper; import com.zy.asrs.service.*; import com.zy.asrs.utils.VersionUtils; import com.zy.common.model.MatDto; import com.zy.common.model.StartupDto; import com.zy.common.service.CommonService; import com.zy.common.utils.CollectionUtils; import com.zy.core.CrnThread; import com.zy.core.cache.MessageQueue; import com.zy.core.cache.SlaveConnection; import com.zy.core.enums.*; @@ -26,7 +28,6 @@ import com.zy.core.model.protocol.StaProtocol; import com.zy.core.properties.SlaveProperties; import com.zy.core.thread.BarcodeThread; import com.zy.core.CrnThread; import com.zy.core.thread.DevpThread; import com.zy.core.thread.LedThread; import lombok.extern.slf4j.Slf4j; @@ -91,6 +92,8 @@ private BasCrnpService basCrnpService; @Autowired private BasDevpService basDevpService; @Autowired private LocDetlService locDetlService; @Autowired private JdbcTemplate jdbcTemplate; @@ -930,4 +933,80 @@ } } /** * 堆垛机演示 ===>> 库位移转 */ @Async public void crnDemoOfLocMove(Integer crn){ for (int i = 0; i < 5; i++) { LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn); LocMast loc = locMastService.queryDemoLoc(crn); if (null == sourceLoc || null == loc) { break; } String sourceLocNo = sourceLoc.getLocNo(); String locNo = loc.getLocNo(); // 获取工作号 int workNo = commonService.getWorkNo(0); // 保存工作档 WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(workNo); wrkMast.setIoTime(new Date()); wrkMast.setWrkSts(11L); // 工作状态:11.生成出库ID wrkMast.setIoType(11); // 入出库状态: 11.库格移载 wrkMast.setIoPri(13D); wrkMast.setCrnNo(crn); wrkMast.setSourceLocNo(sourceLocNo); // 源库位 wrkMast.setLocNo(locNo); // 目标库位 wrkMast.setFullPlt("N"); // 满板:Y wrkMast.setPicking("N"); // 拣料 wrkMast.setExitMk("N"); // 退出 wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板 wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码 wrkMast.setLinkMis("N"); wrkMast.setAppeTime(new Date()); wrkMast.setModiTime(new Date()); int res = wrkMastMapper.insert(wrkMast); if (res == 0) { throw new CoolException("保存工作档失败"); } // 工作档明细保存 List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo)); for (LocDetl locDetl : locDetls) { WrkDetl wrkDetl = new WrkDetl(); wrkDetl.setWrkNo(workNo); wrkDetl.setIoTime(new Date()); wrkDetl.setAnfme(locDetl.getAnfme()); VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制 wrkDetl.setAppeTime(new Date()); wrkDetl.setModiTime(new Date()); if (!wrkDetlService.insert(wrkDetl)) { throw new CoolException("保存工作档明细失败"); } } // 修改源库位状态 if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) { sourceLoc.setLocSts("R"); // R.出库预约 sourceLoc.setModiTime(new Date()); if (!locMastService.updateById(sourceLoc)){ throw new CoolException("更新源库位状态失败"); } } else { throw new CoolException("源库位出库失败"); } // 修改目标库位状态 if (loc.getLocSts().equals("O")) { loc.setLocSts("S"); // S.入库预约 loc.setModiTime(new Date()); if (!locMastService.updateById(loc)) { throw new CoolException("更新目标库位状态失败"); } } else { throw new CoolException("移转失败"); } } } } src/main/resources/mapper/LocMastMapper.xml
@@ -41,4 +41,15 @@ <select id="queryFreeLocMast" resultMap="BaseResultMap"> select top 1 * from asr_loc_mast where row1=#{row} and loc_sts='O' order by loc_sts desc ,lev1 asc,bay1 asc </select> <select id="queryDemoSourceLoc" resultMap="BaseResultMap"> select top 1 * from asr_loc_mast where crn_no = #{crnNo} and (loc_sts='F' or loc_sts='D') order by loc_sts desc ,lev1 asc, bay1 asc, row1 asc </select> <select id="queryDemoLoc" resultMap="BaseResultMap"> select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts='O' order by loc_sts desc ,lev1 desc, bay1 desc, row1 desc </select> </mapper>