From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
index d87cda4..e782bd8 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity.param;
-import io.swagger.models.auth.In;
import lombok.Data;
@Data
@@ -32,9 +31,12 @@
//鍫嗗灈鏈�
private Integer crn;
- public TaskCreateParam(){};
+ public TaskCreateParam() {
+ }
- public TaskCreateParam(WMSAndAGVInterfaceParam param){
+ ;
+
+ public TaskCreateParam(WMSAndAGVInterfaceParam param) {
this.taskNo = param.getTaskNo();
this.ioType = convertParamIoType(param.getTaskType());
this.barcode = param.getContainerCode();
@@ -43,22 +45,26 @@
this.targetPoint = param.getTargetLocationCode();
this.emptyContainer = param.getEmptyContainer();
this.crn = param.getTaskTunnel();
- };
+ }
- public TaskCreateParam(CarryParam param, Integer crn){
+ ;
+
+ public TaskCreateParam(CarryParam param, Integer crn) {
this.taskNo = param.getTaskNo();
- this.ioType = param.getIoType();
- this.barcode = param.getBarcode();
- this.taskPriority = 300;
+ this.ioType = param.getStereoscopicTaskType();
+ this.barcode = param.getBoxNo();
+ this.taskPriority = 12;
this.startPoint = param.getStartPoint();
- this.targetPoint = param.getTargetPoint();
+ this.targetPoint = param.getTerminalNo();
this.emptyContainer = "N";
this.crn = crn;
- };
+ }
+
+ ;
- public static Integer convertParamIoType(String paramIoType){
- switch (paramIoType){
+ public static Integer convertParamIoType(String paramIoType) {
+ switch (paramIoType) {
case "RK":
return 1;
case "CK":
--
Gitblit v1.9.1