From a22208471156a57fc52f000d4184d6c628ac6496 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十一月 2024 12:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/common/model/DetlDto.java | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 173 insertions(+), 3 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..bec1738 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -1,6 +1,12 @@
package com.zy.common.model;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.OpenOrderPakinJDParam;
import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2022/3/25
@@ -8,7 +14,6 @@
@Data
public class DetlDto {
- private String orderNo;
private String matnr;
@@ -16,7 +21,29 @@
private Double anfme;
+ private int owner;
+ private String ownerName;
+ private int beBatch;
+
+ private int payment;
+
+ private Double weight;
+ private String memo;
+
+ private String sourceLocName;//婧愪粨搴�
+ private String targetLocName;//鐩爣浠撳簱
+
+
public DetlDto() {
+ }
+
+ public DetlDto(OpenOrderPakinJDParam.DetlDto2 detlDto2) {
+ this.matnr=detlDto2.getMatnr();
+ this.batch=detlDto2.getBatch();
+ this.anfme=detlDto2.getAnfme();
+ this.ownerName=detlDto2.getOwner();
+ this.beBatch=detlDto2.getEntryId();
+ this.payment=0;
}
public DetlDto(String matnr, Double anfme) {
@@ -24,10 +51,153 @@
this.anfme = anfme;
}
- public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
- this.orderNo = orderNo;
+ public DetlDto(String matnr, String batch) {
+ this.matnr = matnr;
+ this.batch = batch;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
+ this.owner = 0;
}
+
+ public DetlDto(String matnr, String batch, Double anfme,int owner) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.owner = owner;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme,int owner,Double weight) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.owner = owner;
+ this.weight = weight;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme,Double weight) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.weight = weight;
+ }
+
+ public DetlDto(String matnr, String batch, Double anfme,String ownerName,int payment) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.ownerName = ownerName;
+ this.payment = payment;
+ }
+
+
+ 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 boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean has1(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean has2(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+ && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName()) && dto.getBeBatch()==detlDto.getBeBatch()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean has3(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getOwnerName(), detlDto.getOwnerName())
+ && Cools.eq(dto.getSourceLocName(), detlDto.getSourceLocName()) && Cools.eq(dto.getTargetLocName(), detlDto.getTargetLocName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) ) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch()) && Cools.eq(ownerName, detlDto.getOwnerName())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName,int beBatch) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+ && Cools.eq(ownerName, detlDto.getOwnerName()) && beBatch== detlDto.getBeBatch()) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch,String ownerName,String sourceLocName,String targetLocName) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+ && Cools.eq(ownerName, detlDto.getOwnerName()) && Cools.eq(sourceLocName, detlDto.getSourceLocName())
+ && Cools.eq(targetLocName, detlDto.getTargetLocName())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1