whycxzp
2025-04-03 cf3aa090e21f1743c2c998309a83897b05241c63
巡检记录
3个文件已修改
40 ■■■■■ 已修改文件
src/main/java/com/whyc/dto/WmsPalletDto.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/WmsResponse.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WmsService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
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;
}
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;