From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/common/model/LocDto.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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..dd083d7 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,10 @@
package com.zy.common.model;
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
import lombok.Data;
+
+import java.util.List;
/**
* Created by vincent on 2022/3/28
@@ -19,6 +23,14 @@
private String orderNo;
private Double anfme;
+
+ private boolean lack = false;
+
+ private List<Integer> staNos;
+
+ private Integer staNo;
+
+ private String specs;
public LocDto() {
}
@@ -47,8 +59,27 @@
this.anfme = anfme;
}
+ public LocDto(LocDetl locDetl,LocDto locDto,String orderNo) {
+ this.locNo = locDetl.getLocNo();
+ this.matnr = locDetl.getMatnr();
+ this.batch = locDetl.getBatch();
+ this.anfme = locDetl.getAnfme();
+ this.maktx = locDetl.getMaktx();
+ this.specs = locDetl.getSpecs();
+ this.orderNo = orderNo;
+ this.staNos = locDto.getStaNos();
+ this.staNo = locDto.getStaNo();
+ }
+
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