|
@@ -16,6 +16,7 @@ import org.jeecg.modules.billet.billetHotsend.service.IBilletHotsendBaseService;
|
|
|
import org.jeecg.modules.billet.billetHotsend.service.IRulerDefaultConfigService;
|
|
|
import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
|
|
|
import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
|
|
|
+import org.jeecg.modules.billet.operateLog.service.IOperateLogService;
|
|
|
import org.jeecg.modules.billet.rollClubOne.entity.RollClubOne;
|
|
|
import org.jeecg.modules.billet.rollClubOne.entity.RollClubOneDetails;
|
|
|
import org.jeecg.modules.billet.rollClubOne.service.IRollClubOneDetailsService;
|
|
@@ -61,7 +62,8 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
|
@Slf4j
|
|
|
public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseMapper, BilletHotsend> implements IBilletHotsendBaseService {
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private IOperateLogService operateLogService;
|
|
|
@Autowired
|
|
|
private BilletHotsendBaseMapper billetHotsendBaseMapper;
|
|
|
@Autowired
|
|
@@ -321,7 +323,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
if (oConvertUtils.isNotEmpty(check) && oConvertUtils.listIsEmpty(rollClubCommonList)){
|
|
|
return;
|
|
|
}
|
|
|
- if (oConvertUtils.isEmpty(check) && oConvertUtils.listIsEmpty(rollClubCommonList)){
|
|
|
+ if (oConvertUtils.isEmpty(check)){
|
|
|
billetHotsend.setRollclubtwoNum(0);
|
|
|
billetHotsend.setRollcluboneNum(0);
|
|
|
billetHotsend.setRolloutshippNum(0);
|
|
@@ -330,6 +332,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
billetHotsend.setAmountTotal(0);
|
|
|
billetHotsend.setStackNum(0);
|
|
|
baseMapper.insert(billetHotsend);
|
|
|
+ billetHotsend.setId(billetHotsend.getId());
|
|
|
+ operateLogService.add(billetHotsend,null,BilletHotsend.class);
|
|
|
return;
|
|
|
}else {
|
|
|
if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable()) && "0".equals(billetHotsendTypeConfig.getBelongType().toString())){
|
|
@@ -349,6 +353,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
.eq(BilletHotsend::getShift, billetHotsend.getShift())
|
|
|
.eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());;
|
|
|
baseMapper.update(billetHotsend, updateWrapper);
|
|
|
+ billetHotsend.setId(check.getId());
|
|
|
+ operateLogService.add(billetHotsend,null,BilletHotsend.class);
|
|
|
}
|
|
|
List<String> billetNos = new ArrayList<>();
|
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
@@ -416,6 +422,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubTwoDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubTwoDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubTwoDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
|
});
|
|
@@ -453,6 +460,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubThreeDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubThreeDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubThreeDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
|
});
|
|
@@ -527,6 +535,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollOutShippDetails.setShift(billetHotsend.getShift());
|
|
|
rollOutShippDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollOutShippDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollOutShippDetailsList.add(rollOutShippDetails);
|
|
|
});
|
|
@@ -633,6 +642,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
billetHotsend.setRollheightNum(0);
|
|
|
billetHotsend.setRollclubthreeNum(0);
|
|
|
baseMapper.insert(billetHotsend);
|
|
|
+ billetHotsend.setId(check.getId());
|
|
|
+ operateLogService.add(billetHotsend,null,BilletHotsend.class);
|
|
|
}else {
|
|
|
if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable()) && "0".equals(billetHotsendTypeConfig.getBelongType().toString())){
|
|
|
billetHotsend.setRollcluboneNum(check.getRollcluboneNum() + rollClubCommonList.size());
|
|
@@ -651,6 +662,8 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
.eq(BilletHotsend::getShift, billetHotsend.getShift())
|
|
|
.eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());;
|
|
|
baseMapper.update(billetHotsend, updateWrapper);
|
|
|
+ billetHotsend.setId(check.getId());
|
|
|
+ operateLogService.add(billetHotsend,null,BilletHotsend.class);
|
|
|
}
|
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
|
List<String> billetNos = new ArrayList<>();
|
|
@@ -718,6 +731,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubTwoDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubTwoDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubTwoDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
|
});
|
|
@@ -754,6 +768,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubThreeDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubThreeDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollClubThreeDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
|
});
|
|
@@ -826,6 +841,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollOutShippDetails.setShift(billetHotsend.getShift());
|
|
|
rollOutShippDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
rollOutShippDetails.setStorageBillId(storageBill.getId());
|
|
|
+ rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
billetNos.add(x.getBilletNo());
|
|
|
rollOutShippDetailsList.add(rollOutShippDetails);
|
|
|
});
|
|
@@ -863,7 +879,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
List<StorageBill> storageBillList = storageBillService.list(queryWrapperSB);
|
|
|
storageBill.setCarNum(oConvertUtils.listIsEmpty(storageBillList) ? 0 : storageBillList.size() + 1);// 本车车次
|
|
|
storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
- storageBill.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
|
|
|
+ storageBill.setDestination(billetHotsendDetailsVo.getStorageBill().getDestination());// 目的地
|
|
|
storageBill.setAmountTotal(rollClubCommonList.size());
|
|
|
storageBill.setOutTime(new Date());
|
|
|
storageBillService.updateById(storageBill);
|