From d19f16214e16b1a33b71fd8f63662a35d8a2dc04 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 11 四月 2024 00:11:46 +0800
Subject: [PATCH] 修改lambda错误，增加swagger开关
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
index 6bb9809..9362d43 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
@@ -86,7 +86,6 @@
import cn.hutool.core.bean.BeanUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderServiceImpl.class */
public class FmsOrderServiceImpl extends BaseServiceImpl<FmsOrderMapper, FmsOrder> implements IFmsOrderService {
private static final Logger log = LoggerFactory.getLogger(FmsOrderServiceImpl.class);
private final IDictService dictService;
@@ -124,7 +123,7 @@
this.paramService = paramService;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public IPage<FmsOrderVO> getPageOrder(FmsOrderQueryVO fmsOrderQueryVO, Query query) {
String[] startTimeRange = (String[]) Optional.ofNullable(fmsOrderQueryVO.getPlanStartTime()).map(item -> {
return Func.split(item, ",");
@@ -197,7 +196,7 @@
return fmsOrderVOS.get(0);
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<CraftRoutingDetailVO> listCraft() {
List<CraftRoutingDetailVO> craftRoutingDetailVOS = new ArrayList<>();
List<CraftRoutingVO> craftRoutingVOS = CraftRoutingConvert.INSTANCE.convert(this.craftRoutingService.list());
@@ -208,7 +207,7 @@
return craftRoutingDetailVOS;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<CraftRoutingDetailVO> listProductionCraft(String productionId) {
List<CraftRoutingDetailVO> craftRoutingDetailVOS = new ArrayList<>();
CraftRoutingDetailVO craftRoutingDetailVO = this.craftRoutingService.getCraftByProduction(Long.valueOf(productionId));
@@ -225,14 +224,7 @@
List<CraftVersionDTO> versionDTOS = versionList.stream().filter(versionDTO -> {
List<CraftVersionLine> versionLines = this.craftVersionLineService.list(Lambda.eq(CraftVersionLine::getVersionId, versionDTO.getId()));
List<Long> groupIds = versionLines.stream().map(CraftVersionLine::getGroupId).collect(Collectors.toList());
- /*
- List<CraftVersionLine> versionLines = this.craftVersionLineService.list(Lambda.eq((v0) -> {
- return v0.getVersionId();
- }, versionDTO.getId()));
- List<Long> groupIds = (List) versionLines.stream().map((v0) -> {
- return v0.getGroupId();
- }).collect(Collectors.toList());
- */
+
/*
if (Func.isNotEmpty(groupIds)) {
return this.commonGroupService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
@@ -253,7 +245,7 @@
return craftRoutingDetailVOS;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public FmsOrderDetailVO save(FmsOrderVO fmsOrderVO) {
FmsOrder fmsOrder = FmsOrderConvert.INSTANCE.convert(fmsOrderVO);
@@ -271,9 +263,7 @@
fmsOrderDetailVO.setOrderTypeLabel(orderVO.getOrderTypeLabel());
return saveProcess(fmsOrder, fmsOrderDetailVO, fmsOrderVO);
}
- FmsOrder fmsOrderOld = (FmsOrder) ((FmsOrderMapper) this.baseMapper).selectOne(Lambda.eq((v0) -> {
- return v0.getId();
- }, fmsOrder.getId()));
+ FmsOrder fmsOrderOld = this.baseMapper.selectOne(Lambda.eq(FmsOrder::getId, fmsOrder.getId()));
((FmsOrderMapper) this.baseMapper).updateById(fmsOrder);
List<FmsOrderProcess> fmsOrderProcessList = this.fmsOrderProcessService.list(Wrappers.<FmsOrderProcess>query().lambda().eq(FmsOrderProcess::getOrderId, fmsOrderVO.getId()));
/*
@@ -288,17 +278,11 @@
fmsOrderDetailVO2.setProcessList(fmsOrderProcessList);
return fmsOrderDetailVO2;
}
- this.fmsOrderProcessService.remove(Lambda.eq((v0) -> {
- return v0.getOrderId();
- }, fmsOrderVO.getId()));
- this.fmsOrderProcessFixtureService.remove(Lambda.in((v0) -> {
- return v0.getOrderProcessId();
- }, fmsOrderProcessList.stream().map((v0) -> {
+ this.fmsOrderProcessService.remove(Lambda.eq(FmsOrderProcess::getOrderId, fmsOrderVO.getId()));
+ this.fmsOrderProcessFixtureService.remove(Lambda.in(FmsOrderProcessFixture::getOrderProcessId, fmsOrderProcessList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList())));
- this.fmsOrderProcessToolService.remove(Lambda.in((v0) -> {
- return v0.getOrderProcessId();
- }, fmsOrderProcessList.stream().map((v0) -> {
+ this.fmsOrderProcessToolService.remove(Lambda.in(FmsOrderProcessTool::getOrderProcessId, fmsOrderProcessList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList())));
return saveProcess(fmsOrder, fmsOrderDetailVO2, fmsOrderVO);
@@ -336,7 +320,7 @@
return fmsOrderDetailVO;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public void saveWorkstation(FmsOrderDetailVO fmsOrderDetailVO) {
List<FmsOrderProcess> processList = fmsOrderDetailVO.getProcessList();
@@ -356,7 +340,7 @@
});
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public FmsOrderStatusStatVO orderStatistics() {
List<Map<String, Object>> statusList = listMaps(new QueryWrapper<FmsOrder>()
.select(new String[] { Lambda.getName(FmsOrder::getOrderStatus), "count(1) as \"count\"" }).lambda()
@@ -397,7 +381,7 @@
}).orElse(0L)));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<FmsOrderProductionStatVO> productionStatistics(final String orderId) {
List<Map<String, Object>> data = ((FmsOrderMapper) this.baseMapper).productionStatistics(orderId);
return data.stream().map(item -> {
@@ -405,7 +389,7 @@
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FmsOrderVO pause(final String orderId) {
FmsOrder fmsOrder = (FmsOrder) getById(orderId);
@@ -419,7 +403,7 @@
throw new ServiceException(MessageUtils.message("fms.order.not.need.pause", new Object[0]));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<FmsOrderVO> pauseBatch(List<String> orderIds) {
List<FmsOrderVO> list = new ArrayList<>();
@@ -430,7 +414,7 @@
return list;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public FmsOrderVO start(final String orderId) {
FmsOrderVO wrapper;
@@ -477,7 +461,7 @@
return wrapper;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<FmsOrderVO> startOrders(List<String> orderIds) {
List<FmsOrderVO> result = Lists.newArrayList();
@@ -771,7 +755,7 @@
return new ArrayList<>();
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FmsOrderVO publish(final String orderId) {
FmsOrder fmsOrder = (FmsOrder) getById(orderId);
@@ -799,7 +783,7 @@
return wrapper(fmsOrder);
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public Boolean stopDownOrder() {
FmsInstructionRecord lastRecord = this.fmsInstructionRecordService.getLastRecord();
if (lastRecord == null) {
@@ -813,7 +797,7 @@
return Boolean.TRUE;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean removeOrder(IdsVO ids) {
List<Long> orderIds = Func.toLongList(ids.getIds());
@@ -827,7 +811,7 @@
return Boolean.valueOf(removeBatchByIds(orderIds));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<String> listWorkstationByTrayCode(String trayCode) {
return ((FmsOrderMapper) this.baseMapper).listWorkstationByTrayCode(trayCode);
}
--
Gitblit v1.9.3