From 007073969b6476689b558d4c787e6b42720e272a Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 25 三月 2025 21:34:05 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/dto/WmsPalletDto.java | 4 +
src/main/java/com/whyc/service/WmsService.java | 2
src/main/java/com/whyc/dto/WmsResponse.java | 22 ++-----
src/main/java/com/whyc/pojo/db_wms/Task.java | 96 ++++++++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/dto/WmsPalletDto.java b/src/main/java/com/whyc/dto/WmsPalletDto.java
index 94748b9..3da9c59 100644
--- a/src/main/java/com/whyc/dto/WmsPalletDto.java
+++ b/src/main/java/com/whyc/dto/WmsPalletDto.java
@@ -6,6 +6,10 @@
* 涓嬪彂浠诲姟璇锋眰鍙傛暟
*/
public class WmsPalletDto {
+
+ /**
+ * 浠诲姟绫诲瀷 1 =涓�妤煎嚭搴撱��2=娴嬬數鍘嬨��3=娲诲寲銆�4=浜屾ゼ鍑哄簱
+ */
private Integer des;
private List<String> pallets;
private List<String> activateParameter;
diff --git a/src/main/java/com/whyc/dto/WmsResponse.java b/src/main/java/com/whyc/dto/WmsResponse.java
index 39941c5..11efa77 100644
--- a/src/main/java/com/whyc/dto/WmsResponse.java
+++ b/src/main/java/com/whyc/dto/WmsResponse.java
@@ -1,22 +1,14 @@
package com.whyc.dto;
+import lombok.Data;
+import lombok.ToString;
+
+@ToString
+@Data
public class WmsResponse {
private Integer code;
private String message;
+ /**浠诲姟缂栧彿*/
+ private String task_no;
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
}
diff --git a/src/main/java/com/whyc/pojo/db_wms/Task.java b/src/main/java/com/whyc/pojo/db_wms/Task.java
new file mode 100644
index 0000000..f9f34c9
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_wms/Task.java
@@ -0,0 +1,96 @@
+package com.whyc.pojo.db_wms;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * CREATE TABLE db_wms.tb_task(
+ * id integer NOT NULL DEFAULT nextval('db_wms.task_id_seq'::regclass),
+ * task_no character varying(20) NOT NULL COLLATE pg_catalog."default",
+ * des inet,
+ * pallets character varying(50) NOT NULL COLLATE pg_catalog."default",
+ * activate_parameter character varying(50) COLLATE pg_catalog."default",
+ * task_type integer NOT NULL,
+ * start_location_code character varying(20) NOT NULL COLLATE pg_catalog."default",
+ * end_location_code character varying(20) NOT NULL COLLATE pg_catalog."default",
+ * status integer NOT NULL,
+ * status_time timestamp without time zone NOT NULL,
+ * execute_time timestamp without time zone,
+ * execute_end_time timestamp without time zone,
+ * create_time timestamp without time zone NOT NULL,
+ * end_time timestamp without time zone,
+ * PRIMARY KEY (id)
+ * )
+ *
+ * ;
+ *
+ * ALTER TABLE db_wms.tb_task
+ * OWNER TO sysdba;
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.task_no IS '浠诲姟缂栧彿';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.des IS '浠诲姟绫诲瀷 1 =涓�妤煎嚭搴撱��2=娴嬬數鍘嬨��3=娲诲寲銆�4=浜屾ゼ鍑哄簱';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.pallets IS '鐢垫睜缂栧彿,鐢ㄩ�楀彿闅斿紑';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.activate_parameter IS '娲诲寲鍙傛暟,鐢ㄩ�楀彿闅斿紑';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.task_type IS '浠诲姟绫诲瀷锛�1=鏅�氭惉杩愩��2=娲诲寲浠诲姟銆�3=缂撳瓨娴嬪帇浠诲姟銆�4=鍏ュ簱娴嬪帇浠诲姟銆�5=妫�娴嬫惉杩愪换鍔�';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.start_location_code IS '璧风偣缂栧彿';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.end_location_code IS '缁堢偣缂栧彿';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.status IS '鐘舵�侊細1=寮�濮嬪彇璐с��2=鍙栬揣瀹屾垚銆�4=鏀捐揣瀹屾垚锛� 11=寮�濮嬪彇娲诲寲鐢垫睜銆�12=鍙栧埌娲诲寲鐢垫睜銆�13=娲诲寲鐢垫睜鏀剧疆鍒版椿鍖栦粨鍐呫��14=寮�濮嬪彇娲诲寲缁撴潫鐨勭數姹犮��15=鍙栧埌娲诲寲缁撴潫鐨勭數姹犮��16=娲诲寲杩斿簱瀹屾垚锛� 21=寮�濮嬪彇娴嬪帇鐢垫睜銆�22=鍙栧埌娴嬪帇鐢垫睜銆�23=娴嬪帇鐢垫睜鏀剧疆鍒版椿鍖栦粨鍐呫��24=寮�濮嬪彇娴嬪帇缁撴潫鐨勭數姹犮��25=鍙栧埌娴嬪帇缁撴潫鐨勭數姹犮��26=娴嬪帇杩斿簱瀹屾垚';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.status_time IS '鑾峰彇鐘舵�佹椂瀵瑰簲鐨勬椂闂�';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.execute_time IS '娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑寮�濮嬫椂闂�';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.execute_end_time IS '娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑寮�濮嬫椂闂�';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.create_time IS '浠诲姟寮�濮嬫椂闂�';
+ *
+ * COMMENT ON COLUMN db_wms.tb_task.end_time IS '浠诲姟瀹屾垚鏃堕棿';
+ */
+@TableName(schema = "db_wms",value = "tb_task")
+@Data
+@ToString
+public class Task {
+
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+ @ApiModelProperty(value = "浠诲姟缂栧彿")
+ private String taskNo;
+ @ApiModelProperty(value = "浠诲姟绫诲瀷 1 =涓�妤煎嚭搴撱��2=娴嬬數鍘嬨��3=娲诲寲銆�4=浜屾ゼ鍑哄簱")
+ private Integer des;
+ @ApiModelProperty(value = "鐢垫睜缂栧彿,鐢ㄩ�楀彿闅斿紑")
+ private String pallets;
+ @ApiModelProperty(value = "婵�娲诲弬鏁�,鐢ㄩ�楀彿闅斿紑")
+ private String activateParameter;
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛�1=鏅�氭惉杩愩��2=娲诲寲浠诲姟銆�3=缂撳瓨娴嬪帇浠诲姟銆�4=鍏ュ簱娴嬪帇浠诲姟銆�5=妫�娴嬫惉杩愪换鍔�")
+ private Integer taskType;
+ @ApiModelProperty(value = "璧风偣缂栧彿")
+ private String startLocationCode;
+ @ApiModelProperty(value = "缁堢偣缂栧彿")
+ private String endLocationCode;
+ @ApiModelProperty(value = "鐘舵�侊細1=寮�濮嬪彇璐с��2=鍙栬揣瀹屾垚銆�4=鏀捐揣瀹屾垚锛� 11=寮�濮嬪彇娲诲寲鐢垫睜銆�12=鍙栧埌娲诲寲鐢垫睜銆�13=娲诲寲鐢垫睜鏀剧疆鍒版椿鍖栦粨鍐呫��14=寮�濮嬪彇娲诲寲缁撴潫鐨勭數姹犮��15=鍙栧埌娲诲寲缁撴潫鐨勭數姹犮��16=娲诲寲杩斿簱瀹屾垚锛� 21=寮�濮嬪彇娴嬪帇鐢垫睜銆�22=鍙栧埌娴嬪帇鐢垫睜銆�23=娴嬪帇鐢垫睜鏀剧疆鍒版椿鍖栦粨鍐呫��24=寮�濮嬪彇娴嬪帇缁撴潫鐨勭數姹犮��25=鍙栧埌娴嬪帇缁撴潫鐨勭數姹犮��26=娴嬪帇杩斿簱瀹屾垚")
+ private Integer status;
+ @ApiModelProperty(value = "鐘舵�佹椂闂�")
+ private Date statusTime;
+ @ApiModelProperty(value = "娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑寮�濮嬫椂闂�")
+ private Date executeTime;
+ @ApiModelProperty(value = "娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑缁撴潫鏃堕棿")
+ private Date executeEndTime;
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private Date createTime;
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date endTime;
+
+}
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index a1c38ef..4dc12cd 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -47,6 +47,8 @@
String dataStr = (String) response.getData();
WmsResponse responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponse.class);
response.set(1,responseInside);
+ //瀵逛笅鍙戠殑浠诲姟杩涜鏁版嵁搴撳瓨鍌�
+
}
return response;
}
--
Gitblit v1.9.1