|
@@ -1,5 +1,6 @@
|
|
package org.jeecg.modules.billet.storageBill.service.impl;
|
|
package org.jeecg.modules.billet.storageBill.service.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -9,6 +10,8 @@ import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
|
|
import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
|
|
import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
|
|
import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
|
|
|
|
+import org.jeecg.modules.billet.billetAutoTmp.entity.BilletAutoTmp;
|
|
|
|
+import org.jeecg.modules.billet.billetAutoTmp.service.IBilletAutoTmpService;
|
|
import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
|
|
import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
|
|
import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
|
|
import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
|
|
import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
|
|
import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
|
|
@@ -26,9 +29,13 @@ import org.jeecg.modules.billet.rollHeight.entity.RollHeightDetails;
|
|
import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
|
|
import org.jeecg.modules.billet.rollHeight.service.IRollHeightDetailsService;
|
|
import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
|
|
import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
|
|
import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
|
|
import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
|
|
-import org.jeecg.modules.billet.storageBill.entity.*;
|
|
|
|
|
|
+import org.jeecg.modules.billet.storageBill.entity.BilletHotsendDetails;
|
|
|
|
+import org.jeecg.modules.billet.storageBill.entity.ShiftEnum;
|
|
|
|
+import org.jeecg.modules.billet.storageBill.entity.ShiftGroupEnum;
|
|
|
|
+import org.jeecg.modules.billet.storageBill.entity.StorageBill;
|
|
import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
|
|
import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
|
|
import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
|
|
import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -84,6 +91,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
@Autowired
|
|
@Autowired
|
|
private IOperateLogService operateLogService;
|
|
private IOperateLogService operateLogService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IBilletAutoTmpService billetAutoTmpService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void departHandle(BilletHotsendDetailsVo billetHotsendDetailsVo) {
|
|
public void departHandle(BilletHotsendDetailsVo billetHotsendDetailsVo) {
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
@@ -129,8 +139,23 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
//根据部门orgCode查询部门,需要将职位id进行传递
|
|
//根据部门orgCode查询部门,需要将职位id进行传递
|
|
BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(storageBill.getTypeConfigId());
|
|
BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(storageBill.getTypeConfigId());
|
|
if (oConvertUtils.isEmpty(billetHotsendTypeConfig)){
|
|
if (oConvertUtils.isEmpty(billetHotsendTypeConfig)){
|
|
|
|
+ log.info("{}{}", "钢坯类型配置信息查询为空,装运明细查询失败", JSON.toJSON(storageBill));
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
+ if ("billet_auto_tmp".equals(billetHotsendTypeConfig.getBelongTable())){
|
|
|
|
+ List<BilletAutoTmp> billetAutoTmpList = billetAutoTmpService.list(new LambdaQueryWrapper<BilletAutoTmp>().eq(BilletAutoTmp::getStorageBillId, storageBill.getId()));
|
|
|
|
+ if (oConvertUtils.listIsNotEmpty(billetAutoTmpList)){
|
|
|
|
+ List<RollClubTwoDetails> rollClubTwoDetailsList = new ArrayList<>();
|
|
|
|
+ billetAutoTmpList.forEach(x ->{
|
|
|
|
+ RollClubTwoDetails rollClubTwoDetails = new RollClubTwoDetails();
|
|
|
|
+ BeanUtils.copyProperties(x, rollClubTwoDetails);
|
|
|
|
+ rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
|
|
+ });
|
|
|
|
+ result.setRollClubTwoDetailsList(rollClubTwoDetailsList);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(new LambdaQueryWrapper<RollClubOneDetails>().eq(RollClubOneDetails::getStorageBillId, storageBill.getId()));
|
|
List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(new LambdaQueryWrapper<RollClubOneDetails>().eq(RollClubOneDetails::getStorageBillId, storageBill.getId()));
|
|
result.setRollClubOneDetailsList(rollClubOneDetailsList);
|
|
result.setRollClubOneDetailsList(rollClubOneDetailsList);
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(new LambdaQueryWrapper<RollClubTwoDetails>().eq(RollClubTwoDetails::getStorageBillId, storageBill.getId()));
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(new LambdaQueryWrapper<RollClubTwoDetails>().eq(RollClubTwoDetails::getStorageBillId, storageBill.getId()));
|
|
@@ -141,6 +166,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
result.setRollOutShippDetailsList(rollOutShippDetailsList);
|
|
result.setRollOutShippDetailsList(rollOutShippDetailsList);
|
|
List<RollHeightDetails> rollHeightDetails = rollHeightDetailsService.list(new LambdaQueryWrapper<RollHeightDetails>().eq(RollHeightDetails::getStorageBillId, storageBill.getId()));
|
|
List<RollHeightDetails> rollHeightDetails = rollHeightDetailsService.list(new LambdaQueryWrapper<RollHeightDetails>().eq(RollHeightDetails::getStorageBillId, storageBill.getId()));
|
|
result.setRollHeightDetails(rollHeightDetails);
|
|
result.setRollHeightDetails(rollHeightDetails);
|
|
|
|
+
|
|
// List<StackingDownLogDetails> stackingDownLogDetailsList = new ArrayList<>();
|
|
// List<StackingDownLogDetails> stackingDownLogDetailsList = new ArrayList<>();
|
|
// List<StackingDownLog> stackingDownLogList = stackingDownLogService.list(new LambdaQueryWrapper<StackingDownLog>().eq(StackingDownLog::getStorageBillId, storageBill.getId()));
|
|
// List<StackingDownLog> stackingDownLogList = stackingDownLogService.list(new LambdaQueryWrapper<StackingDownLog>().eq(StackingDownLog::getStorageBillId, storageBill.getId()));
|
|
// if (oConvertUtils.listIsEmpty(stackingDownLogList)){
|
|
// if (oConvertUtils.listIsEmpty(stackingDownLogList)){
|