From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/common/model/LocDto.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index f03977d..85119c6 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,9 @@
package com.zy.common.model;
+import com.core.common.Cools;
import lombok.Data;
+
+import java.util.List;
/**
* Created by vincent on 2022/3/28
@@ -16,9 +19,32 @@
private String batch;
+ private String model;
+
private String orderNo;
private Double anfme;
+
+ private boolean lack = false;
+
+ private List<Integer> staNos;
+
+ private Integer staNo;
+
+ private String sPgNO;
+
+ private String zpallet;
+
+ //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType" color
+ private String outOrderNo;
+
+ private String luHao;
+
+ private String packing;
+
+ private String proType;
+
+ private String color;
public LocDto() {
}
@@ -47,8 +73,43 @@
this.anfme = anfme;
}
+ public LocDto(String orderNo,String matnr, String batch, String outOrderNo, String luHao, String packing, String sPgNO, String proType, String color) {
+ this.matnr = matnr;
+ this.orderNo = orderNo;
+ if(!Cools.isEmpty(batch)){
+ this.batch = batch;
+ }
+ if(!Cools.isEmpty(outOrderNo)){
+ this.outOrderNo = outOrderNo;
+ }
+ if(!Cools.isEmpty(luHao)){
+ this.luHao = luHao;
+ }
+ if(!Cools.isEmpty(packing)){
+ this.packing = packing;
+ }
+ if(!Cools.isEmpty(sPgNO)){
+ this.sPgNO = sPgNO;
+ }
+ if(!Cools.isEmpty(proType)){
+ this.proType = proType;
+ }
+ if(!Cools.isEmpty(color)){
+ this.color = color;
+ }
+ }
+
+
+
public String getTitle() {
return this.matnr + "锛�" + this.maktx + "锛�";
}
+ public void setStaNos(List<Integer> staNos) {
+ this.staNos = staNos;
+ if (!Cools.isEmpty(staNos)) {
+ this.staNo = staNos.get(0);
+ }
+ }
+
}
--
Gitblit v1.9.1