From d91f689178f6cd84e12e73a5248534dc6713dbce Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 14 十月 2023 16:21:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/model/MatDto.java | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java index 7c19f47..358e924 100644 --- a/src/main/java/com/zy/common/model/MatDto.java +++ b/src/main/java/com/zy/common/model/MatDto.java @@ -1,5 +1,6 @@ package com.zy.common.model; +import com.zy.asrs.entity.OrderDetl; import lombok.Data; /** @@ -14,18 +15,51 @@ // 鐗╂枡鍚嶇О private String maknx; - private String batch; + // 搴撲綅瑙勬牸 + private String specs; // 鐗╂枡鏁伴噺 private Double count; + // 搴撲綅鏁伴噺 + private Double total; + + // 鐗╂枡鍚嶇О + private String model; + + // 鏉$爜 + private String batch; + + // 璁㈠崟缂栧彿 + private String orderNo; + public MatDto() { } - public MatDto(String matnr, String maknx, String batch, Double count) { - this.matnr = matnr; + public MatDto(OrderDetl orderDetl) { + this.matnr = orderDetl.getMatnr(); + this.model = orderDetl.getModel(); + this.batch = orderDetl.getBatch(); + this.orderNo = orderDetl.getOrderNo(); + this.count = orderDetl.getQty(); + this.total = orderDetl.getAnfme(); + } + public MatDto(String matNo, String maknx, Double count) { + this.matnr = matNo; this.maknx = maknx; - this.batch = batch; this.count = count; } + public MatDto(String matNo, String maknx, Double count,String specs) { + this.specs = specs; + this.matnr = matNo; + this.maknx = maknx; + this.count = count; + } + public MatDto(String matNo, String maknx, Double count,Double total,String specs) { + this.specs = specs; + this.matnr = matNo; + this.maknx = maknx; + this.count = count; + this.total = total; + } } -- Gitblit v1.9.1