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);