no message
parent
7e61e7676d
commit
cc566e8b66
|
|
@ -29,6 +29,7 @@ import com.dev.swms.server.model.receiving.SlotType;
|
||||||
import com.dev.swms.server.model.shipping.NewWaveFlag;
|
import com.dev.swms.server.model.shipping.NewWaveFlag;
|
||||||
import com.dev.swms.server.model.shipping.WaveDoc;
|
import com.dev.swms.server.model.shipping.WaveDoc;
|
||||||
import com.dev.swms.server.service.shipping.NewWaveManager;
|
import com.dev.swms.server.service.shipping.NewWaveManager;
|
||||||
|
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
|
|
||||||
|
|
@ -380,6 +381,15 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
|
||||||
|
|
||||||
|
|
||||||
int count_all = FenPeiWeiChuLiRenWu + list_fenpei.size();// 所有未处理的数据
|
int count_all = FenPeiWeiChuLiRenWu + list_fenpei.size();// 所有未处理的数据
|
||||||
|
if (count_all>0) {
|
||||||
|
if (gzz_codes.size()>0) {
|
||||||
|
|
||||||
|
}else {
|
||||||
|
throw new BusinessException("请选择"+"工作站!");
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
return;
|
||||||
|
}
|
||||||
int gzz_nx_avg = count_all / gzz_codes.size();// 得到工作站的平均能效,
|
int gzz_nx_avg = count_all / gzz_codes.size();// 得到工作站的平均能效,
|
||||||
Map<String, GongZuoZhan> gzzMap = new HashMap<>();
|
Map<String, GongZuoZhan> gzzMap = new HashMap<>();
|
||||||
LogPrint(log_GongZuoZhanMinXi,"gzz_nx_avg:"+gzz_nx_avg+"");
|
LogPrint(log_GongZuoZhanMinXi,"gzz_nx_avg:"+gzz_nx_avg+"");
|
||||||
|
|
@ -1549,6 +1559,8 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
|
||||||
for (String code : lk_codes) {
|
for (String code : lk_codes) {
|
||||||
lkCount += gzz_maps.get(code) == null ? 0 : gzz_maps.get(code);
|
lkCount += gzz_maps.get(code) == null ? 0 : gzz_maps.get(code);
|
||||||
}
|
}
|
||||||
|
//有任务没有分配分配工作站错误
|
||||||
|
|
||||||
allocateGZZ(lx_wwc_list, lx_codes,
|
allocateGZZ(lx_wwc_list, lx_codes,
|
||||||
(int) lx_sx.getTaskD(), lx_jianHuoXiaoLv, lxCount,
|
(int) lx_sx.getTaskD(), lx_jianHuoXiaoLv, lxCount,
|
||||||
gzz_maps);
|
gzz_maps);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue