|
@@ -10,9 +10,13 @@ import org.jeecg.modules.billet.billetHotsend.entity.BilletHotsendDetailsVo;
|
|
|
import org.jeecg.modules.billet.billetHotsend.entity.RollClubCommon;
|
|
|
import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
|
|
|
import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
|
|
|
+import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
|
|
|
import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
|
|
|
+import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
|
|
|
import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoDetailsService;
|
|
|
+import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
|
|
|
import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
|
|
|
+import org.jeecg.modules.billet.storageBill.entity.BilletHotsendDetails;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.GetStatsResponse;
|
|
|
import org.jeecg.modules.billet.storageBill.entity.StorageBill;
|
|
|
import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
|
|
@@ -108,4 +112,30 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
});
|
|
|
billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public BilletHotsendDetails findBilletHotsendDetails(StorageBill storageBill) {
|
|
|
+ BilletHotsendDetails result = new BilletHotsendDetails();
|
|
|
+ //根据部门orgCode查询部门,需要将职位id进行传递
|
|
|
+ BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(storageBill.getTypeConfigId());
|
|
|
+ if (oConvertUtils.isEmpty(billetHotsendTypeConfig)){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ // 如果是5号机棒二、棒三、上若 6号机 棒二、棒三 查询对应的明细信息
|
|
|
+ if ("1".equals(billetHotsendTypeConfig.getIsTrucking().toString()) && "棒二".equals(billetHotsendTypeConfig.getTypeName())){
|
|
|
+ List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(new LambdaQueryWrapper<RollClubTwoDetails>().eq(RollClubTwoDetails::getStorageBillId, storageBill.getId()).eq(RollClubTwoDetails::getCcmNo, storageBill.getCcmNo()));
|
|
|
+ result.setRollClubTwoDetailsList(rollClubTwoDetailsList);
|
|
|
+ }else if ("1".equals(billetHotsendTypeConfig.getIsTrucking().toString()) && "棒三".equals(billetHotsendTypeConfig.getTypeName())){
|
|
|
+ List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(new LambdaQueryWrapper<RollClubThreeDetails>().eq(RollClubThreeDetails::getStorageBillId, storageBill.getId()).eq(RollClubThreeDetails::getCcmNo, storageBill.getCcmNo()));
|
|
|
+ result.setRollClubThreeDetailsList(rollClubThreeDetailsList);
|
|
|
+ }else if ("1".equals(billetHotsendTypeConfig.getIsTrucking().toString()) && "上若".equals(billetHotsendTypeConfig.getTypeName())){
|
|
|
+ List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(new LambdaQueryWrapper<RollOutShippDetails>().eq(RollOutShippDetails::getStorageBillId, storageBill.getId()).eq(RollOutShippDetails::getCcmNo, storageBill.getCcmNo()));
|
|
|
+ result.setRollOutShippDetailsList(rollOutShippDetailsList);
|
|
|
+ }else {
|
|
|
+ // 其他所有非车运的查询钢坯基础信息
|
|
|
+ List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(new LambdaQueryWrapper<BilletBasicInfo>().eq(BilletBasicInfo::getBhtcId, storageBill.getTypeConfigId()));
|
|
|
+ result.setBilletBasicInfoList(billetBasicInfoList);
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+ }
|
|
|
}
|