|
@@ -129,7 +129,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
}
|
|
|
BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
|
|
|
BilletHotsend billetHotsend = billetHotsendDetailsVo.getBilletHotsend();
|
|
|
- String rollClubOneOrHeightStorageBillId = String.valueOf(IdWorker.getId());
|
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
|
Map<String, List<RollClubCommon>> rollClubCommonListttt = groupByShiftAttributes(rollClubCommonList);
|
|
|
// 在这里可以添加更多针对每个分组(键和对应列表)的业务逻辑操作,比如遍历列表中的元素等
|
|
@@ -139,7 +138,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
billetHotsend.setShiftGroup(parts[1]);// 班组
|
|
|
billetHotsend.setShift(parts[2]);// 班别
|
|
|
List<RollClubCommon> groupRollClubCommonList = entry.getValue();
|
|
|
- JSONObject jsonObject = handleBilletHotsenAndDetails(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, rollClubOneOrHeightStorageBillId, storageBill, groupRollClubCommonList);
|
|
|
+ JSONObject jsonObject = handleBilletHotsenAndDetails(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, storageBill, groupRollClubCommonList);
|
|
|
if (jsonObject.containsKey("fail")){
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return jsonObject;
|
|
@@ -247,8 +246,9 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
}
|
|
|
// 根据billetHotsendTypeConfigId 查询基础垛位信息
|
|
|
BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(billetHotsendDetailsVo.getBilletHotsendTypeConfigId());
|
|
|
+
|
|
|
BilletHotsend billetHotsend = billetHotsendDetailsVo.getBilletHotsend();
|
|
|
- String rollClubOneOrHeightStorageBillId = String.valueOf(IdWorker.getId());
|
|
|
+
|
|
|
StorageBill storageBill = billetHotsendDetailsVo.getStorageBill();
|
|
|
Map<String, List<RollClubCommon>> rollClubCommonListttt = groupByShiftAttributes(rollClubCommonList);
|
|
|
// 在这里可以添加更多针对每个分组(键和对应列表)的业务逻辑操作,比如遍历列表中的元素等
|
|
@@ -258,7 +258,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
billetHotsend.setShiftGroup(parts[1]);// 班组
|
|
|
billetHotsend.setShift(parts[2]);// 班别
|
|
|
List<RollClubCommon> groupRollClubCommonList = entry.getValue();
|
|
|
- JSONObject jsonObject = handleBilletHotsenAndDetails(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, rollClubOneOrHeightStorageBillId, storageBill, groupRollClubCommonList);
|
|
|
+ JSONObject jsonObject = handleBilletHotsenAndDetails(billetHotsend, billetHotsendDetailsVo, billetHotsendTypeConfig, storageBill, groupRollClubCommonList);
|
|
|
if (jsonObject.containsKey("fail")){
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return jsonObject;
|
|
@@ -726,11 +726,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
* @param billetHotsend
|
|
|
* @param billetHotsendDetailsVo
|
|
|
* @param billetHotsendTypeConfig
|
|
|
- * @param rollClubOneOrHeightStorageBillId
|
|
|
* @param storageBill
|
|
|
* @return
|
|
|
*/
|
|
|
- private JSONObject handleBilletHotsenAndDetails(BilletHotsend billetHotsend, BilletHotsendDetailsVo billetHotsendDetailsVo, BilletHotsendTypeConfig billetHotsendTypeConfig, String rollClubOneOrHeightStorageBillId, StorageBill storageBill, List<RollClubCommon> rollClubCommonList){
|
|
|
+ private JSONObject handleBilletHotsenAndDetails(BilletHotsend billetHotsend, BilletHotsendDetailsVo billetHotsendDetailsVo, BilletHotsendTypeConfig billetHotsendTypeConfig, StorageBill storageBill, List<RollClubCommon> rollClubCommonList){
|
|
|
JSONObject result = new JSONObject();
|
|
|
LambdaQueryWrapper<BilletHotsend> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(BilletHotsend::getCcmNo, billetHotsend.getCcmNo())
|
|
@@ -814,7 +813,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubOneDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollClubOneDetails.setShift(billetHotsend.getShift());
|
|
|
rollClubOneDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
- rollClubOneDetails.setStorageBillId(rollClubOneOrHeightStorageBillId);
|
|
|
rollClubOneDetails.setLicensePlate("辊道");
|
|
|
rollClubOneDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollClubOneDetails.setSteel(x.getGrade());
|
|
@@ -989,7 +987,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollHeightDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollHeightDetails.setShift(billetHotsend.getShift());
|
|
|
rollHeightDetails.setShiftGroup(billetHotsend.getShiftGroup());
|
|
|
- rollHeightDetails.setStorageBillId(rollClubOneOrHeightStorageBillId);
|
|
|
rollHeightDetails.setLicensePlate("辊道");
|
|
|
rollHeightDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollHeightDetails.setSteel(x.getGrade());
|