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

拆分修改

main
768863620@qq.com 2025-01-13 16:31:38 +08:00
parent 1fd26cb3dd
commit 5781732ba8
1 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -462,7 +462,11 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
String[] ids=fenPei.tsakId.split(","); String[] ids=fenPei.tsakId.split(",");
for(int i=0;i<ids.length;i++){ for(int i=0;i<ids.length;i++){
Task task=this.commonDao.get(Task.class, Long.parseLong(ids[i])); Task task=this.commonDao.get(Task.class, Long.parseLong(ids[i]));
task.setBillCode(fenPei.gdh+"-"+fenPei.chf_fz); String lx="S";
if("big".equals(fenPei.wllx)){
lx="B";
}
task.setBillCode(fenPei.gdh+"-"+lx+"-"+fenPei.chf_fz);
task.setEndRegion(gongZuoZhan.code); task.setEndRegion(gongZuoZhan.code);
this.commonDao.store(task); 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("one:"+task.getBillCode()+"---"+task.getEndRegion()+"--two:-"+task.getOldGzz()+"---"+task.getOldZrw()+"--three:-"+fenPei.gdh+"-"+fenPei.chf_fz+"-----"+gongZuoZhan.code);
@ -685,17 +689,53 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
List<FenPei> list_new =new ArrayList<>(); List<FenPei> list_new =new ArrayList<>();
for (String twlKey : touwuliao_map.keySet()) { for (String twlKey : touwuliao_map.keySet()) {
List<GongDanMingXi> list_show = touwuliao_map.get(twlKey); List<GongDanMingXi> list_show = touwuliao_map.get(twlKey);
for (GongDanMingXi gdPaiXu : list_show) { int max_len=0;
List<FenPei> list_fen=gdPaiXu.list; //得出最大列数
if(list_show.size()>0){
for (int i = 0; i < list_fen.size(); i++) { for (GongDanMingXi gdPaiXu : list_show) {
FenPei fenPei=list_fen.get(i); if(max_len<gdPaiXu.list.size()){
fenPei.chf_fz=(i)/cfhs+1; max_len=gdPaiXu.list.size();
fenPei.chf=(i+1)+""; }
fenPei.twl_fz=twlKey; }
list_new.add(fenPei); }
Map<String, Integer> rq_last_show = new HashMap<>();
for(int i=0;i<max_len;i++){
//循环每列数据
Map<String, Integer> rq_last_show2 = new HashMap<>();
for(int gd_index=0;gd_index<list_show.size();gd_index++){
//循环每个工单
GongDanMingXi gdPaiXu =list_show.get(gd_index);
List<FenPei> list_fen=gdPaiXu.list;
if(i<gdPaiXu.list.size()){
FenPei fenPei=list_fen.get(i);
rq_last_show2.put(fenPei.rqh, 1);
if((i+1)%cfhs==1){
//第一列
if(rq_last_show.containsKey(fenPei.rqh)){
fenPei.chf_fz=(i)/cfhs;
fenPei.chf=(i+1)+"";
fenPei.twl_fz=twlKey;
list_new.add(fenPei);
}else{
fenPei.chf_fz=(i)/cfhs+1;
fenPei.chf=(i+1)+"";
fenPei.twl_fz=twlKey;
list_new.add(fenPei);
}
}else{
//其他列
fenPei.chf_fz=(i)/cfhs+1;
fenPei.chf=(i+1)+"";
fenPei.twl_fz=twlKey;
list_new.add(fenPei);
}
}
} }
rq_last_show=rq_last_show2;
} }
} }