|
@@ -13,9 +13,7 @@ import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBa
|
|
|
import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
|
|
|
import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsend;
|
|
|
import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
|
|
|
-import org.jeecg.modules.billet.billetHotsend.entity.RulerDefaultConfig;
|
|
|
import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
|
|
|
-import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
|
|
|
import org.jeecg.modules.billet.billetHotsendAbandons.entity.BilletHotsendAbandons;
|
|
|
import org.jeecg.modules.billet.billetHotsendAbandons.service.IBilletHotsendAbandonsService;
|
|
|
import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
|
|
@@ -47,7 +45,6 @@ import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingAndL
|
|
|
import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingDownLogService;
|
|
|
import org.jeecg.modules.billet.stackingAndLoadingVehicles.service.IStackingUpLogService;
|
|
|
import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.LoadingParams;
|
|
|
-import org.jeecg.modules.billet.stackingAndLoadingVehicles.vo.SavVo;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.StorageBill;
|
|
@@ -62,8 +59,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
-import java.util.concurrent.atomic.AtomicReference;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -76,8 +71,6 @@ import java.util.stream.Collectors;
|
|
|
@Slf4j
|
|
|
public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingAndLoadingVehiclesMapper, StackingAndLoadingVehicles> implements IStackingAndLoadingVehiclesService {
|
|
|
|
|
|
- @Autowired
|
|
|
- private IRulerDefaultConfigService rulerDefaultConfigService;
|
|
|
@Autowired
|
|
|
private IBilletHotsendBaseService billetHotsendBaseService;
|
|
|
@Autowired
|
|
@@ -118,349 +111,6 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
private IRollHeightService rollHeightService;
|
|
|
@Autowired
|
|
|
private IRollHeightDetailsService rollHeightDetailsService;
|
|
|
- @Override
|
|
|
- public List<List<StackingAndLoadingVehicles>> getListBySatck(String typeConfigId) {
|
|
|
- LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(StackingAndLoadingVehicles::getTypeConfigId, typeConfigId);
|
|
|
- List<StackingAndLoadingVehicles> list = baseMapper.selectList(wrapper);
|
|
|
- Boolean isNotNull = oConvertUtils.listIsNotEmpty(list);
|
|
|
- List<List<StackingAndLoadingVehicles>> res = new ArrayList<>();
|
|
|
- for (int i = 1; i < 21; i++) {
|
|
|
- List<StackingAndLoadingVehicles> savs = new ArrayList<>();
|
|
|
- for (int j = 1; j < 10; j++) {
|
|
|
- AtomicReference<StackingAndLoadingVehicles> sav = new AtomicReference<>();
|
|
|
- String layer = i+"";
|
|
|
- String adddress = j+"";
|
|
|
- if(isNotNull){
|
|
|
- list.forEach(item->{
|
|
|
- if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
|
|
|
- sav.set(item);
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- if(sav.get()==null||oConvertUtils.isEmpty(sav.get().getId())){
|
|
|
- sav.set(new StackingAndLoadingVehicles());
|
|
|
- sav.get().setLayer(layer);
|
|
|
- sav.get().setAddress(adddress);
|
|
|
- sav.get().setStackAddr(typeConfigId);
|
|
|
- }
|
|
|
- savs.add(sav.get());
|
|
|
- }
|
|
|
- res.add(savs);
|
|
|
- }
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void addBatch(SavVo savVo) {
|
|
|
-// if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
|
|
|
-// RulerDefaultConfig last = rulerDefaultConfigService.getLast(savVo.getCastMachine());
|
|
|
-// String furnace = null;
|
|
|
-// if(last!=null){
|
|
|
-// furnace = last.getPourHeats();
|
|
|
-// last.setShiftProduct((last.getShiftProduct()==null?0:last.getShiftProduct())+4*savVo.getSavs().size());
|
|
|
-// rulerDefaultConfigMapper.updateById(last);
|
|
|
-// }
|
|
|
-//
|
|
|
-// String finalFurnace = furnace;
|
|
|
-// savVo.getSavs().forEach(item->{
|
|
|
-// if(oConvertUtils.isEmpty(item.getHeatNo()))item.setHeatNo(finalFurnace);
|
|
|
-// });
|
|
|
-// this.addBilletHotsend(savVo.getSavs(),"1",null,savVo.getCastMachine(),"5");
|
|
|
-// String destination = "";
|
|
|
-// switch (savVo.getSavs().get(0).getStackAddr()){
|
|
|
-// case "601":
|
|
|
-// destination = "601堆垛";
|
|
|
-// break;
|
|
|
-// case "602":
|
|
|
-// destination = "602堆垛";
|
|
|
-// break;
|
|
|
-// case "604":
|
|
|
-// destination = "604堆垛";
|
|
|
-// break;
|
|
|
-// case "6":
|
|
|
-// destination = "步进冷床";
|
|
|
-// break;
|
|
|
-// case "501":
|
|
|
-// destination = "501堆垛";
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// addStorageBill(savVo.getSavs(),savVo.getCastMachine(),"默认",destination);
|
|
|
-//
|
|
|
-// }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void loading(LoadingParams loadingParams) {
|
|
|
-// RulerDefaultConfig last = rulerDefaultConfigService.getLast(loadingParams.getCastMachine());
|
|
|
-// if(loadingParams.getStackingAndLoadingVehiclesList()!=null&&loadingParams.getSavs().size()>0){
|
|
|
-// String carNum = loadingParams.getCarNum();
|
|
|
-// LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
|
|
|
-//// wrapper.eq(StackingAndLoadingVehicles::getCarNum, carNum);
|
|
|
-// Long old = baseMapper.selectCount(wrapper);
|
|
|
-// int amount = loadingParams.getSavs().size();
|
|
|
-// if(old>0){
|
|
|
-// amount -= old;
|
|
|
-// }
|
|
|
-// if(last!=null){
|
|
|
-// if(last.getShiftProduct()==null)last.setShiftProduct(0);
|
|
|
-// last.setShiftProduct(last.getShiftProduct()+4*amount);
|
|
|
-// int times = StringUtil.isNullOrEmpty(last.getCureentCarTimes())?0:Integer.parseInt(last.getCureentCarTimes());
|
|
|
-// last.setCureentCarTimes(times+1+"");
|
|
|
-// last.setCureentCarTimese(times+1+"");
|
|
|
-// rulerDefaultConfigMapper.updateById(last);
|
|
|
-// }
|
|
|
-// List<StackingAndLoadingVehicles> hotList = new ArrayList<>();
|
|
|
-// HashMap<String, List<StackingAndLoadingVehicles>> coldListMap = new HashMap<>();
|
|
|
-//
|
|
|
-// for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
|
|
|
-// if(!StringUtil.isNullOrEmpty(sav.getStackAddr())){
|
|
|
-// sav.setStackAddr(sav.getStackAddr().substring(0,sav.getStackAddr().indexOf(",")));
|
|
|
-// List<StackingAndLoadingVehicles> coldList = coldListMap.get(sav.getStackAddr());
|
|
|
-// if(coldList == null){
|
|
|
-// coldList = new ArrayList<StackingAndLoadingVehicles>();
|
|
|
-// coldListMap.put(sav.getStackAddr(),coldList);
|
|
|
-// }
|
|
|
-// coldList.add(sav);
|
|
|
-// }else{
|
|
|
-// hotList.add(sav);
|
|
|
-// }
|
|
|
-// if(oConvertUtils.isNotEmpty(sav.getId()))baseMapper.deleteById(sav.getId());
|
|
|
-// }
|
|
|
-// this.addBilletHotsend(hotList,"2",loadingParams.getCarNum(),loadingParams.getCastMachine(),loadingParams.getDestination());
|
|
|
-// Set<Map.Entry<String, List<StackingAndLoadingVehicles>>> entries = coldListMap.entrySet();
|
|
|
-// for (Map.Entry<String, List<StackingAndLoadingVehicles>> entry : entries) {
|
|
|
-// this.addBilletHotsend(entry.getValue(),"3",loadingParams.getCarNum(),loadingParams.getCastMachine(),loadingParams.getDestination());
|
|
|
-// }
|
|
|
-// String destination = "";
|
|
|
-// switch (loadingParams.getDestination()){
|
|
|
-// case "1":
|
|
|
-// destination = "0";
|
|
|
-// break;
|
|
|
-// case "2":
|
|
|
-// destination = "1";
|
|
|
-// break;
|
|
|
-// case "4":
|
|
|
-// destination = "3";
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// addStorageBill(loadingParams.getSavs(),loadingParams.getCastMachine(),loadingParams.getCarNum(),destination);
|
|
|
-// addRolling(loadingParams);
|
|
|
-//
|
|
|
-// }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public Integer startCar(SavVo savVo) {
|
|
|
- LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<StackingAndLoadingVehicles>();
|
|
|
-// wrapper.eq(StackingAndLoadingVehicles::getCarNum, savVo.getCarNum());
|
|
|
- List<StackingAndLoadingVehicles> list = baseMapper.selectList(wrapper);
|
|
|
- RulerDefaultConfig last = rulerDefaultConfigService.getLast(savVo.getCastMachine());
|
|
|
- last.setOutAmount((oConvertUtils.isEmpty(last.getOutAmount())?0:last.getOutAmount())+savVo.getSavs().size()*4);
|
|
|
- if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
|
|
|
- if(list!=null&&oConvertUtils.listIsNotEmpty(list)){
|
|
|
- if((list.size()+savVo.getSavs().size())>7){
|
|
|
- return 7-list.size();
|
|
|
- }
|
|
|
- }
|
|
|
- if(savVo.getSavs().size()>7)return 7;
|
|
|
- int index = 0;
|
|
|
- for (int i = 1; i <= 4; i++) {
|
|
|
- int number = 3;
|
|
|
- if(i == 4)number = 2;
|
|
|
- for (int j = 1; j < number; j++) {
|
|
|
- String layer = String.valueOf(i);
|
|
|
- String adddress = String.valueOf(j);
|
|
|
- AtomicBoolean isExist = new AtomicBoolean(true);
|
|
|
- list.forEach(item->{
|
|
|
- if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
|
|
|
- isExist.set(false);
|
|
|
- }
|
|
|
- });
|
|
|
- if(isExist.get()&&index<savVo.getSavs().size()){
|
|
|
- StackingAndLoadingVehicles sav = new StackingAndLoadingVehicles();
|
|
|
- BeanUtils.copyProperties(savVo.getSavs().get(index), sav);
|
|
|
- sav.setId(null);
|
|
|
-// sav.setCarNum(savVo.getCarNum());
|
|
|
- sav.setAddress(adddress);
|
|
|
- sav.setLayer(layer);
|
|
|
- sav.setStackAddr(savVo.getSavs().get(index).getStackAddr()+","+savVo.getSavs().get(index).getLayer()+","+savVo.getSavs().get(index).getAddress());
|
|
|
- baseMapper.insert(sav);
|
|
|
- baseMapper.deleteById(savVo.getSavs().get(index).getId());
|
|
|
- index++;
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- rulerDefaultConfigService.updateById(last);
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public List<List<StackingAndLoadingVehicles>> getCarLoad(LambdaQueryWrapper<StackingAndLoadingVehicles> eq) {
|
|
|
- List<StackingAndLoadingVehicles> list = baseMapper.selectList(eq);
|
|
|
- Boolean isNotNull = oConvertUtils.listIsNotEmpty(list);
|
|
|
- List<List<StackingAndLoadingVehicles>> res = new ArrayList<>();
|
|
|
- for (int i = 1; i <= 4; i++) {
|
|
|
- List<StackingAndLoadingVehicles> savs = new ArrayList<>();
|
|
|
- int number = 3;
|
|
|
- if(i == 4)number = 2;
|
|
|
- for (int j = 1; j < number; j++) {
|
|
|
- AtomicReference<StackingAndLoadingVehicles> sav = new AtomicReference<>();
|
|
|
- String layer = i+"";
|
|
|
- String adddress = j+"";
|
|
|
- if(isNotNull){
|
|
|
- list.forEach(item->{
|
|
|
- if(item.getLayer().equals(layer)&&item.getAddress().equals(adddress)){
|
|
|
- sav.set(item);
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- if(sav.get()==null||oConvertUtils.isEmpty(sav.get().getId())){
|
|
|
- sav.set(new StackingAndLoadingVehicles());
|
|
|
- sav.get().setLayer(layer);
|
|
|
- sav.get().setAddress(adddress);
|
|
|
- }
|
|
|
- savs.add(sav.get());
|
|
|
- }
|
|
|
- res.add(savs);
|
|
|
- }
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void stackCarSave(LoadingParams loadingParams) {
|
|
|
- if(oConvertUtils.listIsNotEmpty(loadingParams.getStackingAndLoadingVehiclesList())){
|
|
|
- for (StackingAndLoadingVehicles sav : loadingParams.getStackingAndLoadingVehiclesList()) {
|
|
|
- if(oConvertUtils.isEmpty(sav.getId())){
|
|
|
-// sav.setCarNum(loadingParams.getCarNum());
|
|
|
- baseMapper.insert(sav);
|
|
|
- }else{
|
|
|
- baseMapper.updateById(sav);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void addBilletHotsend(List<StackingAndLoadingVehicles> savs,String type,String carNum,String castMachine,String destination){
|
|
|
- if(savs!=null&&savs.size()>0){
|
|
|
- String stackAddr = savs.get(0).getStackAddr();
|
|
|
- if (oConvertUtils.isEmpty(castMachine)){
|
|
|
- if(stackAddr.contains("5")){
|
|
|
- castMachine = "5";
|
|
|
- }else{
|
|
|
- castMachine = "6";
|
|
|
- }
|
|
|
- }
|
|
|
- RulerDefaultConfig last = rulerDefaultConfigService.getLast(castMachine);
|
|
|
-
|
|
|
- HashMap<String, List<StackingAndLoadingVehicles>> map = new HashMap<>();
|
|
|
- for (StackingAndLoadingVehicles sav : savs) {
|
|
|
- List<StackingAndLoadingVehicles> list = map.get(sav.getHeatNo()+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize());
|
|
|
- if(list==null){
|
|
|
- list = new ArrayList<StackingAndLoadingVehicles>();
|
|
|
- map.put(sav.getHeatNo()+"-"+sav.getSteel()+"-"+sav.getSpec()+"-"+sav.getSize(),list);
|
|
|
- }
|
|
|
- list.add(sav);
|
|
|
- }
|
|
|
-
|
|
|
- Set<Map.Entry<String, List<StackingAndLoadingVehicles>>> entries = map.entrySet();
|
|
|
- for (Map.Entry<String, List<StackingAndLoadingVehicles>> entry : entries) {
|
|
|
- BilletHotsend billetHotsend = new BilletHotsend();
|
|
|
- int amount = entry.getValue().size();
|
|
|
- if(last!=null){
|
|
|
- billetHotsend.setShiftGroup(last.getShiftGroup());
|
|
|
- billetHotsend.setShift(last.getShift());
|
|
|
- billetHotsend.setCreateDate(new Date());
|
|
|
- }
|
|
|
- billetHotsend.setAmountTotal(4*amount);
|
|
|
- billetHotsend.setCcmNo(castMachine);
|
|
|
- String[] msgs = entry.getKey().split("-");
|
|
|
- billetHotsend.setHeatNo(oConvertUtils.isEmpty(msgs[0])?"":msgs[0]);
|
|
|
- billetHotsend.setSteel(oConvertUtils.isEmpty(msgs[1])?"":msgs[1]);
|
|
|
- switch (destination){
|
|
|
- case "0":
|
|
|
-// billetHotsend.setAmountOne(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setCarNumOne(carNum);
|
|
|
-// billetHotsend.setSizeOne(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
-// billetHotsend.setStackAddrOne(stackAddr);
|
|
|
- break;
|
|
|
- case "1":
|
|
|
-// billetHotsend.setAmountTwo(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setCarNumTwo(carNum);
|
|
|
-// billetHotsend.setSizeTwo(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
-// billetHotsend.setStackAddrTwo(stackAddr);
|
|
|
- break;
|
|
|
- case "2":
|
|
|
-// billetHotsend.setAmountThree(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setCarNumThree(carNum);
|
|
|
-// billetHotsend.setSizeThree(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
-// billetHotsend.setStackAddrThree(stackAddr);
|
|
|
- break;
|
|
|
- case "3":
|
|
|
-// billetHotsend.setAmountHeight(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setStackAddrHeight(stackAddr);
|
|
|
-// billetHotsend.setSizeHeight(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
- break;
|
|
|
- case "4":
|
|
|
-// billetHotsend.setAmountOut(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setCarNumOut(carNum);
|
|
|
-// billetHotsend.setStackAddrOut(stackAddr);
|
|
|
-// billetHotsend.setSizeOut(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
- break;
|
|
|
- case "5":
|
|
|
-// billetHotsend.setAmountStack(billetHotsend.getAmountTotal().toString());
|
|
|
-// billetHotsend.setStackAddr(stackAddr);
|
|
|
-// billetHotsend.setSizeStack(oConvertUtils.isEmpty(msgs[3])?"":msgs[3]);
|
|
|
- break;
|
|
|
- }
|
|
|
-// billetHotsend.setBz(type);
|
|
|
- billetHotsendBaseService.save(billetHotsend);
|
|
|
- if(type.equals("1")){
|
|
|
- for (StackingAndLoadingVehicles stackingAndLoadingVehicles : entry.getValue()) {
|
|
|
-// stackingAndLoadingVehicles.setLogId(billetHotsend.getId());
|
|
|
- baseMapper.insert(stackingAndLoadingVehicles);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void startHeight(SavVo savVo) {
|
|
|
-// if(oConvertUtils.listIsNotEmpty(savVo.getSavs())){
|
|
|
-// addBilletHotsend(savVo.getSavs(),"5",null,null,"3");
|
|
|
-// for (StackingAndLoadingVehicles sav : savVo.getSavs()) {
|
|
|
-// baseMapper.deleteById(sav.getId());
|
|
|
-// }
|
|
|
-// String castMachine = "";
|
|
|
-// if(savVo.getSavs().get(0).getStackAddr().contains("5")){
|
|
|
-// castMachine = "5";
|
|
|
-// }else{
|
|
|
-// castMachine = "6";
|
|
|
-// }
|
|
|
-// addStorageBill(savVo.getSavs(),castMachine,"辊道","2");
|
|
|
-// RulerDefaultConfig last = rulerDefaultConfigService.getLast("6");
|
|
|
-// last.setOutAmount((oConvertUtils.isEmpty(last.getOutAmount())?0:last.getOutAmount())+savVo.getSavs().size()*4);
|
|
|
-// LoadingParams loadingParams = new LoadingParams();
|
|
|
-// loadingParams.setSavs(savVo.getSavs());
|
|
|
-// loadingParams.setCastMachine("6");
|
|
|
-// loadingParams.setDestination("3");
|
|
|
-// addRolling(loadingParams);
|
|
|
-// rulerDefaultConfigService.updateById(last);
|
|
|
-// }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public List<StackingAndLoadingVehicles> getListByCarNum(String carNum) {
|
|
|
- LambdaQueryWrapper<StackingAndLoadingVehicles> wrapper = new LambdaQueryWrapper<>();
|
|
|
-// wrapper.eq(StackingAndLoadingVehicles::getCarNum, carNum);
|
|
|
- List<StackingAndLoadingVehicles> stackingAndLoadingVehicles = baseMapper.selectList(wrapper);
|
|
|
- return stackingAndLoadingVehicles;
|
|
|
- }
|
|
|
|
|
|
@Override
|
|
|
public void saveUpperStacking(LoadingParams loadingParams) {
|