From dfb16176c060ace64d01926c42e041d268e90262 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:31:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
index 29ea9c4..8922962 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskAssignmentParam.java
@@ -5,10 +5,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasAgvLocNo;
import com.zy.asrs.entity.BasAgvMast;
-import com.zy.asrs.entity.BasArmMast;
-import com.zy.asrs.entity.result.OrderDetlValueResultUtil;
import com.zy.asrs.service.BasAgvLocNoService;
-import com.zy.asrs.service.BasDevpErrorLogService;
import lombok.Data;
import java.util.ArrayList;
@@ -38,15 +35,23 @@
switch (basAgvMast.getIoType()){
case 0:
getAgvTaskAssignmentParam0(basAgvMast);
+ taskTyp = "1FQ3";
+ ctnrTyp = "1";
return;
case 1:
getAgvTaskAssignmentParam1(basAgvMast);
+// taskTyp = "1FQ2";
+ ctnrTyp = "1";
return;
case 2:
getAgvTaskAssignmentParam2(basAgvMast);
+ taskTyp = "1FQ1";
+ ctnrTyp = "1";
return;
case 3:
getAgvTaskAssignmentParam3(basAgvMast);
+// taskTyp = "1FQ4";
+ ctnrTyp = "1";
return;
default:
return;
@@ -61,7 +66,7 @@
SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
long nextId = snowflakeIdWorker.nextId();
- this.taskCode = String.valueOf(nextId);
+ this.taskCode = basAgvMast.getTaskNo()+"-"+basAgvMast.getTimestamp();
PositionCodePathClass positionCodePathClassEnd = new PositionCodePathClass();
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
positionCodePathClassEnd.setPositionCode(basAgvLocNoSou.getAgvLocNo());
@@ -78,7 +83,7 @@
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
this.reqCode = basAgvMast.getTaskNo().toString();
- this.taskCode = basAgvMast.getTimestamp().toString();
+ this.taskCode = basAgvMast.getTaskNo()+"-"+basAgvMast.getTimestamp();
PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
@@ -93,7 +98,7 @@
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
this.reqCode = basAgvMast.getTaskNo().toString();
- this.taskCode = basAgvMast.getTimestamp().toString();
+ this.taskCode = basAgvMast.getTaskNo()+"-"+basAgvMast.getTimestamp();
PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
BasAgvLocNo basAgvLocNoSou= basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getSourceStaNo()));
positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
@@ -108,7 +113,7 @@
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
this.reqCode = basAgvMast.getTaskNo().toString();
- this.taskCode = basAgvMast.getTimestamp().toString();
+ this.taskCode = basAgvMast.getTaskNo()+"-"+basAgvMast.getTimestamp();
PositionCodePathClass positionCodePathClassSou = new PositionCodePathClass();
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getSourceStaNo()));
positionCodePathClassSou.setPositionCode(basAgvLocNoSou.getAgvLocNo());
--
Gitblit v1.9.1