From 1fd26cb3dd01e0917330c06ab94f26ee93bff090 Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Mon, 13 Jan 2025 13:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=A1=8C=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shipping/pojo/DefaultNewWaveManager.java  | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 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 27d5360..79047aa 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
@@ -178,7 +178,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 		// 根据（工单号+物料类型）分组
 		Map<String, List<FenPei>> GongDan_WuLiao_Map = new HashMap<>();
 
-		List<FenPei>list_fen=Paixu(list_fenpei);
+		List<FenPei>list_fen=Paixu(list_fenpei,cfhs);
 		
 		for (FenPei fenPei : list_fen) {
 			
@@ -416,7 +416,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 
 
 		for (TwlFenZu twlFenZu : paixu) {
-			List<GongDanMingXi> list_show = twlFenZu.gdPaiXus; //当前头无聊所有的工单组合，以及每个工单的物料明细
+			List<GongDanMingXi> list_show = twlFenZu.gdPaiXus; //当前头物料所有的工单组合，以及每个工单的物料明细
 			int this_fenzuCount=twlFenZu.wl_count;						//当前分组总物料行数
 			List<GongZuoZhan>listGzz= FaiXuGzz(gzzMap);			//工作站根据可分配数量进行排序
 			int gzz_index=0;															//当前分配工作站的排序下标
@@ -425,7 +425,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				GongDanMingXi gongDanMingXi=list_show.get(index);
 				//当前工单的物料
 				List<FenPei> list_wList=gongDanMingXi.list;
-				if(list_wList.size()+curr_gzz.notFinished+curr_gzz.renWuList.size()<=curr_gzz.maxRenWu){
+				if(list_wList.size()+curr_gzz.notFinished+curr_gzz.renWuList.size()<=curr_gzz.maxRenWu+cfhs){
 					//如果当前待分配+此工作站未完成+已分配任务数  小于最大任务数 //将当前任务分配到此工作站
 					for (FenPei fenPei : list_wList) {
 						curr_gzz.renWuList.add(fenPei);
@@ -459,6 +459,15 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 			logger.info("--------------------------------------------------------------------------------------------------------------------------");
 			for (FenPei fenPei : gongZuoZhan.renWuList) {
 				fenPeiCount=fenPeiCount+1;
+				String[] ids=fenPei.tsakId.split(",");
+				for(int i=0;i<ids.length;i++){
+					Task task=this.commonDao.get(Task.class, Long.parseLong(ids[i]));
+					task.setBillCode(fenPei.gdh+"-"+fenPei.chf_fz);
+					task.setEndRegion(gongZuoZhan.code);
+					this.commonDao.store(task);
+					logger.info("one:"+task.getBillCode()+"---"+task.getEndRegion()+"--two:-"+task.getOldGzz()+"---"+task.getOldZrw()+"--three:-"+fenPei.gdh+"-"+fenPei.chf_fz+"-----"+gongZuoZhan.code);
+				}
+
 				logger.info(""+fenPei.twl_fz+"---"+fenPei.chf_fz+"---"+fenPei.chf+"---"+fenPei.gdh+"---"+fenPei.rqh);
 			}
 			logger.info("--------------------------------------------------------------------------------------------------------------------------");
@@ -507,7 +516,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 	
 	
 	
-	public List<FenPei>  Paixu(List<FenPei>list_fenpei ){
+	public List<FenPei>  Paixu(List<FenPei>list_fenpei ,int cfhs){
 		Map<String, List<FenPei>> GongDan_WuLiao_Map = new HashMap<>();
 
 		for (FenPei fenPei : list_fenpei) {
@@ -671,7 +680,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 
 		}
 		
-		// 对touwuliao_map 的单个工单大于15的进行拆分
+		// 对touwuliao_map 的单个工单大于拆分书数的进行拆分
 		Map<String, List<GongDanMingXi>> touwuliao_new_Map = new HashMap<>();
 		List<FenPei> list_new =new ArrayList<>();
 		for (String twlKey : touwuliao_map.keySet()) {
@@ -681,7 +690,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				
 				for (int i = 0; i < list_fen.size(); i++) {
 					FenPei fenPei=list_fen.get(i);
-					fenPei.chf_fz=(i)/15+1;
+					fenPei.chf_fz=(i)/cfhs+1;
 					fenPei.chf=(i+1)+"";
 					fenPei.twl_fz=twlKey;
 					list_new.add(fenPei);