|
@@ -328,7 +328,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
private void apsOrderScheduleNew(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser){
|
|
|
// 先按合金,合金状态分组,再每组分别排程
|
|
|
for (ApsBlankOrderVo apsBlankOrder : apsBlankOrders) {
|
|
|
- apsBlankOrder.setVolumeMetalAndState(apsBlankOrder.getAlloy() + (apsBlankOrder.getAlloystatus() == null ? "" : apsBlankOrder.getAlloystatus()));
|
|
|
+ apsBlankOrder.setVolumeMetalAndState(apsBlankOrder.getAlloy());
|
|
|
}
|
|
|
Map<String, List<ApsBlankOrderVo>> voms = apsBlankOrders.stream().collect(Collectors.groupingBy(ApsBlankOrderVo::getVolumeMetalAndState));
|
|
|
if(voms != null && voms.size()>0){
|