From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/common/model/DetlDto.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..3b0902f 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -17,7 +17,10 @@
private String orderNo;
+ private Long orderId;
+
private String matnr;
+
private String batch = "";
private String brand = "";
@@ -32,11 +35,12 @@
private String boxType3 = "1";
private Double anfme;
+ private String threeCode;
public DetlDto() {
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -46,9 +50,10 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -59,9 +64,11 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -72,9 +79,11 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -86,23 +95,26 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
-// public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
-// this.orderNo = orderNo;
-// this.matnr = matnr;
-// this.batch = batch;
-// this.brand = brand;
-// this.standby1 = standby1;
-// this.standby2 = standby2;
-// this.standby3 = standby3;
-// this.boxType1 = boxType1;
-// this.boxType2 = boxType2;
-// this.boxType3 = boxType3;
-// this.anfme = anfme;
-// }
+ public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
+ this.orderNo = orderNo;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.brand = brand;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
+ this.boxType1 = boxType1;
+ this.boxType2 = boxType2;
+ this.boxType3 = boxType3;
+ this.anfme = anfme;
+ this.threeCode = threeCode;
+ }
- public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.orderNo = orderNo;
this.matnr = matnr;
this.batch = batch;
@@ -115,6 +127,8 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
@@ -207,6 +221,20 @@
return false;
}
+ public static boolean hasOrder(List<DetlDto> detlDtos, DetlDto detlDto) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getOrderNo().equals(detlDto.getOrderNo()) && dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+ && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
+ && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
+ && Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
+ && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
public static boolean hasLineNumber(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
--
Gitblit v1.9.1