From d9d5c6dd59f2f844a11f70f0bbec4b88a4228351 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 14 五月 2024 16:18:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2 src/main/java/com/zy/asrs/controller/AgvMobileController.java | 19 ++-- src/main/java/com/zy/asrs/entity/param/LocMoveParam.java | 11 ++ src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 102 +++++++++++++++++++++++++ src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 20 ++++- src/main/webapp/views/agvWrkMast/wrkMast.html | 3 src/main/java/com/zy/asrs/controller/AgvWorkController.java | 5 + src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 2 src/main/webapp/static/js/agvWrkMast/wrkMast.js | 20 +++++ src/main/java/com/zy/asrs/service/AgvMobileService.java | 7 + src/main/java/com/zy/asrs/service/AgvWorkService.java | 2 11 files changed, 177 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index f61ca98..3435ed6 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -9,20 +9,14 @@ import com.zy.asrs.entity.AgvLocDetl; import com.zy.asrs.entity.AgvLocMast; import com.zy.asrs.entity.LocMast; -import com.zy.asrs.entity.param.AgvMobileStartPakin; -import com.zy.asrs.entity.param.AgvMobileStartParam; -import com.zy.asrs.entity.param.CombParam; -import com.zy.asrs.entity.param.PickParam; +import com.zy.asrs.entity.param.*; import com.zy.asrs.service.*; import com.zy.common.web.BaseController; import io.swagger.models.auth.In; import lombok.Synchronized; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; @@ -370,6 +364,7 @@ @PostMapping("/agv/v1/locMove") @Transactional + @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�") public R agvLocMove(@RequestBody HashMap<String,Object> params){ String fl = String.valueOf(params.get("floor")); short floor =(short)Integer.parseInt(fl.substring(0, 1)); @@ -391,6 +386,14 @@ return R.ok(); } + @PostMapping("/hand/control/locMove") + @Transactional + @ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ") + public R handControlLocMove(@RequestBody LocMoveParam param){ + agvMobileService.handControlLocMove(param, getUserId()); + return R.ok(); + } + public static void main(String[] args) { List<AgvLocDetl> agvLocDetls1 = new ArrayList<>(); List<AgvLocDetl> agvLocDetls2 = new ArrayList<>(); diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java index 54ffa2d..7afa56a 100644 --- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java +++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java @@ -49,7 +49,10 @@ workService.completeWrkMast(workNo, getUserId()); return R.ok("宸ヤ綔妗e凡瀹屾垚"); } else if (type == 2) { - workService.cancelWrkMast(workNo, getUserId()); + workService.cancelWrkMast(workNo, getUserId(),2); + return R.ok("宸ヤ綔妗e凡鍙栨秷"); + } else if (type == 5) { + workService.cancelWrkMast(workNo, getUserId(),5); return R.ok("宸ヤ綔妗e凡鍙栨秷"); } return R.ok(); diff --git a/src/main/java/com/zy/asrs/entity/param/LocMoveParam.java b/src/main/java/com/zy/asrs/entity/param/LocMoveParam.java new file mode 100644 index 0000000..3fe9d9c --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/param/LocMoveParam.java @@ -0,0 +1,11 @@ +package com.zy.asrs.entity.param; + +import lombok.Data; + +@Data +public class LocMoveParam { + + private String locNo; + + private String floor; +} diff --git a/src/main/java/com/zy/asrs/service/AgvMobileService.java b/src/main/java/com/zy/asrs/service/AgvMobileService.java index 0afc65d..ff4ff95 100644 --- a/src/main/java/com/zy/asrs/service/AgvMobileService.java +++ b/src/main/java/com/zy/asrs/service/AgvMobileService.java @@ -2,6 +2,7 @@ import com.zy.asrs.entity.AgvBasDevp; 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; @@ -34,4 +35,10 @@ void pakoutEmpty(String devNo); + + /** + * 鎵嬪姩搴撲綅杞Щ + */ + String handControlLocMove(LocMoveParam param, Long userId); + } diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java index 8591a4a..5ce7031 100644 --- a/src/main/java/com/zy/asrs/service/AgvWorkService.java +++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java @@ -56,6 +56,6 @@ /** * 鎵嬪姩鍙栨秷宸ヤ綔妗� */ - void cancelWrkMast(String workNo, Long userId); + void cancelWrkMast(String workNo, Long userId, Integer type); } 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 39c05bb..ea76c2e 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -4,13 +4,16 @@ 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; @@ -48,6 +51,10 @@ private AgvWorkService agvWorkService; @Autowired private AgvWrkDetlService agvWrkDetlService; + @Autowired + private AgvLocMastService agvLocMastService; + @Autowired + private AgvCommonService agvCommonService; /* @@ -354,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,"R"); + updateAgvLocMast(locMast,"S"); + return "ok"; + } + + /* + 鏇存柊鐩爣搴撲綅淇℃伅 + */ + private void updateAgvLocMast(AgvLocMast locMast, String locSts){ + locMast.setLocSts(locSts); + agvLocMastService.updateById(locMast); + } + } diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index e524a96..51b9d57 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -580,7 +580,7 @@ } @Transactional - public void cancelWrkMast(String workNo, Long userId) { + public void cancelWrkMast(String workNo, Long userId,Integer type) { AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo); if (Cools.isEmpty(wrkMast)){ throw new CoolException(workNo+"宸ヤ綔妗d笉瀛樺湪"); @@ -599,8 +599,18 @@ agvLocMastService.updateLocStsByLocNo(locNo,"O","",null); agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue()); + // 绉诲簱鍙栨秷 + }else if(wrkMast.getIoType() == 108) { + //婧愬簱浣� + String locNo = wrkMast.getSourceLocNo(); + //鐩爣绔欑偣 + String devNo = wrkMast.getLocNo(); + agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo)); + if(devNo.contains("@")){ + agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null); + } //鍑哄簱鍙栨秷 - }else { + } else { //婧愬簱浣� String locNo = wrkMast.getSourceLocNo(); //鐩爣绔欑偣 @@ -645,9 +655,11 @@ if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){ throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠$悊鍛�"); } + if (type == 2) { + //璋冪敤agv鍙栨秷浠诲姟鎺ュ彛 + agvWrkMastService.callCancelTask(wrkMast.getWrkNo()); + } - //璋冪敤agv鍙栨秷浠诲姟鎺ュ彛 - agvWrkMastService.callCancelTask(wrkMast.getWrkNo()); } diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java index 5739028..4663e33 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java @@ -187,7 +187,7 @@ agvWrkMast.setWrkNo(-agvWrkMast.getWrkNo()); } agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString()); - if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 109) { + if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 12) { agvTaskCreateParam.setTaskTyp("F06"); } else { agvTaskCreateParam.setTaskTyp("F01"); diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java index a9789ce..08ec96a 100644 --- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java @@ -107,6 +107,8 @@ .or().eq("io_type", 1) .or().eq("io_type", 10) .or().eq("io_type", 57) + .or().eq("io_type", 11) + .or().eq("io_type", 12) .or().eq("io_type", 109) .or().eq("io_type", 108)).getRecords(); diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js index fd57ab4..b5724c2 100644 --- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js +++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js @@ -349,6 +349,26 @@ }); } break; + // 鍙栨秷 + case 'cancel1': + if (data.pdcType === "Y") { + layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ + http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:5}, function (res) { + $(".layui-laypage-btn")[0].click(); + layer.msg(data.wrkNo + res.msg); + }) + layer.closeAll(); + }); + } else { + layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ + http.post(baseUrl+"/agv/hand/control/wrkMast", {workNo: data.wrkNo, type:5}, function (res) { + $(".layui-laypage-btn")[0].click(); + layer.msg(data.wrkNo + res.msg); + }) + layer.closeAll(); + }); + } + break; // 鎷f枡鍏ュ簱 case 'pick': layer.confirm('鎷f枡鍏ュ簱璇ョ瑪宸ヤ綔妗o紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){ diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html index 2af8353..1743c5b 100644 --- a/src/main/webapp/views/agvWrkMast/wrkMast.html +++ b/src/main/webapp/views/agvWrkMast/wrkMast.html @@ -121,7 +121,8 @@ <script type="text/html" id="operate"> <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a> <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a> - <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷(AGV)</a> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel1">鍙栨秷</a> <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a> {{#if (d.steNo) { }} <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">寮冭溅</a> -- Gitblit v1.9.1