From 06e1ebee3ec23ceed20477eba43b2925ef6bb0c3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:33:46 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 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 f06c1a4..181fa69 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;
@@ -80,6 +79,17 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ taskWrk.setModiTime(now);
+ taskWrk.setAssignTime(new Date());
+ taskWrk.setModiUser(6666L);
+ try{
+ if (param.getIoType()>1){
+ if (Utils.locNoRowBoolean(locMast.getRow1())){
+ param.setTaskPriority(11);
+ }
+ }
+ }catch (Exception e){
+ }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -102,7 +112,7 @@
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setOriginStartPoint(param.getStartPoint());
+ taskWrk.setTargetPoint(param.getTargetPoint());
}
}
@@ -255,6 +265,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