波次数据处理
							parent
							
								
									82bebe402e
								
							
						
					
					
						commit
						3229aa367c
					
				| 
						 | 
					@ -36,9 +36,9 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 | 
				
			||||||
	public void allocateGZZ(List<Long> ids) {
 | 
						public void allocateGZZ(List<Long> ids) {
 | 
				
			||||||
		for (Long id : ids) {
 | 
							for (Long id : ids) {
 | 
				
			||||||
			WaveDoc waveDoc = commonDao.get(WaveDoc.class, id);
 | 
								WaveDoc waveDoc = commonDao.get(WaveDoc.class, id);
 | 
				
			||||||
			ShiXiao lx_sx = commonDao.get(ShiXiao.class, NewWaveFlag.LKQ);
 | 
								ShiXiao lx_sx = kqShiXiao(NewWaveFlag.LKQ);
 | 
				
			||||||
			ShiXiao hj_sx = commonDao.get(ShiXiao.class, NewWaveFlag.LKQ);
 | 
								ShiXiao hj_sx = kqShiXiao(NewWaveFlag.LKQ);
 | 
				
			||||||
			ShiXiao lk_sx = commonDao.get(ShiXiao.class, NewWaveFlag.LKQ);
 | 
								ShiXiao lk_sx = kqShiXiao(NewWaveFlag.LKQ);
 | 
				
			||||||
			// 得到工作站剩余任务行数
 | 
								// 得到工作站剩余任务行数
 | 
				
			||||||
			List<String> lx_codes = getGzzCodes(NewWaveFlag.LXQ);// 自动创波工作站
 | 
								List<String> lx_codes = getGzzCodes(NewWaveFlag.LXQ);// 自动创波工作站
 | 
				
			||||||
			List<String> hj_codes = getGzzCodes(NewWaveFlag.HJQ);
 | 
								List<String> hj_codes = getGzzCodes(NewWaveFlag.HJQ);
 | 
				
			||||||
| 
						 | 
					@ -47,27 +47,18 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 | 
				
			||||||
			int lxCount = 0;// 工作站任务未处理任务数
 | 
								int lxCount = 0;// 工作站任务未处理任务数
 | 
				
			||||||
			int hjCount = 0;
 | 
								int hjCount = 0;
 | 
				
			||||||
			int lkCount = 0;
 | 
								int lkCount = 0;
 | 
				
			||||||
			try {
 | 
							
 | 
				
			||||||
				for (String code : lx_codes) {
 | 
								for (String code : lx_codes) {
 | 
				
			||||||
					lxCount += maps.get(code);
 | 
									lxCount +=maps.get(code)==null?0:maps.get(code);
 | 
				
			||||||
				}
 | 
					 | 
				
			||||||
			} catch (Exception e) {
 | 
					 | 
				
			||||||
				lxCount = 0;
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			try {
 | 
								for (String code : hj_codes) {
 | 
				
			||||||
				for (String code : hj_codes) {
 | 
									hjCount +=maps.get(code)==null?0:maps.get(code);
 | 
				
			||||||
					hjCount += maps.get(code);
 | 
					 | 
				
			||||||
				}
 | 
					 | 
				
			||||||
			} catch (Exception e) {
 | 
					 | 
				
			||||||
				hjCount = 0;
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			try {
 | 
							
 | 
				
			||||||
				for (String code : lk_codes) {
 | 
								for (String code : lk_codes) {
 | 
				
			||||||
					lkCount += maps.get(code);
 | 
									lkCount +=maps.get(code)==null?0:maps.get(code);
 | 
				
			||||||
				}
 | 
					 | 
				
			||||||
			} catch (Exception e) {
 | 
					 | 
				
			||||||
				lkCount = 0;
 | 
					 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
 | 
								
 | 
				
			||||||
			allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lx_codes,
 | 
								allocateGZZ(waveDoc.getCode(), NewWaveFlag.LKQ, lx_codes,
 | 
				
			||||||
					(int) lx_sx.getTaskD(), (int) lx_sx.getNumber(), lxCount,
 | 
										(int) lx_sx.getTaskD(), (int) lx_sx.getNumber(), lxCount,
 | 
				
			||||||
					maps);
 | 
										maps);
 | 
				
			||||||
| 
						 | 
					@ -373,7 +364,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		// 分配工作站,每个工作站剩余可分配订单数
 | 
							// 分配工作站,每个工作站剩余可分配订单数
 | 
				
			||||||
		for (String code : gzz_codes) {
 | 
							for (String code : gzz_codes) {
 | 
				
			||||||
			int gzz_nx = gzz_nx_avg - gzz_maps.get(code);
 | 
								int gzz_nx = gzz_nx_avg - (gzz_maps.get(code)==null?0:gzz_maps.get(code));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue