From caf516688d799894033332edc1f6ffc4268200f1 Mon Sep 17 00:00:00 2001 From: FOAM <491460741@qq.com> Date: Mon, 17 Feb 2025 16:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E8=A1=8C=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shipping/pojo/DefaultNewWaveManager.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 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 b8bfde7..9dc7978 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 @@ -74,12 +74,12 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements allocateGZZ(waveDoc.getCode(), NewWaveFlag.LXQ, lx_codes, (int) lx_sx.getTaskD(), getValueGzzNumber(lx_sx), lxCount, maps); - allocateGZZ(waveDoc.getCode(), NewWaveFlag.HJQ, hj_codes, - (int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount, - maps); - allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes, - (int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount, - maps); +// allocateGZZ(waveDoc.getCode(), NewWaveFlag.HJQ, hj_codes, +// (int) hj_sx.getTaskD(), getValueGzzNumber(hj_sx), hjCount, +// maps); +// allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lk_codes, +// (int) lk_sx.getTaskD(), getValueGzzNumber(lk_sx), lkCount, +// maps); } } @@ -133,6 +133,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements sql += "group by pt.code,t.BILLCODE,item.id,item.code,item.BE_MARK_WEIGHT,loc.id,loc.code,ik.PROP_C1,ik.PROP_C2,ik.PROP_C3,ik.PROP_D1,ik.PROP_D2,item.ISBOM " + "order by min(t.skips ),max(loc.code) asc, item.id,pt.code,t.BILLCODE "; LogPrint(log_sql, sql); + Query query = session.createSQLQuery(sql); List list = (List) query.list(); int GongDan_wuLiaoMingXiCout = list.size(); @@ -169,7 +170,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements list_fenpei_wgzz.add(bean); } } - List list_fen = Paixu(list_fenpei, cfhs); // 初始化 GongDan_WuLiao_Map 根据（工单号+物料类型+拆分组号）分组 Map> GongDan_WuLiao_Map = new HashMap<>(); @@ -202,7 +202,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements GongDan_List.add(gdPaiXu); } Collections.sort(GongDan_List); - // 打印排序结果 PirntGongDanMingXiList(GongDan_List, "最终工单排序"); @@ -229,7 +228,7 @@ 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||Math.abs(currCount - currCount_in) >40) { + && (Math.abs(currCount - currCount_in) <= 4||Math.abs(currCount - currCount_in) >40)) { // 在分配好的数据中找到了相同的头物料 且 数量差小于4 头物料分组规则 List old = touwuliao_map.get(twlKey); old.add(gdPaiXu); @@ -246,6 +245,18 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements } } + + int hs=0; + for (String twlKey : touwuliao_map.keySet()) { + List GongDanList = touwuliao_map.get(twlKey); + for(GongDanMingXi gd:GongDanList){ + hs+=gd.list.size(); + } + } + LogPrint(true,"我来了,GongDanMingXi"+GongDan_List.size()+"行数："+hs); + if(1==1){ + return; + } // 打印头物料分组后的情况 PirntFirstTouwuLiaoMap(touwuliao_map, "最终头物料分组"); @@ -494,7 +505,6 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements } } - for (String key : gzzMap.keySet()) { GongZuoZhan gongZuoZhan = gzzMap.get(key); LogPrint( @@ -508,8 +518,10 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"); for (FenPei fenPei : gongZuoZhan.renWuList) { fenPeiCount = fenPeiCount + 1; + rwh++; String[] ids = fenPei.tsakId.split(","); for (int i = 0; i < ids.length; i++) { + task_count++; Task task = this.commonDao.get(Task.class, Long.parseLong(ids[i])); String lx = "S";// 小件