From 9ed4cb53a2c643b879f993537f5a2793fba56ba1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 31 三月 2025 07:57:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/model/LocDto.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 1786388..3d5c589 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.core.common.Cools;
import lombok.Data;
import java.util.List;
@@ -22,11 +23,54 @@
private Double anfme;
+ private Double weight;
+
private boolean lack = false;
private List<Integer> staNos;
+ private List<String> agvStaNos;
+
+ private Integer staNo;
+
+ private String agvStaNo;
+
+ private String specs;
+
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
+
+ //璐ф灦鐮�
+ private String containerCode;
+
+ // 宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐
+ private Integer processSts;
+
public LocDto() {
+ }
+
+ public LocDto(String locNo, Double anfme, String matnr, String batch, String csocode, String isoseq, String containerCode) {
+ this.locNo = locNo;
+ this.anfme = anfme;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
+ }
+
+ public LocDto(String locNo, Double anfme, String matnr, String batch, String csocode, String isoseq, String containerCode,Integer processSts) {
+ this.locNo = locNo;
+ this.anfme = anfme;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.csocode = csocode;
+ this.isoseq = isoseq;
+ this.containerCode = containerCode;
+ this.processSts = processSts;
}
public LocDto(String locNo, String matnr, String batch, Double anfme) {
@@ -53,13 +97,33 @@
this.anfme = anfme;
}
+
+ public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,Integer processSts) {
+ this.locNo = locNo;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.processSts = processSts;
+ }
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
- public void setLack(boolean lack) {
- this.lack = lack;
- this.locNo = "缂鸿揣";
+ public void setStaNos(List<Integer> staNos) {
+ this.staNos = staNos;
+ if (!Cools.isEmpty(staNos)) {
+ this.staNo = staNos.get(0);
+ }
+ }
+
+ public void setAgvStaNos(List<String> agvStaNos){
+ this.agvStaNos = agvStaNos;
+ if(!Cools.isEmpty(agvStaNos)){
+ this.agvStaNo = agvStaNos.get(0);
+ }
}
}
--
Gitblit v1.9.1