From cf3aa090e21f1743c2c998309a83897b05241c63 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 03 四月 2025 15:27:59 +0800
Subject: [PATCH] 巡检记录
---
src/main/java/com/whyc/dto/WmsPalletDto.java | 7 ++++---
src/main/java/com/whyc/service/WmsService.java | 29 +++++++++++++++++------------
src/main/java/com/whyc/dto/WmsResponse.java | 4 +++-
3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/whyc/dto/WmsPalletDto.java b/src/main/java/com/whyc/dto/WmsPalletDto.java
index 3da9c59..97def9b 100644
--- a/src/main/java/com/whyc/dto/WmsPalletDto.java
+++ b/src/main/java/com/whyc/dto/WmsPalletDto.java
@@ -1,5 +1,6 @@
package com.whyc.dto;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -11,7 +12,7 @@
* 浠诲姟绫诲瀷 1 =涓�妤煎嚭搴撱��2=娴嬬數鍘嬨��3=娲诲寲銆�4=浜屾ゼ鍑哄簱
*/
private Integer des;
- private List<String> pallets;
+ private LinkedList<String> pallets;
private List<String> activateParameter;
public Integer getDes() {
@@ -22,11 +23,11 @@
this.des = des;
}
- public List<String> getPallets() {
+ public LinkedList<String> getPallets() {
return pallets;
}
- public void setPallets(List<String> pallets) {
+ public void setPallets(LinkedList<String> pallets) {
this.pallets = pallets;
}
diff --git a/src/main/java/com/whyc/dto/WmsResponse.java b/src/main/java/com/whyc/dto/WmsResponse.java
index 11efa77..3f13527 100644
--- a/src/main/java/com/whyc/dto/WmsResponse.java
+++ b/src/main/java/com/whyc/dto/WmsResponse.java
@@ -3,12 +3,14 @@
import lombok.Data;
import lombok.ToString;
+import java.util.LinkedList;
+
@ToString
@Data
public class WmsResponse {
private Integer code;
private String message;
/**浠诲姟缂栧彿*/
- private String task_no;
+ private LinkedList<String> task_no;
}
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index e364178..cdec99c 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -63,20 +63,25 @@
WmsResponse responseInside = JsonUtil.getGson().fromJson(dataStr, WmsResponse.class);
response.set(1,responseInside);
//瀵逛笅鍙戠殑浠诲姟杩涜鏁版嵁搴撳瓨鍌�
- Task task = new Task();
- task.setTaskNo(responseInside.getTask_no());
- task.setDes(palletDto.getDes());
- //灏嗗瓧绗︿覆鍒楄〃杞负1缁勫瓧绗︿覆,姣忎釜鍏冪礌鐢ㄩ�楀彿鍒嗗壊
- List<String> pallets = palletDto.getPallets();
- task.setPallets(String.join(",", pallets));
-
- List<String> activateParameter = palletDto.getActivateParameter();
- task.setActivateParameter(String.join(",",activateParameter));
-
Date date = new Date();
- task.setCreateTime(date);
+ List<String> pallets = palletDto.getPallets();
+ List<String> taskNos = responseInside.getTask_no();
+ for (int i = 0; i < pallets.size(); i++) {
+ String pallet = pallets.get(i);
+ String taskNo = taskNos.get(i);
+ Task task = new Task();
+ task.setTaskNo(taskNo);
+ task.setPallets(pallet);
+ task.setDes(palletDto.getDes());
- taskService.add(task);
+ List<String> activateParameter = palletDto.getActivateParameter();
+ task.setActivateParameter(String.join(",",activateParameter));
+ task.setCreateTime(date);
+
+ taskService.add(task);
+
+
+ }
}
return response;
--
Gitblit v1.9.1