From 1da002910c1d9d44cd195bd24d951b4942a4e29c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务间隔及字段命名，调整环境配置
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 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 065f774..10b159e 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -1,7 +1,9 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -19,15 +21,61 @@
@Data
public static class LocDetlAdjust {
- // 鍟嗗搧缂栧彿
+ // 鐗╂枡鍙�
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鍙樻洿鏁伴噺
private Double count;
+ // 閿�鍞鍗曞彿
+ private String orderNo;
+
+ // 閿�鍞鍗曞彿
+ private String threeCode;
+
+ //閿�鍞鍗曡鍙�
+ private String deadTime;
+
+ //璐ф灦鐮�
+ private String suppCode;
+
+ // 宸ュ簭
+ private Integer processSts;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String orderNo,String threeCode, String deadTime, String suppCode, Integer processSts) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.count = count;
+ this.orderNo = orderNo;
+ this.threeCode = threeCode;
+ this.deadTime = deadTime;
+ this.suppCode = suppCode;
+ this.processSts = processSts;
+ }
+ }
+
+ 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()) && Cools.eq(adjust.getSuppCode(),copy.getSuppCode()) && Cools.eq(adjust.getThreeCode(),copy.getThreeCode()) && Cools.eq(adjust.getDeadTime(),copy.getDeadTime())) {
+ copy.setCount(copy.getCount() + adjust.getCount());
+ exit = true;
+ break;
+ }
+ }
+ if (!exit) {
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(),adjust.getOrderNo(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode(),adjust.getProcessSts()));
+ }
+ }
+ list = copyList;
}
--
Gitblit v1.9.1