From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 61 ++++++++++++++++--------------
1 files changed, 33 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 9483bf4..381d7c2 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,15 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
+import lombok.Data;
+
+import java.util.ArrayList;
import java.util.List;
/**
* Created by vincent on 2020/6/18
*/
+@Data
public class LocDetlAdjustParam {
// 搴撲綅鍙�
@@ -13,45 +18,45 @@
// 璋冩暣搴撳瓨鏄庣粏闆嗗悎
private List<LocDetlAdjust> list;
+ @Data
public static class LocDetlAdjust {
- // 鐗╂枡鍙�
- private String matNo;
+ // 鍟嗗搧缂栧彿
+ private String matnr;
+
+ // 搴忓垪鐮�
+ private String batch;
// 鍙樻洿鏁伴噺
private Double count;
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
+ 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