|
@@ -11,6 +11,7 @@ import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.billetActual.entity.*;
|
|
|
import org.jeecg.modules.billetActual.service.IBilletHotsendChangeShiftService;
|
|
|
import org.jeecg.modules.billetAutoException.service.IBilletAutoExceptionService;
|
|
|
+import org.jeecg.modules.billetHotsendConfig.entity.BilletHotsendTypeConfig;
|
|
|
import org.jeecg.modules.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
|
|
|
import org.jeecg.modules.operateLog.entity.OperateLog;
|
|
|
import org.jeecg.modules.operateLog.service.IOperateLogService;
|
|
@@ -62,6 +63,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
@Autowired
|
|
|
private IShiftConfigurationService shiftConfigurationService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void autoAddStorageBill(JSONObject jsonObject) {
|
|
@@ -146,6 +150,11 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
.last("limit 1");
|
|
|
ShiftConfiguration shiftConfiguration = shiftConfigurationService.getOne(queryWrapper1);
|
|
|
if (shiftConfiguration != null && oConvertUtils.isNotEmpty(shiftConfiguration.getDestination())){
|
|
|
+ LambdaQueryWrapper<BilletHotsendTypeConfig> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper3.eq(BilletHotsendTypeConfig::getCastMachine, ccmNo)
|
|
|
+ .eq(BilletHotsendTypeConfig::getId, shiftConfiguration.getDestination());
|
|
|
+ BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getOne(queryWrapper3);
|
|
|
+ storageBill.setDestination(billetHotsendTypeConfig.getTypeName());
|
|
|
storageBill.setTypeConfigId(shiftConfiguration.getDestination());
|
|
|
storageBill.setBrandNum(shiftConfiguration.getSteelGrade());//牌号
|
|
|
storageBill.setNewOldPlatform(shiftConfiguration.getNewOldPlatform());
|