From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/model/LocDto.java |   97 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 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 c3d1805..e10d679 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,11 @@
 package com.zy.common.model;
 
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.common.entity.OrderGiftProofreadingExcel;
 import lombok.Data;
+
+import java.util.List;
 
 /**
  * Created by vincent on 2022/3/28
@@ -9,20 +14,54 @@
 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 memo;
+
+    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;
+
     public LocDto() {
+    }
+
+    public LocDto(OrderGiftProofreadingExcel excel) {
+        this.matnr = excel.getMatnr();
+        this.model = excel.getModel();
+        this.orderNo = excel.getOrderNo();
+        this.batch = excel.getBatch();
+        this.memo = excel.getMemo();
+        this.weight = excel.getWeight();
+        this.volume = excel.getVolume();
+        this.price = excel.getPrice();
+        this.specs = excel.getSpecs();
     }
 
     public LocDto(String locNo, String matnr, String batch, Double anfme) {
@@ -30,6 +69,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) {
@@ -38,6 +79,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) {
@@ -47,10 +90,64 @@
         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.memo = locDetl.getMemo();
     }
 
     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);
+        }
+    }
+
+    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