From e62569856fdfb0c7c31ee88cf96628af08eabf85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 12:34:15 +0800
Subject: [PATCH] 标准wms2.0

---
 src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java |   64 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
index 4e91dd1..8732f46 100644
--- a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -1,7 +1,9 @@
 package com.zy.asrs.entity.result;
 
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.param.FullStoreParam;
 
 public class FindLocNoAttributeVo {
     private String matnr = "";
@@ -65,6 +67,48 @@
         this.standby1 = standby1;
         this.standby2 = standby2;
         this.standby3 = standby3;
+    }
+
+    public FindLocNoAttributeVo(WaitPakin waitPakin) {
+        this.matnr = waitPakin.getMatnr();
+        this.specs = waitPakin.getSpecs();
+        this.batch = waitPakin.getBatch();
+//        this.grade = waitPakin.g;
+        this.brand = waitPakin.getBrand();
+        this.standby1 = waitPakin.getStandby1();
+        this.standby2 = waitPakin.getStandby2();
+        this.standby3 = waitPakin.getStandby3();
+        this.boxType1 = waitPakin.getBoxType1();
+        this.boxType2 = waitPakin.getBoxType2();
+        this.boxType3 = waitPakin.getBoxType3();
+    }
+
+    public FindLocNoAttributeVo(FullStoreParam.MatCodeStore matCodeStore) {
+        this.matnr = matCodeStore.getMatnr();
+        this.specs = matCodeStore.getSpecs();
+        this.batch = matCodeStore.getBatch();
+//        this.grade = waitPakin.g;
+        this.brand = matCodeStore.getBrand();
+        this.standby1 = matCodeStore.getStandby1();
+        this.standby2 = matCodeStore.getStandby2();
+        this.standby3 = matCodeStore.getStandby3();
+        this.boxType1 = matCodeStore.getBoxType1();
+        this.boxType2 = matCodeStore.getBoxType2();
+        this.boxType3 = matCodeStore.getBoxType3();
+    }
+
+    public FindLocNoAttributeVo(LocDetl locDetl) {
+        this.matnr = locDetl.getMatnr();
+        this.specs = locDetl.getSpecs();
+        this.batch = locDetl.getBatch();
+//        this.grade = waitPakin.g;
+        this.brand = locDetl.getBrand();
+        this.standby1 = locDetl.getStandby1();
+        this.standby2 = locDetl.getStandby2();
+        this.standby3 = locDetl.getStandby3();
+        this.boxType1 = locDetl.getBoxType1();
+        this.boxType2 = locDetl.getBoxType2();
+        this.boxType3 = locDetl.getBoxType3();
     }
 
     public String getBoxType1() {
@@ -156,20 +200,20 @@
     }
 
 
-    public boolean beSimilar(LocDetl locDetl){
+    public boolean beSimilar(LocDetl locDetl) {
         return (this.matnr.equals(locDetl.getMatnr())
-                        && this.batch.equals(locDetl.getBatch())
-                        && this.brand.equals(locDetl.getBrand())
-                        && this.standby1.equals(locDetl.getStandby1())
-                        && this.standby2.equals(locDetl.getStandby2())
-                        && this.standby3.equals(locDetl.getStandby3())
-                        && this.boxType1.equals(locDetl.getBoxType1())
-                        && this.boxType2.equals(locDetl.getBoxType2())
-                        && this.boxType3.equals(locDetl.getBoxType3())
+                && this.batch.equals(locDetl.getBatch())
+                && this.brand.equals(locDetl.getBrand())
+                && this.standby1.equals(locDetl.getStandby1())
+                && this.standby2.equals(locDetl.getStandby2())
+                && this.standby3.equals(locDetl.getStandby3())
+                && this.boxType1.equals(locDetl.getBoxType1())
+                && this.boxType2.equals(locDetl.getBoxType2())
+                && this.boxType3.equals(locDetl.getBoxType3())
         );
     }
 
-    public boolean beSimilar(WrkDetl wrkDetl){
+    public boolean beSimilar(WrkDetl wrkDetl) {
         return (this.matnr.equals(wrkDetl.getMatnr())
                 && this.batch.equals(wrkDetl.getBatch())
                 && this.brand.equals(wrkDetl.getBrand())

--
Gitblit v1.9.1