From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/common/model/OrderMergeVo.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/OrderMergeVo.java b/src/main/java/com/zy/common/model/OrderMergeVo.java
index 54642c4..3b27d1e 100644
--- a/src/main/java/com/zy/common/model/OrderMergeVo.java
+++ b/src/main/java/com/zy/common/model/OrderMergeVo.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.core.common.Cools;
import lombok.Data;
import java.util.ArrayList;
@@ -21,6 +22,39 @@
private Double anfme;
- private List<DetlDto> detlDtos = new ArrayList<>();
+ //閿�鍞鍗曞彿
+ private String csocode;
+
+ //閿�鍞鍗曡鍙�
+ private String isoseq;
+
+ private List<OrderDto> orderDtos = new ArrayList<>();
+
+ public OrderMergeVo(String matnr, String batch, Double anfme) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ }
+
+ public static boolean has(List<OrderMergeVo> detlDtos, OrderMergeVo detlDto) {
+ for (OrderMergeVo dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static OrderMergeVo find(List<OrderMergeVo> detlDtos, String matnr, String batch) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (OrderMergeVo detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1