diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml index ba11b96..5a6aee2 100644 --- a/acs/nladmin-system/pom.xml +++ b/acs/nladmin-system/pom.xml @@ -470,8 +470,10 @@ **/*.* + + **/*.java + - ${basedir}/src/main/resources diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java index 33b59b3..b6bcde7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java @@ -1,6 +1,7 @@ package org.nl.acs.device_driver; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -9,32 +10,37 @@ import com.alibaba.fastjson.JSONObject; * https://blog.csdn.net/moneyshi/article/details/82978073 */ public enum RequestMethodEnum { - order_verify(1, "order_verify", "人工排产确认"), + order_verify(1, "order_verify", "人工排产确认","0"), - order_finish(2, "order_finish", "工单完成"), + order_finish(2, "order_finish", "工单完成","0"), - apply_put_full_vehicle(3, "apply_put_full_vehicle", "申请补满料盅托盘(叫料)"), + apply_put_full_vehicle(3, "apply_put_full_vehicle", "申请补满料盅托盘(叫料)","0"), - apply_put_empty_vehicle(4, "apply_put_empty_vehicle", "申请补空料盅托盘(叫空盘)"), + apply_put_empty_vehicle(4, "apply_put_empty_vehicle", "申请补空料盅托盘(叫空盘)","0"), - apply_take_empty_vehicle(5, "apply_take_empty_vehicle", "申请取走空料盅托盘(取空盘)"), + apply_take_empty_vehicle(5, "apply_take_empty_vehicle", "申请取走空料盅托盘(取空盘)","0"), - apply_take_full_vehicle(6, "apply_take_full_vehicle", "申请取走满料盅托盘（入库）"), + apply_take_full_vehicle(6, "apply_take_full_vehicle", "申请取走满料盅托盘（入库）","0"), - apply_force_take_full_vehicle(7, "apply_force_take_full_vehicle", "申请强制取走满料盅托盘(强制入库)"), + apply_force_take_full_vehicle(7, "apply_force_take_full_vehicle", "申请强制取走满料盅托盘(强制入库)","0"), - apply_force_take_full_vehicle_in_storage(8, "apply_force_take_full_vehicle_in_storage", "申请强制满托入缓存"), + apply_force_take_full_vehicle_in_storage(8, "apply_force_take_full_vehicle_in_storage", "申请强制满托入缓存","0"), - barcode_sucess_apply(9, "barcode_sucess_apply", "扫码成功申请"), + barcode_sucess_apply(9, "barcode_sucess_apply", "扫码成功申请","0"), - get_vehicle_info(10, "get_vehicle_info", "获取组盘信息"), + get_vehicle_info(10, "get_vehicle_info", "获取组盘信息","0"), - force_no_package(11, "force_no_package", "强制去包装位-不包装"), + force_no_package(11, "force_no_package", "强制去包装位-不包装","0"), - apply_labelling(12, "apply_labelling", "申请贴标"), + apply_labelling(12, "apply_labelling", "申请贴标","0"), - apply_one_grab(13, "apply_one_grab", "单次放置完成"); + apply_one_grab(13, "apply_one_grab", "单次放置完成","0"), + real_time_set_point(14, "real_time_set_point", "反馈光电状态","1"), + + feedback_task_status(15, "feedback_task_status", "反馈任务状态","1"), + + feedback_device_status(16, "feedback_device_status", "反馈设备状态","1"); //驱动索引 private int index; @@ -46,31 +52,24 @@ public enum RequestMethodEnum { private String desc; //设备驱动类型 private String type; + //是否隐藏显示 0否1是 + private String isHidden; // 构造方法 - RequestMethodEnum(int index, String code, String name) { + RequestMethodEnum(int index, String code, String name, String isHidden) { this.index = index; this.code = code; this.name = name; + this.isHidden = isHidden; } + //只反馈未隐藏的 public static JSONArray getList() { JSONArray arr = new JSONArray(); for (RequestMethodEnum em : RequestMethodEnum.values()) { JSONObject json = new JSONObject(); - json.put("code", em.getCode()); - json.put("name", em.getName()); - arr.add(json); - } - return arr; - } - - public static JSONArray getListByType(String type) { - JSONArray arr = new JSONArray(); - for (RequestMethodEnum em : RequestMethodEnum.values()) { - if (em.getType().equals(type)) { - JSONObject json = new JSONObject(); + if(StrUtil.equals(em.getIsHidden(),"0")){ json.put("code", em.getCode()); json.put("name", em.getName()); arr.add(json); @@ -79,6 +78,7 @@ public enum RequestMethodEnum { return arr; } + public String getCode() { return code; } @@ -103,8 +103,8 @@ public enum RequestMethodEnum { this.desc = desc; } - public String getType() { - return type; + public String getIsHidden() { + return isHidden; } public void setType(String type) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java index e057a01..bffbb20 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java @@ -1,16 +1,13 @@ package org.nl.acs.device_driver.lnsh.lnsh_mixing_mill; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.AgvUtil; import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -20,7 +17,7 @@ import org.nl.acs.device_driver.StandardRequestMethod; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -34,7 +31,6 @@ import org.nl.modules.lucene.service.LuceneExecuteLogService; import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.http.HttpStatus; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java index ced219b..49fab5e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java @@ -2,7 +2,6 @@ package org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; @@ -18,8 +17,8 @@ import org.nl.acs.device_driver.StandardRequestMethod; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; -import org.nl.acs.ext.wms.data.grab.GrabRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.grab.GrabRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -32,7 +31,6 @@ import org.nl.modules.lucene.service.LuceneExecuteLogService; import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; import java.lang.reflect.Method; import java.util.Date; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index cbae0df..0b46b78 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -19,7 +19,7 @@ import org.nl.acs.device_driver.StandardRequestMethod; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index b55fe74..6bbfb42 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -1,16 +1,13 @@ package org.nl.acs.device_driver.lnsh.lnsh_station; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.Setter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.agv.AgvUtil; import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -20,7 +17,7 @@ import org.nl.acs.device_driver.StandardRequestMethod; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -33,7 +30,6 @@ import org.nl.modules.lucene.service.LuceneExecuteLogService; import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.http.HttpStatus; import java.lang.reflect.Method; import java.util.Date; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java similarity index 74% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskRequest.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java index 989448e..10f0657 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskRequest.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java @@ -1,7 +1,8 @@ -package org.nl.acs.ext.wms.data.applyTask; +package org.nl.acs.ext.wms.data.AcsToWmsData.applyTask; import lombok.Data; import org.nl.acs.ext.wms.data.BaseRequest; +import org.nl.acs.ext.wms.data.PalletizeDto; @Data public class ApplyTaskRequest extends BaseRequest { @@ -36,4 +37,9 @@ public class ApplyTaskRequest extends BaseRequest { */ private String qty; + /** + * 砖型 + */ + private PalletizeDto palletizeDto; + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java new file mode 100644 index 0000000..c693c1d --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java @@ -0,0 +1,17 @@ +package org.nl.acs.ext.wms.data.AcsToWmsData.applyTask; + +import org.nl.acs.ext.wms.data.BaseResponse; + +public class ApplyTaskResponse extends BaseResponse { + + /** + * 是否静置完成 1完成 + */ + private String is_standing_finish; + + /** + * 是否优先包装 + */ + private String is_package; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusRequest.java similarity index 82% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsRequest.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusRequest.java index c563816..941e1f8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsRequest.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusRequest.java @@ -1,10 +1,10 @@ -package org.nl.acs.ext.wms.data.feedBackTaskStatus; +package org.nl.acs.ext.wms.data.AcsToWmsData.feedBackTaskStatus; import lombok.Data; import org.nl.acs.ext.wms.data.BaseRequest; @Data -public class FeedBackTaskStautsRequest extends BaseRequest { +public class FeedBackTaskStatusRequest extends BaseRequest { /** * 任务id diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusResponse.java new file mode 100644 index 0000000..96066c3 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackTaskStatus/FeedBackTaskStatusResponse.java @@ -0,0 +1,6 @@ +package org.nl.acs.ext.wms.data.AcsToWmsData.feedBackTaskStatus; + +import org.nl.acs.ext.wms.data.BaseResponse; + +public class FeedBackTaskStatusResponse extends BaseResponse { +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java new file mode 100644 index 0000000..72f95cf --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java @@ -0,0 +1,12 @@ +package org.nl.acs.ext.wms.data.AcsToWmsData.getVehicle; + +import org.nl.acs.ext.wms.data.BaseRequest; + +public class GetPalletizeRequest extends BaseRequest { + + /** + * 载具号 + */ + private String vehicle_code; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java new file mode 100644 index 0000000..65138b5 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java @@ -0,0 +1,9 @@ +package org.nl.acs.ext.wms.data.AcsToWmsData.getVehicle; + +import org.nl.acs.ext.wms.data.BaseResponse; +import org.nl.acs.ext.wms.data.PalletizeDto; + +public class GetPalletizeResponse extends BaseResponse { + + private PalletizeDto palletizeDto; +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java similarity index 95% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabRequest.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java index 9b82824..64a8e2a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabRequest.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.wms.data.grab; +package org.nl.acs.ext.wms.data.AcsToWmsData.grab; import lombok.Data; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java similarity index 66% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabResponse.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java index f0ee0b8..43b9dc7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/grab/GrabResponse.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java @@ -1,4 +1,4 @@ -package org.nl.acs.ext.wms.data.grab; +package org.nl.acs.ext.wms.data.AcsToWmsData.grab; import org.nl.acs.ext.wms.data.BaseResponse; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java new file mode 100644 index 0000000..ec9e411 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java @@ -0,0 +1,120 @@ +package org.nl.acs.ext.wms.data; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 垛型参数 + * @Date: 2023/7/18 + */ +@Data +public class PalletizeDto { + /** 产品编号 */ + private String product_code; + /** A长边 */ + private String AlongSide; + /** B短边 */ + private String BshortSide; + /** H梯形高 */ + private String Htrapezoidal; + /** W厚度 */ + private String Wthickness; + /** 当前垛盘数 */ + private String tray_qty; + /** 垛盘高度 */ + private String tray_high; + /** 垛型类别 */ + private String crib_category; + /** 码垛X1行 */ + private String palletX1_line; + /** 码垛Y1列 */ + private String palletY1_row; + /** 码垛A1角度 */ + private String palletA1_angle; + /** 码垛X2行 */ + private String palletX2_line; + /** 码垛Y2列 */ + private String palletY2_row; + /** 码垛A2角度 */ + private String palletA2_angle; + /** 码垛X3行 */ + private String palletX3_line; + /** 码垛Y3列 */ + private String palletY3_row; + /** 码垛A3角度 */ + private String palletA3_angle; + /** 压垛X1行 */ + private String pressCribX1_line; + /** 压垛Y1列 */ + private String pressCribY1_row; + /** 压垛A1角度 */ + private String pressCribA1_angle; + /** 压垛X2行 */ + private String pressCribX2_line; + /** 压垛Y2列 */ + private String pressCribY2_row; + /** 压垛A2角度 */ + private String pressCribA2_angle; + /** 压垛X3行 */ + private String pressCribX3_line; + /** 压垛Y3列 */ + private String pressCribY3_row; + /** 压垛A3角度 */ + private String pressCribA3_angle; + /** Z轴偏移 */ + private String Zoffset; + /** 码垛层数 */ + private String pallet_layerQty; + /** 压垛层数 */ + private String pressCrib_layerQty; + /** 码层X1间隔 */ + private String codeLayerX1_interval; + /** 码层Y1间隔 */ + private String codeLayerY1_interval; + /** 码层X2间隔 */ + private String codeLayerX2_interval; + /** 码层Y2间隔 */ + private String codeLayerY2_interval; + /** 码层X3间隔 */ + private String codeLayerX3_interval; + /** 码层Y3间隔 */ + private String codeLayerY3_interval; + /** 码层X1偏移 */ + private String codeLayerX1_offset; + /** 码层Y1偏移 */ + private String codeLayerY1_offset; + /** 码层X2偏移 */ + private String codeLayerX2_offset; + /** 码层Y2偏移 */ + private String codeLayerY2_offset; + /** 码层X3偏移 */ + private String codeLayerX3_offset; + /** 码层Y3偏移 */ + private String codeLayerY3_offset; + /** 压层X1间隔 */ + private String pressLayerX1_interval; + /** 压层Y1间隔 */ + private String pressLayerY1_interval; + /** 压层X2间隔 */ + private String pressLayerX2_interval; + /** 压层Y2间隔 */ + private String pressLayerY2_interval; + /** 压层X3间隔 */ + private String pressLayerX3_interval; + /** 压层Y3间隔 */ + private String pressLayerY3_interval; + /** 压层X1偏移 */ + private String pressLayerX1_offset; + /** 压层Y1偏移 */ + private String pressLayerY1_offset; + /** 压层X2偏移 */ + private String pressLayerX2_offset; + /** 压层Y2偏移 */ + private String pressLayerY2_offset; + /** 压层X3偏移 */ + private String pressLayerX3_offset; + /** 压层Y3偏移 */ + private String pressLayerY3_offset; + /** 工具坐标 */ + private String tool_coordinate; +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskRequest.java new file mode 100644 index 0000000..aa6e419 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskRequest.java @@ -0,0 +1,31 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.cancelTask; + +import lombok.Data; +import org.nl.acs.ext.wms.data.BaseRequest; + +import java.util.Map; + +@Data +public class CancelTaskRequest extends BaseRequest { + + /** + * 任务标识 + */ + private String ext_task_id; + + /** + * 任务编号 + */ + private String task_code; + + /** + * 载具号 + */ + String vehicle_code; + + /** + * 扩展属性 + */ + Map params; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskResponse.java new file mode 100644 index 0000000..e294c01 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/cancelTask/CancelTaskResponse.java @@ -0,0 +1,9 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.cancelTask; + +import org.nl.acs.ext.wms.data.BaseResponse; + +public class CancelTaskResponse extends BaseResponse { + + + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskRequest.java new file mode 100644 index 0000000..ceebb3e --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskRequest.java @@ -0,0 +1,121 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.createTask; + +import lombok.Data; +import org.nl.acs.ext.wms.data.BaseRequest; + +import java.util.Map; + +@Data +public class CreateTaskRequest extends BaseRequest { + + /** + * 任务标识 + */ + private String ext_task_id; + + /** + * 任务编号 + */ + private String task_code; + + + /** + * 取货点1 + */ + String start_device_code; + + /** + * 放货点1 + */ + String next_device_code; + + /** + * 取货点2 + */ + String start_device_code2; + + /** + * 放货点2 + */ + String next_device_code2; + + /** + * 对接位 + */ + String put_device_code; + + /** + * 优先级 + */ + String priority; + + /** + * 载具号 + */ + String vehicle_code; + + /** + * 载具类型 + */ + String vehicle_type; + + /** + * 路由方案 + */ + String route_plan_code; + + /** + * 任务类型 + */ + String task_type; + + /** + * 立库任务类型 + * + */ + String dtl_type; + + /** + * Agv系统类型 + * 1:1楼叉车系统 + * 2:2楼1区域AGV系统 + * 3:2楼2区域AGV系统 + */ + String agv_system_type; + + /** + * 备注 + */ + String remark; + + /** + * 烘箱时间 + */ + String oven_time; + + /** + * 烘箱温度 + */ + String temperature; + + /** + * agv取货高度 + */ + private String start_height; + + /** + * agv放货高度 + */ + private String next_height; + + /** + * 方向 1往左 2往右 + */ + private String direction; + + /** + * 扩展属性 + */ + Map params; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskResponse.java new file mode 100644 index 0000000..57c135e --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createTask/CreateTaskResponse.java @@ -0,0 +1,8 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.createTask; + +import org.nl.acs.ext.wms.data.BaseResponse; + +public class CreateTaskResponse extends BaseResponse { + + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionRequest.java new file mode 100644 index 0000000..16d45cc --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionRequest.java @@ -0,0 +1,19 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.putAction; + +import lombok.Data; +import org.nl.acs.ext.wms.data.BaseRequest; + +import java.util.List; +import java.util.Map; + +@Data +public class PutActionRequest extends BaseRequest { + + /** + * 设备号 + */ + private String device_code; + + private List list ; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionResponse.java new file mode 100644 index 0000000..48b8289 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/PutActionResponse.java @@ -0,0 +1,9 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.putAction; + +import org.nl.acs.ext.wms.data.BaseResponse; + +public class PutActionResponse extends BaseResponse { + + + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/SignalData.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/SignalData.java new file mode 100644 index 0000000..cb82966 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/putAction/SignalData.java @@ -0,0 +1,12 @@ +package org.nl.acs.ext.wms.data.WmstoAcsData.putAction; + +import lombok.Data; + +@Data +public class SignalData { + + private String code; + + private String value; + +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskResponse.java deleted file mode 100644 index f75eb57..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/applyTask/ApplyTaskResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.acs.ext.wms.data.applyTask; - -import org.nl.acs.ext.wms.data.BaseResponse; - -public class ApplyTaskResponse extends BaseResponse { - - /** - * 是否静置完成 - */ - private String is_standing_finish; - - - -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsResponse.java deleted file mode 100644 index 26d53f8..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/feedBackTaskStatus/FeedBackTaskStautsResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.nl.acs.ext.wms.data.feedBackTaskStatus; - -import org.nl.acs.ext.wms.data.BaseResponse; - -public class FeedBackTaskStautsResponse extends BaseResponse { -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 0c80e5b..5bb5de8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSONObject; import org.nl.acs.ext.wms.data.BaseRequest; import org.nl.acs.ext.wms.data.BaseResponse; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskResponse; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse; import java.util.Map; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index daa95af..ed089a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -18,8 +18,8 @@ import org.nl.acs.ext.wms.RespUtil; import org.nl.acs.ext.wms.data.BaseRequest; import org.nl.acs.ext.wms.data.BaseResponse; import org.nl.acs.ext.wms.data.Resp; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskRequest; -import org.nl.acs.ext.wms.data.applyTask.ApplyTaskResponse; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; +import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.task.service.TaskService;