From 9d5f53ac13f03b21472401e0bc6980ff1fd7a97f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 27 三月 2022 22:43:38 +0800
Subject: [PATCH] #杰克缝纫机立库 【订单出库接口 - 合并同类项】
---
src/main/java/com/zy/common/model/DetlDto.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 0729be7..daf439e 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -1,6 +1,10 @@
package com.zy.common.model;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
+
+import java.util.Set;
/**
* Created by vincent on 2022/3/25
@@ -24,10 +28,58 @@
this.anfme = anfme;
}
+ public DetlDto(String matnr, String batch, Double anfme) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ }
+
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
this.orderNo = orderNo;
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
}
+
+ public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
+ for (DetlDto dto : detlDtos) {
+ if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
+ if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+ return true;
+ }
+ } else {
+ if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
+ if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ public static DetlDto find(Set<DetlDto> detlDtos, String matnr, String batch) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (!matnr.equals(detlDto.getMatnr())) {
+ continue;
+ }
+ if (Cools.isEmpty(batch) && Cools.isEmpty(detlDto.getBatch())) {
+ return detlDto;
+ }
+ if (Cools.isEmpty(batch) && !Cools.isEmpty(detlDto.getBatch())) {
+ continue;
+ }
+ if (Cools.isEmpty(detlDto.getBatch()) && !Cools.isEmpty(batch)) {
+ continue;
+ }
+ if (batch.equals(detlDto.getBatch())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1