From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 	显示在库信息，入库完成后显示成功入库的包数 	订单出库页面显示剩余待检包数 (PDA) 	未查询到的提示改为显示物料实际状态 	拣货单已完成，单据未完成 ✔ 	单据数量字段显示变更 ✔ 	拣货单按实际操作时间降序排序 ✔ 	拣货单明细导出 ✔ 	拣货单显示创建时间与操作时间 ✔

---
 src/main/java/com/zy/common/model/LocDto.java |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 47 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 f03977d..8406e5d 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,12 +1,18 @@
 package com.zy.common.model;
 
+import com.core.common.Cools;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+
+import java.util.List;
 
 /**
  * Created by vincent on 2022/3/28
  */
 @Data
 public class LocDto {
+
+    private Long hostId;
 
     private String locNo;
 
@@ -17,38 +23,76 @@
     private String batch;
 
     private String orderNo;
+    private String manu;
 
+    //瀹為檯鍑哄簱閲�
     private Double anfme;
+
+
+    //鎵�闇�鍑哄簱閲�
+    private Double needQty;
+
+    private boolean lack = false;
+
+    private List<Integer> staNos;
+
+    private Integer staNo;
 
     public LocDto() {
     }
 
-    public LocDto(String locNo, String matnr, String batch, Double anfme) {
+    public LocDto(Long hostId,String locNo, String matnr, String batch, Double anfme,String manu) {
         this.locNo = locNo;
         this.matnr = matnr;
         this.batch = batch;
         this.anfme = anfme;
+        this.hostId = hostId;
+        this.manu = manu;
     }
 
-    public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme) {
+    public LocDto(Long hostId,String locNo, String matnr, String batch, String orderNo, Double anfme,String manu) {
         this.locNo = locNo;
         this.matnr = matnr;
         this.batch = batch;
         this.orderNo = orderNo;
         this.anfme = anfme;
+        this.hostId = hostId;
+        this.manu = manu;
     }
 
-    public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
+    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,String manu) {
         this.locNo = locNo;
         this.matnr = matnr;
         this.maktx = maktx;
         this.batch = batch;
         this.orderNo = orderNo;
         this.anfme = anfme;
+        this.hostId = hostId;
+        this.manu = manu;
+
+    }
+
+    public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty,String manu) {
+        this.locNo = locNo;
+        this.matnr = matnr;
+        this.maktx = maktx;
+        this.batch = batch;
+        this.orderNo = orderNo;
+        this.anfme = anfme;
+        this.needQty = needQty;
+        this.hostId = hostId;
+        this.manu = manu;
     }
 
     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