From 5e81ab9ac8d11fa87b668f5b82488756ca7bda7d Mon Sep 17 00:00:00 2001 From: "768863620@qq.com" <768863620@qq.com> Date: Thu, 13 Feb 2025 15:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=9C=A8=E5=88=86=E9=85=8D=E5=A5=BD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=89=BE=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=9A=84=E5=A4=B4=E7=89=A9=E6=96=99=20?= =?UTF-8?q?=E4=B8=94=20=E6=95=B0=E9=87=8F=E5=B7=AE=E5=B0=8F=E4=BA=8E4?= =?UTF-8?q?=EF=BC=8C=E6=88=96=E8=80=85=E5=A4=B4=E7=89=A9=E6=96=99=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E40=E7=9A=84=20=E5=88=86?= =?UTF-8?q?=E9=85=8D=E5=88=B0=E4=B8=80=E7=BB=84=20=20=E5=A4=B4=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=88=86=E7=BB=84=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/shipping/pojo/DefaultNewWaveManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java index 5100744..b8bfde7 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java @@ -229,8 +229,8 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements + touwuliao_map.get(twlKey).get(0).list.get(0).chf_fz; int currCount_in = touwuliao_map.get(twlKey).get(0).hangshu; if (twl_in.equals(fenzu) - && Math.abs(currCount - currCount_in) <= 4) { - // 在分配好的数据中找到了相同的头物料 且 数量差小于4 + && Math.abs(currCount - currCount_in) <= 4||Math.abs(currCount - currCount_in) >40) { + // 在分配好的数据中找到了相同的头物料 且 数量差小于4 头物料分组规则 List old = touwuliao_map.get(twlKey); old.add(gdPaiXu); touwuliao_map.put(twlKey, old); @@ -787,8 +787,8 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements + touwuliao_map.get(twlKey).get(0).list.get(0).wllx; int currCount_in = touwuliao_map.get(twlKey).get(0).hangshu; if (twl_in.equals(fenzu) - && Math.abs(currCount - currCount_in) <= 4) { - // 在分配好的数据中找到了相同的头物料 且 数量差小于4 + && Math.abs(currCount - currCount_in) <= 4||Math.abs(currCount - currCount_in) >40) { + // 在分配好的数据中找到了相同的头物料 且 数量差小于4 头物料分组规则 List old = touwuliao_map.get(twlKey); old.add(gdPaiXu); touwuliao_map.put(twlKey, old);