From 786e52f559698f57a1e91aad2abc16c5453bd140 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期四, 16 五月 2024 14:14:05 +0800 Subject: [PATCH] # 手动移库生成 --- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index 971beea..5a91cb0 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -1,15 +1,19 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; +import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CombParam; +import com.zy.asrs.entity.param.LocMoveParam; import com.zy.asrs.entity.param.MobileAdjustParam; import com.zy.asrs.entity.param.PickParam; import com.zy.asrs.service.*; import com.zy.common.model.DetlDto; +import com.zy.common.service.AgvCommonService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,6 +51,10 @@ private AgvWorkService agvWorkService; @Autowired private AgvWrkDetlService agvWrkDetlService; + @Autowired + private AgvLocMastService agvLocMastService; + @Autowired + private AgvCommonService agvCommonService; /* @@ -93,7 +101,7 @@ } /* - 缁勬墭 + 缁戝畾鏆傚瓨浣� + 鍐嶆鎷f枡 */ @Override @Transactional @@ -353,4 +361,99 @@ } + /* + 鎵嬪姩绉诲簱 + */ + @Override + @Transactional + public String handControlLocMove(LocMoveParam param, Long userId) { + String fl = String.valueOf(param.getFloor()); + short floor =(short)Integer.parseInt(fl.substring(0, 1)); + Integer ioType = 0; + AgvLocMast agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", param.getLocNo())); + if (Cools.isEmpty(agvLocMast)) { + throw new CoolException("褰撳墠搴撲綅涓虹┖锛岃妫�鏌ュ簱浣嶏紒"); + } +// if (agvLocMast.getLocSts() == "F") { +// return R.error("褰撳墠搴撲綅涓嶄负鍦ㄥ簱锛屾垨鑰呯┖璐ф灦锛屼笉鏀寔绉诲簱"); + + // 鏍¢獙妤煎眰 + if (agvLocMast.getLocType1() != 3) { // 涓嶄负绠卞3鍖哄煙 + if (agvLocMast.getFloor() != floor) { + throw new CoolException("褰撳墠搴撲綅涓嶆敮鎸佽法妤煎眰杞Щ"); + } else { + ioType = 11; + } + } else { + ioType = 12; + } + Date now = new Date(); + //鏌ヨ宸ヤ綔妗� + AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode()); + if(!Cools.isEmpty(agvWrkMast)){ + throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�"); + } + //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅 + AgvLocMast locMast = agvCommonService.getLocNo(agvLocMast.getLocType1(),floor); + if (Cools.isEmpty(locMast)) { + throw new CoolException("褰撳墠妤煎眰娌℃湁绌哄簱浣�"); + } + //鐢熸垚宸ヤ綔妗� + AgvWrkMast mast = new AgvWrkMast(); + //宸ヤ綔鐘舵�� + mast.setWrkSts(201L); + //鍏ュ嚭搴撶被鍨� + mast.setIoType(ioType); + mast.setIoTime(now); + //浼樺厛绾� + mast.setIoPri(300.0); + //婧愮珯鐐� + mast.setSourceLocNo(agvLocMast.getLocNo()); + //鐩爣绔欑偣 + mast.setLocNo(locMast.getLocNo()); + //瀹瑰櫒缂栫爜 + mast.setBarcode(agvLocMast.getBarcode()); + //瀹瑰櫒绫诲瀷 + mast.setWhsType(30); + + mast.setAppeUser(userId); + mast.setAppeTime(now); + mast.setModiUser(userId); + mast.setModiTime(now); + if (!agvWrkMastService.insertByIncrease(mast)) { + throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); + } + if (!agvLocMast.getLocSts().equals("F")) { + AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo())); + //鐢熸垚宸ヤ綔妗f槑缁� + List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo())); + agvLocDetls.forEach(agvLocDetl -> { + AgvWrkDetl wrkDetl = new AgvWrkDetl(); + wrkDetl.setWrkNo(mast1.getWrkNo()); + wrkDetl.sync(agvLocDetl); + wrkDetl.setSuppCode(agvLocDetl.getSuppCode()); + wrkDetl.setIoTime(now); + wrkDetl.setAppeUser(9527L); + wrkDetl.setAppeTime(now); + wrkDetl.setModiUser(9527L); + wrkDetl.setModiTime(now); + if (!agvWrkDetlService.insert(wrkDetl)) { + throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); + } + }); + } + //鏇存柊鐩爣搴撲綅鐘舵�� + updateAgvLocMast(agvLocMast,"P"); + updateAgvLocMast(locMast,"Q"); + return "ok"; + } + + /* + 鏇存柊鐩爣搴撲綅淇℃伅 + */ + private void updateAgvLocMast(AgvLocMast locMast, String locSts){ + locMast.setLocSts(locSts); + agvLocMastService.updateById(locMast); + } + } -- Gitblit v1.9.1