Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

拆分行数

main
FOAM 2025-01-13 13:47:08 +08:00
parent 53a2f432bb
commit 1fd26cb3dd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java
View File

@ -178,7 +178,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
// 根据（工单号+物料类型）分组 // 根据（工单号+物料类型）分组
Map<String, List<FenPei>> GongDan_WuLiao_Map = new HashMap<>(); 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) { for (FenPei fenPei : list_fen) {
@ -416,7 +416,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
for (TwlFenZu twlFenZu : paixu) { for (TwlFenZu twlFenZu : paixu) {
List<GongDanMingXi> list_show = twlFenZu.gdPaiXus; //当前头无聊所有的工单组合，以及每个工单的物料明细 List<GongDanMingXi> list_show = twlFenZu.gdPaiXus; //当前头物料所有的工单组合，以及每个工单的物料明细
int this_fenzuCount=twlFenZu.wl_count; //当前分组总物料行数 int this_fenzuCount=twlFenZu.wl_count; //当前分组总物料行数
List<GongZuoZhan>listGzz= FaiXuGzz(gzzMap); //工作站根据可分配数量进行排序 List<GongZuoZhan>listGzz= FaiXuGzz(gzzMap); //工作站根据可分配数量进行排序
int gzz_index=0; //当前分配工作站的排序下标 int gzz_index=0; //当前分配工作站的排序下标
@ -425,7 +425,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
GongDanMingXi gongDanMingXi=list_show.get(index); GongDanMingXi gongDanMingXi=list_show.get(index);
//当前工单的物料 //当前工单的物料
List<FenPei> list_wList=gongDanMingXi.list; 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) { for (FenPei fenPei : list_wList) {
curr_gzz.renWuList.add(fenPei); curr_gzz.renWuList.add(fenPei);
@ -459,6 +459,15 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
logger.info("--------------------------------------------------------------------------------------------------------------------------"); logger.info("--------------------------------------------------------------------------------------------------------------------------");
for (FenPei fenPei : gongZuoZhan.renWuList) { for (FenPei fenPei : gongZuoZhan.renWuList) {
fenPeiCount=fenPeiCount+1; 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(""+fenPei.twl_fz+"---"+fenPei.chf_fz+"---"+fenPei.chf+"---"+fenPei.gdh+"---"+fenPei.rqh);
} }
logger.info("--------------------------------------------------------------------------------------------------------------------------"); 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<>(); Map<String, List<FenPei>> GongDan_WuLiao_Map = new HashMap<>();
for (FenPei fenPei : list_fenpei) { 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<>(); Map<String, List<GongDanMingXi>> touwuliao_new_Map = new HashMap<>();
List<FenPei> list_new =new ArrayList<>(); List<FenPei> list_new =new ArrayList<>();
for (String twlKey : touwuliao_map.keySet()) { 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++) { for (int i = 0; i < list_fen.size(); i++) {
FenPei fenPei=list_fen.get(i); FenPei fenPei=list_fen.get(i);
fenPei.chf_fz=(i)/15+1; fenPei.chf_fz=(i)/cfhs+1;
fenPei.chf=(i+1)+""; fenPei.chf=(i+1)+"";
fenPei.twl_fz=twlKey; fenPei.twl_fz=twlKey;
list_new.add(fenPei); list_new.add(fenPei);