From 2ded9514aa9a93ee440af0b1437d788fb052028b Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:36:59 +0800
Subject: [PATCH] wms功能完善
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 3a41947..b742456 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity.param;
+import lombok.Data;
+
import java.util.List;
/**
* Created by vincent on 2020/6/18
*/
+@Data
public class LocDetlAdjustParam {
// 搴撲綅鍙�
@@ -13,44 +16,55 @@
// 璋冩暣搴撳瓨鏄庣粏闆嗗悎
private List<LocDetlAdjust> list;
+ @Data
public static class LocDetlAdjust {
- // 鐗╂枡鍙�
- private String matNo;
+ // 鍟嗗搧缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
// 鍙樻洿鏁伴噺
- private Integer count;
+ private Double count;
- public String getMatNo() {
- return matNo;
- }
+ private String zpallet;
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
+ private String model;
- public Integer getCount() {
- return count;
- }
+ private String manuDate;
- public void setCount(Integer count) {
- this.count = count;
- }
+ private Double weight;
+ private Double manLength;
+ private Double volume;
+
+// public LocDetlAdjust(String matnr, String batch, Double count) {
+// this.matnr = matnr;
+// this.batch = batch;
+// this.count = count;
+// }
}
- public String getLocNo() {
- return locNo;
- }
+// public void integrate() {
+// if (Cools.isEmpty(list)) {
+// return;
+// }
+// List<LocDetlAdjust> copyList = new ArrayList<>();
+// for (LocDetlAdjust adjust : list) {
+// boolean exit = false;
+// for (LocDetlAdjust copy : copyList) {
+// if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
+// copy.setCount(copy.getCount() + adjust.getCount());
+// exit = true;
+// break;
+// }
+// }
+// if (!exit) {
+// copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
+// }
+// }
+// list = copyList;
+// }
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
- public List<LocDetlAdjust> getList() {
- return list;
- }
-
- public void setList(List<LocDetlAdjust> list) {
- this.list = list;
- }
}
--
Gitblit v1.9.1