From c7bcef9d03f58c984d475932710c247ee778d95b Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期二, 09 四月 2024 23:31:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 56b2679..8c59836 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -8,10 +8,7 @@ import com.core.exception.CoolException; import com.zy.asrs.domain.enums.TaskStatusType; import com.zy.asrs.domain.enums.WorkNoType; -import com.zy.asrs.entity.LocMast; -import com.zy.asrs.entity.StaDesc; -import com.zy.asrs.entity.TaskWrk; -import com.zy.asrs.entity.ToWmsDTO; +import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.TaskOverParam; import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam; import com.zy.asrs.entity.param.TaskCreateParam; @@ -50,6 +47,8 @@ private CommonService commonService; @Autowired private LocMastService locMastService; + @Autowired + private BasDevpService basDevpService; @@ -255,6 +254,40 @@ } + @Override + public R getAgvPickAndPlaceV1(TaskOverParam param) { + BasDevp basDevp = basDevpService.selectById(param.getStaNo()); + if (Cools.isEmpty(basDevp)){ + return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo()); + } + if (param.getType()==0 && basDevp.getAgvStartPick()==1){ + return R.ok(); + }else if (param.getType()==1 && basDevp.getAgvStartPlace()==1){ + return R.ok(); + }else { + return R.error("涓嶅厑璁�"); + } + } + + @Override + public R getAgvPickAndPlaceV2(TaskOverParam param) { + BasDevp basDevp = basDevpService.selectById(param.getStaNo()); + if (Cools.isEmpty(basDevp)){ + return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo()); + } + if (param.getType()==0){ + basDevp.setAgvTargetPick(1); + basDevpService.updateById(basDevp); + return R.ok(); + }else if (param.getType()==1){ + basDevp.setAgvTargetPlace(1); + basDevpService.updateById(basDevp); + return R.ok(); + }else { + return R.error("璇锋眰绫诲瀷寮傚父"+param.getType()); + } + } + public List<Integer> getInEnableRoadway(){ int[] roadway = null; List<Integer> list = new ArrayList<>(); -- Gitblit v1.9.1