From 14139045c387d6599d9fd46c2142f32cde3a03a9 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 24 十月 2024 15:10:41 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/LocDto.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 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 3cf862a..33323bb 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,6 +13,7 @@ public class LocDto { private String locNo; + private Long orderDetlId; private String matnr; @@ -29,15 +31,22 @@ 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() { } @@ -85,6 +94,25 @@ 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 + "锛�"; } @@ -101,4 +129,12 @@ this.count=anfme; } + public String getTkType$(){ + if (null == this.tkType) return "姝e父"; + if (this.tkType == 1) { + return "閫�搴�"; + } + return "姝e父"; + } + } -- Gitblit v1.9.1