From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocDto.java |   72 ++++++++++++++++++++++++++++++++++++
 1 files changed, 72 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 ca099a3..4dd1a6f 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,7 @@
 package com.zy.common.model;
 
 import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
 import lombok.Data;
 
 import java.util.List;
@@ -12,23 +13,42 @@
 public class LocDto {
 
     private String locNo;
+    private Long orderDetlId;
 
     private String matnr;
 
     private String maktx;
+    private String model;
+    //瑙勬牸
+    private String specs;
 
     private String batch;
 
+    //鏈ㄧ绫诲瀷
+    private String brand;
+
+    //鎵樼洏鐮�
+    private String zpallet;
+
     private String orderNo;
 
+    private String origin;
+
     private Double anfme;
+    private Double count;
+    private Double weight;
+    private Double volume;
+    private Double price;
 
     private boolean lack = false;
 
     private List<Integer> staNos;
 
     private Integer staNo;
+    private Integer tkType;
 
+    private String unit;
+    private String threeCode;
     public LocDto() {
     }
 
@@ -37,6 +57,8 @@
         this.matnr = matnr;
         this.batch = batch;
         this.anfme = anfme;
+        this.count = anfme;
+
     }
 
     public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme) {
@@ -45,6 +67,8 @@
         this.batch = batch;
         this.orderNo = orderNo;
         this.anfme = anfme;
+        this.count = anfme;
+
     }
 
     public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
@@ -54,6 +78,41 @@
         this.batch = batch;
         this.orderNo = orderNo;
         this.anfme = anfme;
+        this.count = anfme;
+    }
+
+    public LocDto(String locNo, String matnr, String maktx,String model,String specs, String batch,String brand,String zpallet, String orderNo, Double anfme) {
+        this.locNo = locNo;
+        this.matnr = matnr;
+        this.maktx = maktx;
+        this.batch = batch;
+        this.orderNo = orderNo;
+        this.anfme = anfme;
+        this.count = anfme;
+        this.model = model;
+        this.specs = specs;
+        this.brand = brand;
+        this.zpallet = zpallet;
+    }
+
+    public LocDto(LocDetl locDetl) {
+        this.locNo = locDetl.getLocNo();
+        this.matnr = locDetl.getMatnr();
+        this.maktx = locDetl.getMaktx();
+        this.batch = locDetl.getBatch();
+        this.orderNo = locDetl.getOrderNo();
+        this.anfme = locDetl.getAnfme();
+        this.count = locDetl.getAnfme();
+        this.model = locDetl.getModel();
+        this.specs = locDetl.getSpecs();
+        this.brand = locDetl.getBrand();
+        this.zpallet = locDetl.getZpallet();
+        this.weight = locDetl.getWeight();
+        this.volume = locDetl.getVolume();
+        this.price = locDetl.getPrice();
+        this.origin = locDetl.getOrigin();
+        this.unit = locDetl.getUnit();
+        this.threeCode = locDetl.getThreeCode();
     }
 
     public String getTitle() {
@@ -67,4 +126,17 @@
         }
     }
 
+    public void setAnfme(Double anfme){
+        this.anfme=anfme;
+        this.count=anfme;
+    }
+
+    public String getTkType$(){
+        if (null == this.tkType) return "姝ｅ父";
+        if (this.tkType == 1) {
+            return "閫�搴�";
+        }
+        return "姝ｅ父";
+    }
+
 }

--
Gitblit v1.9.1