From 4b479381a65bd3ef526cb92631d3550f2aa17459 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 17:34:53 +0800
Subject: [PATCH] fms工单模块编译错误清理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessToolController.java | 49 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessFixtureController.java | 40 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java | 52 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.java | 193 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java | 583 +++++----------------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java | 87 +--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java | 193 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsScheduleServiceImpl.java | 169 +-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java | 58 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java | 35 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.java | 68 --
11 files changed, 376 insertions(+), 1,151 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
index 06d612f..58a5db6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
@@ -1,18 +1,16 @@
package com.qianwen.smartman.modules.fms.controller;
-import cn.hutool.core.bean.BeanUtil;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
+
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.scanner.modular.annotation.DeleteResource;
@@ -22,6 +20,8 @@
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.secure.annotation.PreAuth;
import com.qianwen.core.tool.api.R;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.fms.convert.FmsOrderProcessConvert;
import com.qianwen.smartman.modules.fms.convert.FmsOrderProcessFixtureConvert;
import com.qianwen.smartman.modules.fms.convert.FmsOrderProcessToolConvert;
@@ -34,10 +34,13 @@
import com.qianwen.smartman.modules.fms.vo.FmsOrderProcessToolVO;
import com.qianwen.smartman.modules.fms.vo.FmsOrderProcessVO;
import com.qianwen.smartman.modules.fms.vo.FmsWorkStationProcessVO;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "宸ュ崟宸ュ簭淇℃伅绠＄悊", tags = {"fms_order_process"})
@@ -49,33 +52,6 @@
private final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService;
private final IFmsOrderProcessToolService fmsOrderProcessToolService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderProcessController(final IFmsOrderProcessService fmsOrderProcessService, final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService, final IFmsOrderProcessToolService fmsOrderProcessToolService) {
this.fmsOrderProcessService = fmsOrderProcessService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessFixtureController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessFixtureController.java
index 47967c8..e0ee97f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessFixtureController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessFixtureController.java
@@ -1,22 +1,24 @@
package com.qianwen.smartman.modules.fms.controller;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.scanner.modular.annotation.GetResource;
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.tool.api.R;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.fms.convert.FmsOrderProcessFixtureConvert;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessFixture;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessFixtureService;
import com.qianwen.smartman.modules.fms.vo.FmsOrderProcessFixtureVO;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "宸ュ崟宸ュ簭澶瑰叿淇℃伅绠＄悊", tags = {"fms_order_process_fixture"})
@ApiResource({"blade-fms/order/fixture"})
@@ -25,28 +27,6 @@
public class FmsOrderProcessFixtureController extends BladeController {
private final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderProcessFixtureController(final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService) {
this.fmsOrderProcessFixtureService = fmsOrderProcessFixtureService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessToolController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessToolController.java
index 84636d9..b780052 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessToolController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessToolController.java
@@ -1,22 +1,24 @@
package com.qianwen.smartman.modules.fms.controller;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.scanner.modular.annotation.GetResource;
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.tool.api.R;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.fms.convert.FmsOrderProcessToolConvert;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessTool;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessToolService;
import com.qianwen.smartman.modules.fms.vo.FmsOrderProcessToolVO;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "宸ュ崟宸ュ簭鍒�鍏蜂俊鎭鐞�", tags = {"fms_order_process_tool"})
@ApiResource({"blade-fms/order/tool"})
@@ -25,30 +27,8 @@
public class FmsOrderProcessToolController extends BladeController {
private final IFmsOrderProcessToolService fmsOrderProcessToolService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
-
- public FmsOrderProcessToolController(final IFmsOrderProcessToolService fmsOrderProcessToolService) {
+
+ public FmsOrderProcessToolController(IFmsOrderProcessToolService fmsOrderProcessToolService) {
this.fmsOrderProcessToolService = fmsOrderProcessToolService;
}
@@ -56,9 +36,8 @@
@GetResource({"/list"})
@ApiOperation(value = "宸ュ崟宸ュ簭鍒�鍏蜂俊鎭垪琛�", notes = "浼犲叆processId")
public R<List<FmsOrderProcessToolVO>> list(@RequestParam @ApiParam("宸ュ崟宸ュ簭ID") String processId) {
- List<FmsOrderProcessTool> list = this.fmsOrderProcessToolService.list(Lambda.eq((v0) -> {
- return v0.getOrderProcessId();
- }, processId));
+ List<FmsOrderProcessTool> list = this.fmsOrderProcessToolService.list(Lambda.eq(FmsOrderProcessTool::getOrderProcessId, processId));
+
return R.data(FmsOrderProcessToolConvert.INSTANCE.convert(list));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java
index badec95..400136a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsAbnormalServiceImpl.java
@@ -1,18 +1,19 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.google.common.base.Joiner;
-import java.lang.invoke.SerializedLambda;
import java.util.Arrays;
import java.util.List;
+
import org.apache.commons.compress.utils.Lists;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.websocket.fms.FmsVisualDataRequestMessage;
-import com.qianwen.smartman.common.websocket.fms.FmsVisualDataResponseMessage;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.base.Joiner;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.websocket.fms.FmsVisualDataRequestMessage;
+import com.qianwen.smartman.common.websocket.fms.FmsVisualDataResponseMessage;
import com.qianwen.smartman.modules.fms.convert.FmsAbnormalConvert;
import com.qianwen.smartman.modules.fms.convert.FmsInstructionRecordConvert;
import com.qianwen.smartman.modules.fms.entity.FmsAbnormal;
@@ -27,41 +28,12 @@
import com.qianwen.smartman.modules.fms.vo.FmsOrderQueryVO;
import com.qianwen.smartman.modules.fms.vo.FmsOrderVO;
import com.qianwen.smartman.modules.fms.vo.FmsVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsAbnormalServiceImpl.class */
public class FmsAbnormalServiceImpl extends BaseServiceImpl<FmsAbnormalMapper, FmsAbnormal> implements IFmsAbnormalService {
private final IFmsOrderService fmsOrderService;
private final IFmsInstructionRecordService fmsInstructionRecordService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsAbnormalServiceImpl(final IFmsOrderService fmsOrderService, final IFmsInstructionRecordService fmsInstructionRecordService) {
this.fmsOrderService = fmsOrderService;
@@ -81,13 +53,17 @@
if (Func.isNotEmpty(records)) {
fmsVO.setFmsOrderVOList(records);
}
+ List<FmsAbnormal> fmsAbnormalList = list(Lambda.<FmsAbnormal>create().orderByDesc(FmsAbnormal::getCreateTime).limit(10));
+ /*
List<FmsAbnormal> fmsAbnormalList = list(((ExtraLambdaQueryWrapper) Lambda.create().orderByDesc((v0) -> {
return v0.getCreateTime();
- })).limit(10));
+ })).limit(10));*/
fmsVO.setAbnormalList(FmsAbnormalConvert.INSTANCE.convert(fmsAbnormalList));
+ List<FmsInstructionRecord> instructionRecordList = this.fmsInstructionRecordService.list(Lambda.<FmsInstructionRecord>create().orderByDesc(FmsInstructionRecord::getCreateTime).limit(10));
+ /*
List<FmsInstructionRecord> instructionRecordList = this.fmsInstructionRecordService.list(((ExtraLambdaQueryWrapper) Lambda.create().orderByDesc((v0) -> {
return v0.getCreateTime();
- })).limit(10));
+ })).limit(10));*/
instructionRecordList.forEach(x -> {
FmsInstructionRecordVO fmsInstructionRecordVO = FmsInstructionRecordConvert.INSTANCE.convert(x);
fmsInstructionRecordVO.setStateName(InstructionEnum.of(x.getState()).getDesc());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
index 11d96e8..071303a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.java
@@ -1,10 +1,5 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
@@ -19,19 +14,24 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qianwen.core.mp.support.Condition;
+import com.qianwen.core.mp.support.Query;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.cps.WorkstationCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
import com.qianwen.smartman.common.constant.DateConstant;
import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
-import com.qianwen.core.mp.support.Condition;
-import com.qianwen.core.mp.support.Query;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.dto.TrayWarehouseAreaDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
@@ -43,9 +43,13 @@
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.cps.service.IWorkstationWorkbenchService;
import com.qianwen.smartman.modules.fms.dto.FmsOrderProcessDTO;
+import com.qianwen.smartman.modules.fms.entity.FmsInstructionRecord;
import com.qianwen.smartman.modules.fms.entity.FmsOrder;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcess;
+import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessFixture;
+import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessTool;
import com.qianwen.smartman.modules.fms.entity.FmsRealTimeTray;
+import com.qianwen.smartman.modules.fms.entity.FmsWorkStationRecord;
import com.qianwen.smartman.modules.fms.enums.OrderStatusEnum;
import com.qianwen.smartman.modules.fms.mapper.FmsOrderProcessMapper;
import com.qianwen.smartman.modules.fms.mapper.FmsRealTimeTrayMapper;
@@ -62,8 +66,6 @@
import com.qianwen.smartman.modules.fms.vo.FmsWarehouseAreaTrayVO;
import com.qianwen.smartman.modules.mdc.entity.SuperAlarm;
import com.qianwen.smartman.modules.mdc.mapper.SuperAlarmMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsDeviceAnalysisServiceImpl.class */
@@ -82,139 +84,6 @@
private final IFmsInstructionRecordService fmsInstructionRecordService;
private final IWorkstationWorkbenchService workbenchService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1757019252:
- if (implMethodName.equals("getCurrentPosition")) {
- z = true;
- break;
- }
- break;
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -401685595:
- if (implMethodName.equals("getOrderCode")) {
- z = true;
- break;
- }
- break;
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsWorkStationRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCurrentPosition();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsInstructionRecord") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getOrderCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsDeviceAnalysisServiceImpl(final TrayMapper trayMapper, final FmsOrderProcessMapper fmsOrderProcessMapper, final FmsRealTimeTrayMapper fmsRealTimeTrayMapper, final SuperAlarmMapper superAlarmMapper, final IFmsOrderService fmsOrderService, final IFmsOrderProcessService fmsOrderProcessService, final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService, final IFmsOrderProcessToolService fmsOrderProcessToolService, final IFmsWorkStationRecordService fmsWorkStationRecordService, final IWorkstationService workstationService, final IFmsInstructionRecordService fmsInstructionRecordService, final IWorkstationWorkbenchService workbenchService) {
this.trayMapper = trayMapper;
@@ -240,13 +109,17 @@
fmsWorkbenchInfoVO.setAvatar(avatar);
Integer deviceType = workstation.getDeviceType();
String code = workstation.getCode();
+ List<WorkstationWorkbench> list = this.workbenchService.list(Wrappers.<WorkstationWorkbench>lambdaQuery()
+ .eq(WorkstationWorkbench::getWorkstationId, workstationId)
+ .eq(WorkstationWorkbench::getStatus, CommonConstant.ENABLE).orderByAsc(WorkstationWorkbench::getSort));
+ /*
List<WorkstationWorkbench> list = this.workbenchService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
}, workstationId)).eq((v0) -> {
return v0.getStatus();
}, CommonConstant.ENABLE)).orderByAsc((v0) -> {
return v0.getSort();
- }));
+ }));*/
if (list == null || list.size() == 0) {
return fmsWorkbenchInfoVO;
}
@@ -257,7 +130,7 @@
program = getValue(name, String.valueOf(workstationId));
}
String finalProgram = program;
- List<FMSWorkbenchInfoItemVo> data = (List) list.stream().map(item -> {
+ List<FMSWorkbenchInfoItemVo> data = list.stream().map(item -> {
FMSWorkbenchInfoItemVo infoItemVo = new FMSWorkbenchInfoItemVo();
infoItemVo.setCurrentStation(String.valueOf(item.getSort()));
infoItemVo.setWorkbenchName(item.getName());
@@ -265,9 +138,11 @@
return infoItemVo;
}).collect(Collectors.toList());
fmsWorkbenchInfoVO.setWorkbenchInfoList(data);
+ List<FmsRealTimeTray> fmsRealTimeTrays = this.fmsRealTimeTrayMapper.selectList(Wrappers.<FmsRealTimeTray>lambdaQuery().eq(FmsRealTimeTray::getCurrentPosition, code));
+ /*
List<FmsRealTimeTray> fmsRealTimeTrays = this.fmsRealTimeTrayMapper.selectList((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCurrentPosition();
- }, code));
+ }, code));*/
if (fmsRealTimeTrays == null || fmsRealTimeTrays.size() == 0) {
return fmsWorkbenchInfoVO;
}
@@ -299,18 +174,22 @@
}
Map<Long, FmsOrder> orderMap = new HashMap<>();
if (orderIds.size() > 0) {
+ List<FmsOrder> fmsOrders = this.fmsOrderService.list(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getId, orderIds));
+ /*
List<FmsOrder> fmsOrders = this.fmsOrderService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, orderIds));
+ }, orderIds));*/
fmsOrders.forEach(item3 -> {
FmsOrder fmsOrder = (FmsOrder) orderMap.put(item3.getId(), item3);
});
}
Map<Long, FmsOrderProcess> orderProcessMap = new HashMap<>();
if (orderProcessIds.size() > 0) {
+ List<FmsOrderProcess> orderProcesses = this.fmsOrderProcessService.list(Wrappers.<FmsOrderProcess>lambdaQuery().in(FmsOrderProcess::getId, orderProcessIds));
+ /*
List<FmsOrderProcess> orderProcesses = this.fmsOrderProcessService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, orderProcessIds));
+ }, orderProcessIds));*/
orderProcesses.forEach(item4 -> {
FmsOrderProcess fmsOrderProcess = (FmsOrderProcess) orderProcessMap.put(item4.getId(), item4);
});
@@ -395,7 +274,7 @@
areaId = null;
}
IPage<FmsWarehouseAreaTrayVO> result = this.trayMapper.getWarehouseAreaTrayList(areaId, Condition.getPage(query));
- List<FmsWarehouseAreaTrayVO> list = (List) result.getRecords().parallelStream().peek(o -> {
+ List<FmsWarehouseAreaTrayVO> list = result.getRecords().parallelStream().peek(o -> {
if (Func.isNotEmpty(o.getAvailability())) {
o.setAvailability(TrayEnum.StatusEnum.of(Integer.valueOf(o.getAvailability())).getDesc());
}
@@ -409,7 +288,7 @@
public Boolean reduction(Long areaId, String areaCode) {
List<TrayWarehouseAreaDTO> result = this.trayMapper.getWarehouseAreaTray();
if (Func.isNotEmpty(result)) {
- Map<String, List<String>> areaMap = (Map) result.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<String>> areaMap = result.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getAreaCode();
}, Collectors.mapping((v0) -> {
return v0.getTrayCode();
@@ -428,6 +307,14 @@
filterOrderCodes.add(orderAndProcessId.getOrderCode());
processIds.add(orderAndProcessId.getId());
}
+
+ this.fmsOrderService.remove(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getId, filterOrderIds));
+ this.fmsOrderProcessService.remove(Wrappers.<FmsOrderProcess>lambdaQuery().in(FmsOrderProcess::getId, processIds));
+ this.fmsOrderProcessToolService.remove(Wrappers.<FmsOrderProcessTool>lambdaQuery().in(FmsOrderProcessTool::getOrderProcessId, processIds));
+ this.fmsOrderProcessFixtureService.remove(Wrappers.<FmsOrderProcessFixture>lambdaQuery().in(FmsOrderProcessFixture::getOrderProcessId, processIds));
+ this.fmsWorkStationRecordService.remove(Wrappers.<FmsWorkStationRecord>lambdaQuery().in(FmsWorkStationRecord::getOrderId, filterOrderIds));
+ this.fmsInstructionRecordService.remove(Wrappers.<FmsInstructionRecord>lambdaQuery().in(FmsInstructionRecord::getOrderCode, filterOrderCodes));
+ /*
this.fmsOrderService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, filterOrderIds));
@@ -445,7 +332,7 @@
}, filterOrderIds));
this.fmsInstructionRecordService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderCode();
- }, filterOrderCodes));
+ }, filterOrderCodes));*/
}
return true;
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java
index c694d68..bdbb587 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsInstructionRecordServiceImpl.java
@@ -1,47 +1,28 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.fms.entity.FmsInstructionRecord;
import com.qianwen.smartman.modules.fms.mapper.FmsInstructionRecordMapper;
import com.qianwen.smartman.modules.fms.service.IFmsInstructionRecordService;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsInstructionRecordServiceImpl.class */
public class FmsInstructionRecordServiceImpl extends BaseServiceImpl<FmsInstructionRecordMapper, FmsInstructionRecord> implements IFmsInstructionRecordService {
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 1071464927:
- if (implMethodName.equals("getCreateTime")) {
- z = false;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getCreateTime();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
@Override // org.springblade.modules.fms.service.IFmsInstructionRecordService
public FmsInstructionRecord getLastRecord() {
+ List<FmsInstructionRecord> list = list(Wrappers.<FmsInstructionRecord>lambdaQuery().orderByDesc(FmsInstructionRecord::getCreateTime));
+ /*
List<FmsInstructionRecord> list = list((Wrapper) Wrappers.lambdaQuery().orderByDesc((v0) -> {
return v0.getCreateTime();
- }));
+ }));*/
if (Func.isNotEmpty(list)) {
return list.get(0);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.java
index 9a6e2b9..52c3e21 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.java
@@ -1,72 +1,26 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.utils.Lambda;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcess;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessFixture;
import com.qianwen.smartman.modules.fms.mapper.FmsOrderProcessFixtureMapper;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessFixtureService;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessService;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderProcessFixtureServiceImpl.class */
public class FmsOrderProcessFixtureServiceImpl extends BaseServiceImpl<FmsOrderProcessFixtureMapper, FmsOrderProcessFixture> implements IFmsOrderProcessFixtureService {
private final IFmsOrderProcessService fmsOrderProcessService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = false;
- break;
- }
- break;
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderProcessFixtureServiceImpl(final IFmsOrderProcessService fmsOrderProcessService) {
this.fmsOrderProcessService = fmsOrderProcessService;
@@ -77,7 +31,7 @@
List<FmsOrderProcess> list = this.fmsOrderProcessService.list(Lambda.eq((v0) -> {
return v0.getOrderId();
}, orderId));
- List<Long> processIds = (List) list.stream().map((v0) -> {
+ List<Long> processIds = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
if (processIds != null && !processIds.isEmpty()) {
@@ -90,11 +44,13 @@
@Override // org.springblade.modules.fms.service.IFmsOrderProcessFixtureService
public Map<Long, List<FmsOrderProcessFixture>> getFmsOrderProcessFixtureList(List<Long> orderIds) {
+ List<FmsOrderProcessFixture> list = list(Wrappers.<FmsOrderProcessFixture>lambdaQuery().in(FmsOrderProcessFixture::getOrderId, orderIds));
+ /*
List<FmsOrderProcessFixture> list = list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderId();
- }, orderIds));
+ }, orderIds));*/
if (Func.isNotEmpty(list)) {
- return (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
+ return list.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getOrderId();
}));
}
@@ -103,8 +59,10 @@
@Override // org.springblade.modules.fms.service.IFmsOrderProcessFixtureService
public List<FmsOrderProcessFixture> getFmsOrderProcessFixtures(List<Long> orderIds) {
+ return list(Wrappers.<FmsOrderProcessFixture>lambdaQuery().in(FmsOrderProcessFixture::getOrderId, orderIds));
+ /*
return list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderId();
- }, orderIds));
+ }, orderIds));*/
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
index 2457a9c..8cfe6be 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderProcessServiceImpl.java
@@ -1,25 +1,27 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.lang.invoke.SerializedLambda;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+
import org.apache.commons.io.IOUtils;
-import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.redis.cache.BladeRedis;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.ExtCacheConstant;
+import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.enums.WorkTypeEnum;
import com.qianwen.smartman.modules.cps.service.ICommonGroupService;
import com.qianwen.smartman.modules.cps.service.IProductionCraftVersionService;
@@ -40,7 +42,6 @@
import com.qianwen.smartman.modules.fms.vo.FmsWorkStationProcessVO;
import com.qianwen.smartman.modules.fms.vo.FmsWorkStationVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderProcessServiceImpl.class */
@@ -54,46 +55,6 @@
private final BladeRedis bladeRedis;
private final FmsForestClient fmsForestClient;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = false;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderProcessServiceImpl(final FmsOrderMapper fmsOrderMapper, final IProductionCraftVersionService productionCraftVersionService, final IWorkstationService workstationService, final ICommonGroupService commonGroupService, final OssBuilder ossBuilder, final IDncArtFileService artFileService, final BladeRedis bladeRedis, final FmsForestClient fmsForestClient) {
this.fmsOrderMapper = fmsOrderMapper;
@@ -108,27 +69,35 @@
@Override // org.springblade.modules.fms.service.IFmsOrderProcessService
public List<FmsWorkStationProcessVO> listWorkstation(String orderId) {
+ List<FmsOrderProcess> fmsOrderProcesses = this.baseMapper.selectList(Wrappers.<FmsOrderProcess>query().lambda().eq(FmsOrderProcess::getOrderId, orderId));
+ /*
List<FmsOrderProcess> fmsOrderProcesses = ((FmsOrderProcessMapper) this.baseMapper).selectList((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getOrderId();
- }, orderId));
+ }, orderId));*/
+ FmsOrder fmsOrder = this.fmsOrderMapper.selectOne(Wrappers.<FmsOrder>query().lambda().eq(FmsOrder::getId, orderId));
+ /*
FmsOrder fmsOrder = (FmsOrder) this.fmsOrderMapper.selectOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getId();
- }, orderId));
+ }, orderId));*/
CraftVersionLineVO craftVersionLineVO = this.productionCraftVersionService.detailVersion(fmsOrder.getCraftVersionId());
String groupIds = craftVersionLineVO.getGroupId();
String[] groupSplit = groupIds.split(",");
+ List<Long> commonGroupIds = this.commonGroupService.list(Wrappers.<CommonGroup>query().lambda().in(CommonGroup::getId, (Object[])groupSplit)).stream().filter(commonGroup -> commonGroup.getGroupTag().equals(FmsOrderEnum.FMS_BELTLINE.getCode())).map(CommonGroup::getId).collect(Collectors.toList());
+
+ /*
List<Long> commonGroupIds = (List) this.commonGroupService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
return v0.getId();
}, groupSplit)).stream().filter(commonGroup -> {
return commonGroup.getGroupTag().equals(FmsOrderEnum.FMS_BELTLINE.getCode());
}).map((v0) -> {
return v0.getId();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
+
List<Long> listGroupIds = new ArrayList<>();
for (Long groupId : commonGroupIds) {
listGroupIds.addAll(this.workstationService.productionLineList(groupId));
}
- List<String> listGroupIdsOfString = (List) listGroupIds.stream().map((v0) -> {
+ List<String> listGroupIdsOfString = listGroupIds.stream().map((v0) -> {
return String.valueOf(v0);
}).collect(Collectors.toList());
List<WorkstationVO> workstationVOList = this.workstationService.getWorkstationByGroupIds(listGroupIdsOfString);
@@ -137,7 +106,7 @@
List<FmsWorkStationVO> fmsWorkStationVOS = new ArrayList<>();
FmsWorkStationProcessVO fmsWorkStationProcessVO = new FmsWorkStationProcessVO();
if (Func.isNotEmpty(fmsOrderProcess.getProcessType())) {
- List<WorkstationVO> workstationVOS = (List) workstationVOList.stream().filter(workstationVO -> {
+ List<WorkstationVO> workstationVOS = workstationVOList.stream().filter(workstationVO -> {
if (Objects.equals(fmsOrderProcess.getProcessType(), WorkTypeEnum.MEASURE.getCode())) {
return Objects.equals(workstationVO.getDeviceType(), fmsOrderProcess.getProcessType()) || Objects.equals(workstationVO.getDeviceType(), WorkTypeEnum.LOAD_AND_UNLOAD.getCode());
}
@@ -220,6 +189,18 @@
}
public static byte[] inputStreamToByteArray(InputStream inputStream) {
+ try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+ byte[] buffer = new byte[1024];
+ int num;
+ while ((num = inputStream.read(buffer)) != -1)
+ byteArrayOutputStream.write(buffer, 0, num);
+ byteArrayOutputStream.flush();
+ return byteArrayOutputStream.toByteArray();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return new byte[0];
+ }
+ /*
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
@@ -243,6 +224,6 @@
} catch (IOException e) {
e.printStackTrace();
return new byte[0];
- }
+ }*/
}
}
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 f87721a..6bb9809 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
@@ -1,20 +1,9 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -23,24 +12,32 @@
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.constant.FmsConstant;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.ListUtils;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.common.constant.FmsConstant;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.ListUtils;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.CraftRoutingConvert;
import com.qianwen.smartman.modules.cps.dto.CraftVersionDTO;
+import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.entity.CraftVersionLine;
import com.qianwen.smartman.modules.cps.entity.ProductionCraftProcess;
import com.qianwen.smartman.modules.cps.entity.ProductionCraftProcessRelatedTool;
@@ -85,8 +82,8 @@
import com.qianwen.smartman.modules.system.service.IDictService;
import com.qianwen.smartman.modules.system.service.IParamService;
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import cn.hutool.core.bean.BeanUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderServiceImpl.class */
@@ -108,342 +105,6 @@
private final String[] emptyRange = {"", ""};
private final IFmsInstructionRecordService fmsInstructionRecordService;
private final IParamService paramService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1416707747:
- if (implMethodName.equals("getVersionId")) {
- z = true;
- break;
- }
- break;
- case -1335731856:
- if (implMethodName.equals("getPlanStartTime")) {
- z = true;
- break;
- }
- break;
- case -1291082392:
- if (implMethodName.equals("getVersionProcessId")) {
- z = true;
- break;
- }
- break;
- case -1282243624:
- if (implMethodName.equals("getWorkStationName")) {
- z = true;
- break;
- }
- break;
- case -927447111:
- if (implMethodName.equals("getTrayCode")) {
- z = false;
- break;
- }
- break;
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = true;
- break;
- }
- break;
- case -570382830:
- if (implMethodName.equals("getEndTime")) {
- z = true;
- break;
- }
- break;
- case -520385111:
- if (implMethodName.equals("getPlanEndTime")) {
- z = true;
- break;
- }
- break;
- case -401169166:
- if (implMethodName.equals("getOrderType")) {
- z = true;
- break;
- }
- break;
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75145708:
- if (implMethodName.equals("getSort")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 989812650:
- if (implMethodName.equals("getOrderStatus")) {
- z = true;
- break;
- }
- break;
- case 1446708648:
- if (implMethodName.equals("getWorkStationId")) {
- z = true;
- break;
- }
- break;
- case 1841214932:
- if (implMethodName.equals("getStartUpTime")) {
- z = true;
- break;
- }
- break;
- case 1953270362:
- if (implMethodName.equals("getFixId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTrayCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTrayCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCraftProcessRelatedTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionProcessId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CommonGroup") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkStationName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartUpTime();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getStartUpTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getSort();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPlanStartTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPlanEndTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getEndTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/CraftVersionLine") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getVersionId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getWorkStationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getOrderStatus();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsOrderServiceImpl(final IDictService dictService, final ICraftRoutingService craftRoutingService, final IFmsOrderProcessService fmsOrderProcessService, final IProductionCraftProcessService productionCraftProcessService, final IProductionCraftProcessRelatedFixtureService productionCraftProcessRelatedFixtureService, final IProductionCraftProcessRelatedToolService productionCraftProcessRelatedToolService, final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService, final IFmsOrderProcessToolService fmsOrderProcessToolService, final ICodeGeneratorService codeGeneratorService, final ITrayFixtureService trayFixtureService, final ITrayService trayService, final ICraftVersionLineService craftVersionLineService, final ICommonGroupService commonGroupService, final IFmsInstructionRecordService fmsInstructionRecordService, final IParamService paramService) {
this.dictService = dictService;
@@ -483,6 +144,13 @@
endTimeDateBegin = DateUtil.parse(endTimeRange[0], DateConstant.PATTERN_DATE_TIME);
endTimeDateFinish = DateUtil.parse(endTimeRange[1], DateConstant.PATTERN_DATE_TIME);
}
+ LambdaQueryWrapper<FmsOrder> fmsOrderLambdaQueryWrapper =Wrappers.<FmsOrder>lambdaQuery()
+ .eq(Func.isNotEmpty(fmsOrderQueryVO.getOrderType()), FmsOrder::getOrderType, fmsOrderQueryVO.getOrderType())
+ .between(Func.isNotEmpty(fmsOrderQueryVO.getPlanStartTime()), FmsOrder::getPlanStartTime, startTimeDateBegin, startTimeDateFinish)
+ .between(Func.isNotEmpty(fmsOrderQueryVO.getPlanEndTime()), FmsOrder::getPlanEndTime, endTimeDateBegin, endTimeDateFinish)
+ .likeRight(Func.isNotEmpty(fmsOrderQueryVO.getCode()), FmsOrder::getCode, fmsOrderQueryVO.getCode())
+ .in(Func.isNotEmpty(fmsOrderQueryVO.getOrderStatus()), FmsOrder::getOrderStatus, Lists.newArrayList((Object[])Func.split(fmsOrderQueryVO.getOrderStatus(), ",")));
+ /*
LambdaQueryWrapper<FmsOrder> fmsOrderLambdaQueryWrapper = Wrappers.lambdaQuery().eq(Func.isNotEmpty(fmsOrderQueryVO.getOrderType()), (v0) -> {
return v0.getOrderType();
}, fmsOrderQueryVO.getOrderType()).between(Func.isNotEmpty(fmsOrderQueryVO.getPlanStartTime()), (v0) -> {
@@ -493,22 +161,22 @@
return v0.getCode();
}, fmsOrderQueryVO.getCode()).in(Func.isNotEmpty(fmsOrderQueryVO.getOrderStatus()), (v0) -> {
return v0.getOrderStatus();
- }, Lists.newArrayList(Func.split(fmsOrderQueryVO.getOrderStatus(), ",")));
+ }, Lists.newArrayList(Func.split(fmsOrderQueryVO.getOrderStatus(), ",")));*/
IPage<FmsOrder> fmsOrderIPage = page(Condition.getPage(query), fmsOrderLambdaQueryWrapper);
List<FmsOrderVO> fmsOrderVOList = wrapper(fmsOrderIPage.getRecords());
- Page page = new Page(fmsOrderIPage.getCurrent(), fmsOrderIPage.getSize(), fmsOrderIPage.getTotal());
+ Page<FmsOrderVO> page = new Page<>(fmsOrderIPage.getCurrent(), fmsOrderIPage.getSize(), fmsOrderIPage.getTotal());
page.setRecords(fmsOrderVOList);
return page;
}
public List<FmsOrderVO> wrapper(List<FmsOrder> orders) {
List<FmsOrderVO> fmsOrderVOList = FmsOrderConvert.INSTANCE.convert(orders);
- Map<String, Dict> fmsOrderTypeMap = (Map) this.dictService.getList(FmsOrderEnum.FMS_ORDER_TYPE.getCode()).stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Dict> fmsOrderTypeMap = this.dictService.getList(FmsOrderEnum.FMS_ORDER_TYPE.getCode()).stream().collect(Collectors.toMap((v0) -> {
return v0.getDictKey();
}, v -> {
return v;
}));
- Map<String, Dict> fmsOrderStatusMap = (Map) this.dictService.getList(FmsOrderEnum.FMS_ORDER_STATUS.getCode()).stream().collect(Collectors.toMap((v0) -> {
+ Map<String, Dict> fmsOrderStatusMap = this.dictService.getList(FmsOrderEnum.FMS_ORDER_STATUS.getCode()).stream().collect(Collectors.toMap((v0) -> {
return v0.getDictKey();
}, v2 -> {
return v2;
@@ -554,13 +222,18 @@
public List<CraftRoutingDetailVO> filterCraft(CraftRoutingDetailVO craftRoutingDetailVO) {
List<CraftRoutingDetailVO> craftRoutingDetailVOS = new ArrayList<>();
List<CraftVersionDTO> versionList = craftRoutingDetailVO.getDtos();
- List<CraftVersionDTO> versionDTOS = (List) versionList.stream().filter(versionDTO -> {
+ 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) -> {
return v0.getId();
@@ -568,9 +241,12 @@
return Objects.equals(commonGroup.getGroupTag(), FmsOrderEnum.FMS_BELTLINE.getCode());
});
}
- return false;
+ return false;*/
+ return Func.isNotEmpty(groupIds) ? this.commonGroupService.list(Wrappers.<CommonGroup>query().lambda().in(CommonGroup::getId, groupIds)).stream().anyMatch(commonGroup -> {
+ return Objects.equals(commonGroup.getGroupTag(), FmsOrderEnum.FMS_BELTLINE.getCode());
+ }) : false;
}).collect(Collectors.toList());
- craftRoutingDetailVO.setDtos((List) versionDTOS.stream().filter(versionDTO2 -> {
+ craftRoutingDetailVO.setDtos(versionDTOS.stream().filter(versionDTO2 -> {
return versionDTO2.getEditionStatus().equals(ProductionCraftStatusEnum.FINALIZED.getStatus());
}).collect(Collectors.toList()));
craftRoutingDetailVOS.add(craftRoutingDetailVO);
@@ -599,9 +275,11 @@
return v0.getId();
}, fmsOrder.getId()));
((FmsOrderMapper) this.baseMapper).updateById(fmsOrder);
+ List<FmsOrderProcess> fmsOrderProcessList = this.fmsOrderProcessService.list(Wrappers.<FmsOrderProcess>query().lambda().eq(FmsOrderProcess::getOrderId, fmsOrderVO.getId()));
+ /*
List<FmsOrderProcess> fmsOrderProcessList = this.fmsOrderProcessService.list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
return v0.getOrderId();
- }, fmsOrderVO.getId()));
+ }, fmsOrderVO.getId()));*/
FmsOrderVO orderVO2 = wrapper(fmsOrder);
FmsOrderDetailVO fmsOrderDetailVO2 = FmsOrderConvert.INSTANCE.convertToDetail(fmsOrder);
fmsOrderDetailVO2.setOrderStatusLabel(orderVO2.getOrderStatusLabel());
@@ -615,12 +293,12 @@
}, fmsOrderVO.getId()));
this.fmsOrderProcessFixtureService.remove(Lambda.in((v0) -> {
return v0.getOrderProcessId();
- }, (Collection) fmsOrderProcessList.stream().map((v0) -> {
+ }, fmsOrderProcessList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList())));
this.fmsOrderProcessToolService.remove(Lambda.in((v0) -> {
return v0.getOrderProcessId();
- }, (Collection) fmsOrderProcessList.stream().map((v0) -> {
+ }, fmsOrderProcessList.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList())));
return saveProcess(fmsOrder, fmsOrderDetailVO2, fmsOrderVO);
@@ -639,20 +317,14 @@
fmsOrderProcessFixtureList.forEach(fmsOrderProcessFixture -> {
fmsOrderProcessFixture.setOrderId(fmsOrder.getId());
fmsOrderProcessFixture.setOrderProcessId(fmsOrderProcess.getId());
- TrayFixture trayFixture = (TrayFixture) this.trayFixtureService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
- return v0.getFixId();
- }, fmsOrderProcessFixture.getFixtureId()));
- Tray tray = (Tray) this.trayService.getOne((Wrapper) Wrappers.query().lambda().eq((v0) -> {
- return v0.getId();
- }, trayFixture.getTrayId()));
+ TrayFixture trayFixture = this.trayFixtureService.getOne(Wrappers.<TrayFixture>query().lambda().eq(TrayFixture::getFixId, fmsOrderProcessFixture.getFixtureId()));
+ Tray tray = this.trayService.getOne( Wrappers.<Tray>query().lambda().eq(Tray::getId, trayFixture.getTrayId()));
fmsOrderProcessFixture.setTrayId(tray.getId());
fmsOrderProcessFixture.setTrayCode(tray.getCode());
});
this.fmsOrderProcessFixtureService.saveBatch(fmsOrderProcessFixtureList);
List<FmsOrderProcessTool> fmsOrderProcessToolList = Lists.newArrayList();
- List<ProductionCraftProcessRelatedTool> productionCraftProcessRelatedToolList = this.productionCraftProcessRelatedToolService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getVersionProcessId();
- }, productionCraftProcess.getId()));
+ List<ProductionCraftProcessRelatedTool> productionCraftProcessRelatedToolList = this.productionCraftProcessRelatedToolService.list(Wrappers.<ProductionCraftProcessRelatedTool>lambdaQuery().eq(ProductionCraftProcessRelatedTool::getVersionProcessId, productionCraftProcess.getId()));
productionCraftProcessRelatedToolList.forEach(x -> {
FmsOrderProcessTool fmsOrderProcessTool = FmsOrderProcessToolConvert.INSTANCE.toolToConvert(x);
fmsOrderProcessTool.setOrderProcessId(fmsOrderProcess.getId());
@@ -669,30 +341,44 @@
public void saveWorkstation(FmsOrderDetailVO fmsOrderDetailVO) {
List<FmsOrderProcess> processList = fmsOrderDetailVO.getProcessList();
processList.forEach(fmsOrderProcess -> {
+ this.fmsOrderProcessService.update(Wrappers.<FmsOrderProcess>update().lambda()
+ .eq(FmsOrderProcess::getId, fmsOrderProcess.getId())
+ .set(FmsOrderProcess::getWorkStationId, fmsOrderProcess.getWorkStationId())
+ .set(FmsOrderProcess::getWorkStationName, fmsOrderProcess.getWorkStationName()));
+ /*
this.fmsOrderProcessService.update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().eq((v0) -> {
return v0.getId();
}, fmsOrderProcess.getId())).set((v0) -> {
return v0.getWorkStationId();
}, fmsOrderProcess.getWorkStationId())).set((v0) -> {
return v0.getWorkStationName();
- }, fmsOrderProcess.getWorkStationName()));
+ }, fmsOrderProcess.getWorkStationName()));*/
});
}
@Override // org.springblade.modules.fms.service.IFmsOrderService
public FmsOrderStatusStatVO orderStatistics() {
+ List<Map<String, Object>> statusList = listMaps(new QueryWrapper<FmsOrder>()
+ .select(new String[] { Lambda.getName(FmsOrder::getOrderStatus), "count(1) as \"count\"" }).lambda()
+ .groupBy(FmsOrder::getOrderStatus));
+ /*
List<Map<String, Object>> statusList = listMaps((Wrapper) new QueryWrapper().select(new String[]{Lambda.getName((v0) -> {
return v0.getOrderStatus();
}), "count(1) as \"count\""}).lambda().groupBy((v0) -> {
return v0.getOrderStatus();
- }));
+ }));*/
+
+ long count = count(Lambda.eq(FmsOrder::getOrderStatus, Integer.valueOf(OrderStatusEnum.FINISHED.getValue())).isNotNull(FmsOrder::getOrderStatus)
+ .between(FmsOrder::getEndTime, LocalDate.now(), LocalDateTime.now()));
+
+ /*
long count = count((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
return v0.getOrderStatus();
}, Integer.valueOf(OrderStatusEnum.FINISHED.getValue())).isNotNull((v0) -> {
return v0.getOrderStatus();
})).between((v0) -> {
return v0.getEndTime();
- }, LocalDate.now(), LocalDateTime.now()));
+ }, LocalDate.now(), LocalDateTime.now()));*/
FmsOrderStatusStatVO fmsOrderStatusStat = new FmsOrderStatusStatVO();
fmsOrderStatusStat.setWaitPublish(getOrderStatData(statusList, OrderStatusEnum.WAIT_PUBLISH));
fmsOrderStatusStat.setWaitMachine(getOrderStatData(statusList, OrderStatusEnum.WAIT_MACHINE));
@@ -714,7 +400,7 @@
@Override // org.springblade.modules.fms.service.IFmsOrderService
public List<FmsOrderProductionStatVO> productionStatistics(final String orderId) {
List<Map<String, Object>> data = ((FmsOrderMapper) this.baseMapper).productionStatistics(orderId);
- return (List) data.stream().map(item -> {
+ return data.stream().map(item -> {
return (FmsOrderProductionStatVO) BeanUtil.mapToBean(item, FmsOrderProductionStatVO.class, true);
}).collect(Collectors.toList());
}
@@ -761,7 +447,7 @@
throw new ServiceException(MessageUtils.message("fms.order.has.finish", new Object[0]));
}
List<FmsOrderProcessFixture> fixtures = this.fmsOrderProcessFixtureService.getListByOrderId(fmsOrder.getId());
- List<String> trayCodeList = (List) fixtures.stream().map((v0) -> {
+ List<String> trayCodeList = fixtures.stream().map((v0) -> {
return v0.getTrayCode();
}).collect(Collectors.toList());
List<FmsOrder> usingOrderList = getUsingOrderByTray(trayCodeList);
@@ -795,19 +481,23 @@
@Transactional(rollbackFor = {Exception.class})
public List<FmsOrderVO> startOrders(List<String> orderIds) {
List<FmsOrderVO> result = Lists.newArrayList();
+ List<FmsOrder> toBeStartList = list(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getId, orderIds));
+ /*
List<FmsOrder> toBeStartList = list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
- }, orderIds));
+ }, orderIds));*/
List<Integer> statusEnumList = Arrays.asList(Integer.valueOf(OrderStatusEnum.WAIT_MACHINE.getValue()), Integer.valueOf(OrderStatusEnum.PAUSE.getValue()), Integer.valueOf(OrderStatusEnum.PAUSE_ING.getValue()));
if (Func.isEmpty(toBeStartList)) {
return FmsOrderConvert.INSTANCE.convert(toBeStartList);
}
log.info("鍒濆宸ュ崟锛歿}", orderIds);
+ toBeStartList = toBeStartList.stream().filter(s -> statusEnumList.contains(s.getOrderStatus())).collect(Collectors.toList());
+ /*
List<FmsOrder> toBeStartList2 = (List) toBeStartList.stream().filter(s -> {
return statusEnumList.contains(s.getOrderStatus());
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
FmsOrder highestToBeOrder = null;
- List<FmsOrder> highList = (List) toBeStartList2.stream().filter(c -> {
+ List<FmsOrder> highList = toBeStartList.stream().filter(c -> {
return FmsConstant.MAX_PRIORITY.equals(c.getPriority());
}).collect(Collectors.toList());
if (Func.isNotEmpty(highList)) {
@@ -817,23 +507,31 @@
highestToBeOrder = highList.get(0);
}
List<Integer> machStatus = Arrays.asList(Integer.valueOf(OrderStatusEnum.MACH_ING.getValue()), Integer.valueOf(OrderStatusEnum.PAUSE_ING.getValue()));
- List<String> toBeStartedOrderIds = (List) toBeStartList2.stream().map(s2 -> {
+ List<String> toBeStartedOrderIds = toBeStartList.stream().map(s2 -> {
return String.valueOf(s2.getId());
}).collect(Collectors.toList());
+
Map<Long, List<FmsOrderProcessFixture>> toBeStartedFixtureList = this.fmsOrderProcessFixtureService.getFmsOrderProcessFixtureList(Func.toLongList(toBeStartedOrderIds));
+ List<FmsOrder> machOrders = list(Wrappers.<FmsOrder>lambdaQuery().in(FmsOrder::getOrderStatus, machStatus));
+ /*
List<FmsOrder> machOrders = list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderStatus();
- }, machStatus));
- dealToBeStart(orderIds, toBeStartList2, toBeStartedFixtureList);
+ }, machStatus));*/
+ dealToBeStart(orderIds, toBeStartList, toBeStartedFixtureList);
if (Func.isEmpty(machOrders)) {
+ update(Wrappers.<FmsOrder>lambdaUpdate().in(Func.isNotEmpty(orderIds), FmsOrder::getId, Func.toLongList(orderIds))
+ .set(FmsOrder::getOrderStatus, Integer.valueOf(OrderStatusEnum.MACH_ING.getValue()))
+ .set(FmsOrder::getStartUpTime, LocalDateTime.now()));
+
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().in(Func.isNotEmpty(orderIds), (v0) -> {
return v0.getId();
}, Func.toLongList(orderIds)).set((v0) -> {
return v0.getOrderStatus();
}, Integer.valueOf(OrderStatusEnum.MACH_ING.getValue()))).set((v0) -> {
return v0.getStartUpTime();
- }, LocalDateTime.now()));
- toBeStartList2.forEach(x -> {
+ }, LocalDateTime.now()));*/
+ toBeStartList.forEach(x -> {
FmsOrderVO fmsOrderVO = FmsOrderConvert.INSTANCE.convert(x);
fmsOrderVO.setOrderStatus(OrderStatusEnum.MACH_ING.getValue() + "");
result.add(fmsOrderVO);
@@ -842,7 +540,7 @@
}
log.info("杩囨护宸ュ崟锛歿}", orderIds);
FmsOrder highestExecutionOrder = null;
- List<FmsOrder> highestExecutionOrderList = (List) machOrders.stream().filter(c2 -> {
+ List<FmsOrder> highestExecutionOrderList = machOrders.stream().filter(c2 -> {
return FmsConstant.MAX_PRIORITY.equals(c2.getPriority());
}).collect(Collectors.toList());
if (Func.isNotEmpty(highestExecutionOrderList)) {
@@ -852,11 +550,11 @@
if (highestExecutionOrder != null && !highestToBeOrder.getId().equals(highestExecutionOrder.getId())) {
throw new ServiceException(MessageUtils.message("cps.fms.start.order.fail.has.zero.priority.to.do", new Object[0]));
}
- dealInHasExecution(toBeStartedOrderIds, highestToBeOrder, toBeStartList2, machOrders, toBeStartedFixtureList);
+ dealInHasExecution(toBeStartedOrderIds, highestToBeOrder, toBeStartList, machOrders, toBeStartedFixtureList);
} else {
- dealOrder(orderIds, machOrders, toBeStartList2);
+ dealOrder(orderIds, machOrders, toBeStartList);
}
- toBeStartList2.forEach(x2 -> {
+ toBeStartList.forEach(x2 -> {
FmsOrderVO fmsOrderVO = FmsOrderConvert.INSTANCE.convert(x2);
fmsOrderVO.setOrderStatus(OrderStatusEnum.MACH_ING.getValue() + "");
result.add(fmsOrderVO);
@@ -868,7 +566,7 @@
List<String> removeIds = new ArrayList<>();
List<FmsOrderProcessFixture> processFixtureList = toBeStartedFixtureMap.get(highestOrder.getId());
if (Func.isNotEmpty(processFixtureList)) {
- List<String> trayCodes = (List) processFixtureList.stream().map((v0) -> {
+ List<String> trayCodes = processFixtureList.stream().map((v0) -> {
return v0.getTrayCode();
}).distinct().collect(Collectors.toList());
List<FmsOrder> usingOrderList = getUsingOrderByTray(trayCodes);
@@ -882,7 +580,7 @@
}
}
if (Func.isNotEmpty(removeIds)) {
- orderIds = (List) orderIds.stream().filter(s2 -> {
+ orderIds = orderIds.stream().filter(s2 -> {
return !removeIds.contains(s2);
}).collect(Collectors.toList());
}
@@ -892,60 +590,67 @@
public void dealOrder(List<String> orderIds, List<FmsOrder> machOrders, List<FmsOrder> tobeStartList) {
List<String> removeOrderIds = new ArrayList<>();
if (Func.isNotEmpty(orderIds)) {
- List<Long> machOrderIds = (List) machOrders.stream().map((v0) -> {
+ List<Long> machOrderIds = machOrders.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
List<FmsOrderProcessFixture> fmsOrderProcessFixtures = this.fmsOrderProcessFixtureService.getFmsOrderProcessFixtures(Func.toLongList(orderIds));
- List<String> toBeStartTrays = (List) fmsOrderProcessFixtures.stream().map((v0) -> {
+ List<String> toBeStartTrays = fmsOrderProcessFixtures.stream().map((v0) -> {
return v0.getTrayCode();
}).distinct().collect(Collectors.toList());
+
List<FmsOrderProcessFixture> fmsOrderProcessFixtures1 = this.fmsOrderProcessFixtureService.getFmsOrderProcessFixtures(machOrderIds);
- List<String> inExecutionTrays = (List) fmsOrderProcessFixtures1.stream().map((v0) -> {
+ List<String> inExecutionTrays = fmsOrderProcessFixtures1.stream().map((v0) -> {
return v0.getTrayCode();
}).distinct().collect(Collectors.toList());
+
+ List<String> sameTrayCodes = toBeStartTrays.stream().filter(inExecutionTrays::contains).collect(Collectors.toList());
+ /*
Stream<String> stream = toBeStartTrays.stream();
inExecutionTrays.getClass();
- List<String> sameTrayCodes = (List) stream.filter((v1) -> {
+ List<String> sameTrayCodes = stream.filter((v1) -> {
return r1.contains(v1);
}).collect(Collectors.toList());
+ */
+
+
if (Func.isNotEmpty(sameTrayCodes)) {
- List<FmsOrderProcessFixture> toBeSameTrays = (List) fmsOrderProcessFixtures.stream().filter(c -> {
+ List<FmsOrderProcessFixture> toBeSameTrays = fmsOrderProcessFixtures.stream().filter(c -> {
return sameTrayCodes.contains(c.getTrayCode());
}).collect(Collectors.toList());
- List<FmsOrderProcessFixture> inExecutionSameTrays = (List) fmsOrderProcessFixtures1.stream().filter(c2 -> {
+ List<FmsOrderProcessFixture> inExecutionSameTrays = fmsOrderProcessFixtures1.stream().filter(c2 -> {
return sameTrayCodes.contains(c2.getTrayCode());
}).collect(Collectors.toList());
- Map<String, List<FmsOrderProcessFixture>> toBeSameTraysMap = (Map) toBeSameTrays.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<FmsOrderProcessFixture>> toBeSameTraysMap = toBeSameTrays.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getTrayCode();
}));
- Map<String, List<FmsOrderProcessFixture>> inExecutionSameTraysMap = (Map) inExecutionSameTrays.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<FmsOrderProcessFixture>> inExecutionSameTraysMap = inExecutionSameTrays.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getTrayCode();
}));
- List<Long> toBeSameTrayOrderIds = (List) toBeSameTrays.stream().map((v0) -> {
+ List<Long> toBeSameTrayOrderIds = toBeSameTrays.stream().map((v0) -> {
return v0.getOrderId();
}).distinct().collect(Collectors.toList());
- List<Long> inExecutionSameTrayOrderIds = (List) inExecutionSameTrays.stream().map((v0) -> {
+ List<Long> inExecutionSameTrayOrderIds = inExecutionSameTrays.stream().map((v0) -> {
return v0.getOrderId();
}).distinct().collect(Collectors.toList());
- List<FmsOrder> tobeStartSameTrayList = (List) tobeStartList.stream().filter(s -> {
+ List<FmsOrder> tobeStartSameTrayList = tobeStartList.stream().filter(s -> {
return toBeSameTrayOrderIds.contains(s.getId());
}).collect(Collectors.toList());
- Map<Long, FmsOrder> toMap = (Map) tobeStartSameTrayList.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, FmsOrder> toMap = tobeStartSameTrayList.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, Function.identity()));
- List<FmsOrder> inExecutionSameTrayOrderList = (List) machOrders.stream().filter(s2 -> {
+ List<FmsOrder> inExecutionSameTrayOrderList = machOrders.stream().filter(s2 -> {
return inExecutionSameTrayOrderIds.contains(s2.getId());
}).collect(Collectors.toList());
- Map<Long, FmsOrder> inMap = (Map) inExecutionSameTrayOrderList.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, FmsOrder> inMap = inExecutionSameTrayOrderList.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, Function.identity()));
sameTrayCodes.forEach(trayCode -> {
- List<FmsOrderProcessFixture> toStartOrderList = (List) toBeSameTraysMap.get(trayCode);
- List<FmsOrderProcessFixture> inExecutionOrderList = (List) inExecutionSameTraysMap.get(trayCode);
- List<Long> toBeIds = (List) toStartOrderList.stream().map((v0) -> {
+ List<FmsOrderProcessFixture> toStartOrderList = toBeSameTraysMap.get(trayCode);
+ List<FmsOrderProcessFixture> inExecutionOrderList = inExecutionSameTraysMap.get(trayCode);
+ List<Long> toBeIds = toStartOrderList.stream().map((v0) -> {
return v0.getOrderId();
}).distinct().collect(Collectors.toList());
- List<Long> inExecutionIds = (List) inExecutionOrderList.stream().map((v0) -> {
+ List<Long> inExecutionIds = inExecutionOrderList.stream().map((v0) -> {
return v0.getOrderId();
}).distinct().collect(Collectors.toList());
for (Long toId : toBeIds) {
@@ -960,12 +665,16 @@
});
}
if (Func.isNotEmpty(removeOrderIds)) {
- List<String> removeIds = (List) removeOrderIds.stream().distinct().collect(Collectors.toList());
- orderIds = (List) orderIds.stream().filter(c3 -> {
+ List<String> removeIds = removeOrderIds.stream().distinct().collect(Collectors.toList());
+ orderIds = orderIds.stream().filter(c3 -> {
return !removeIds.contains(c3);
}).collect(Collectors.toList());
}
if (Func.isNotEmpty(orderIds)) {
+ update(Wrappers.<FmsOrder>lambdaUpdate().in(FmsOrder::getId, Func.toLongList(orderIds))
+ .set(FmsOrder::getOrderStatus, Integer.valueOf(OrderStatusEnum.MACH_ING.getValue()))
+ .set(FmsOrder::getStartUpTime, LocalDateTime.now()));
+ /*
update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().in((v0) -> {
return v0.getId();
}, Func.toLongList(orderIds))).set((v0) -> {
@@ -973,33 +682,35 @@
}, Integer.valueOf(OrderStatusEnum.MACH_ING.getValue()))).set((v0) -> {
return v0.getStartUpTime();
}, LocalDateTime.now()));
+ */
}
}
}
public void dealToBeStart(List<String> orderIds, List<FmsOrder> list, Map<Long, List<FmsOrderProcessFixture>> toBeStartedFixtureMap) {
if (orderIds.size() > 1) {
- Map<Integer, List<FmsOrder>> priorityMap = (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<Integer, List<FmsOrder>> priorityMap = list.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getPriority();
}));
- priorityMap.forEach(k, v -> {
- v.sort(o1, o2 -> {
+ priorityMap.forEach((k, v) -> {
+ v.sort((o1, o2) -> {
Long id = o1.getId();
Long id2 = o2.getId();
- List<FmsOrderProcessFixture> processFixtureList = (List) toBeStartedFixtureMap.get(id);
- List<FmsOrderProcessFixture> processFixtureList1 = (List) toBeStartedFixtureMap.get(id2);
+ List<FmsOrderProcessFixture> processFixtureList = toBeStartedFixtureMap.get(id);
+ List<FmsOrderProcessFixture> processFixtureList1 = toBeStartedFixtureMap.get(id2);
if (Func.isNotEmpty(processFixtureList) && Func.isNotEmpty(processFixtureList1)) {
- List<String> collect = (List) processFixtureList.stream().map((v0) -> {
+ List<String> collect = processFixtureList.stream().map((v0) -> {
return v0.getTrayCode();
}).distinct().collect(Collectors.toList());
- List<String> collect1 = (List) processFixtureList1.stream().map((v0) -> {
+ List<String> collect1 = processFixtureList1.stream().map((v0) -> {
return v0.getTrayCode();
}).distinct().collect(Collectors.toList());
- Stream<String> stream = collect.stream();
- collect1.getClass();
- List<String> collect2 = (List) stream.filter((v1) -> {
- return r1.contains(v1);
+ //鎺掑簭鑰屽凡锛屼笉澶噸瑕�,姝ゅ闇�瑕佸啀浠旂粏鑰冭檻
+
+ List<String> collect2 = collect.stream().filter((v1) -> {
+ return collect1.contains(v1);
}).collect(Collectors.toList());
+
if (collect2.size() > 0) {
orderIds.remove(String.valueOf(o1.getId()));
return 0;
@@ -1016,7 +727,7 @@
List<FmsOrderProcessFixture> fixtures = this.fmsOrderProcessFixtureService.list(Lambda.in((v0) -> {
return v0.getTrayCode();
}, trayCodeList));
- List<Long> processIds = (List) fixtures.stream().map((v0) -> {
+ List<Long> processIds = fixtures.stream().map((v0) -> {
return v0.getOrderProcessId();
}).collect(Collectors.toList());
List<FmsOrderProcess> processList = null;
@@ -1028,10 +739,10 @@
if (Func.isNotEmpty(processList)) {
List<FmsOrder> orderList = list(Lambda.in((v0) -> {
return v0.getId();
- }, (Collection) processList.stream().map((v0) -> {
+ }, processList.stream().map((v0) -> {
return v0.getOrderId();
}).collect(Collectors.toList())));
- List<FmsOrder> usingOrders = (List) orderList.stream().filter(item -> {
+ List<FmsOrder> usingOrders = orderList.stream().filter(item -> {
return item.getOrderStatus().equals(Integer.valueOf(OrderStatusEnum.MACH_ING.getValue())) || item.getOrderStatus().equals(Integer.valueOf(OrderStatusEnum.PAUSE_ING.getValue()));
}).collect(Collectors.toList());
return usingOrders;
@@ -1040,20 +751,24 @@
}
private List<Long> getToBeStartOrderByTray(List<String> trayCodeList, List<Long> orderIds) {
+ List<FmsOrderProcessFixture> fixtures = this.fmsOrderProcessFixtureService.list(Wrappers.<FmsOrderProcessFixture>lambdaQuery()
+ .in(FmsOrderProcessFixture::getOrderId, orderIds)
+ .in(FmsOrderProcessFixture::getTrayCode, trayCodeList));
+ /*
List<FmsOrderProcessFixture> fixtures = this.fmsOrderProcessFixtureService.list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderId();
}, orderIds)).in((v0) -> {
return v0.getTrayCode();
- }, trayCodeList));
+ }, trayCodeList));*/
if (Func.isNotEmpty(fixtures)) {
- List<Long> orderList = (List) fixtures.stream().map((v0) -> {
+ List<Long> orderList = fixtures.stream().map((v0) -> {
return v0.getOrderId();
}).distinct().collect(Collectors.toList());
if (Func.isNotEmpty(orderList)) {
return orderList;
}
}
- return new ArrayList();
+ return new ArrayList<>();
}
@Override // org.springblade.modules.fms.service.IFmsOrderService
@@ -1064,11 +779,13 @@
if (status != OrderStatusEnum.WAIT_PUBLISH.getValue()) {
throw new ServiceException(MessageUtils.message("fms.order.has.publish", new Object[0]));
}
+ List<FmsOrderProcess> fmsOrderProcessList = this.fmsOrderProcessService.list(Lambda.eq(FmsOrderProcess::getOrderId, orderId).orderByAsc(FmsOrderProcess::getSort));
+ /*
List<FmsOrderProcess> fmsOrderProcessList = this.fmsOrderProcessService.list((Wrapper) Lambda.eq((v0) -> {
return v0.getOrderId();
}, orderId).orderByAsc((v0) -> {
return v0.getSort();
- }));
+ }));*/
boolean existEmptyWorkstation = fmsOrderProcessList.stream().anyMatch(item -> {
return Func.isEmpty(item.getWorkStationId());
});
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.java
index 2530c0b..3339250 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.java
@@ -1,20 +1,18 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.smartman.modules.fms.convert.FmsOrderConvert;
@@ -43,7 +41,9 @@
import com.qianwen.smartman.modules.fms.vo.FmsProducePartVO;
import com.qianwen.smartman.modules.fms.vo.FmsProduceProcessVO;
import com.qianwen.smartman.modules.fms.vo.FmsProduceQueryVO;
-import org.springframework.stereotype.Service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsProductionStatisticsServiceImpl.class */
@@ -54,135 +54,6 @@
private final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService;
private final FmsWorkStationRecordMapper fmsWorkStationRecordMapper;
private final FmsRealTimeTrayServiceImpl fmsRealTimeTrayService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -2132400570:
- if (implMethodName.equals("getProductCode")) {
- z = false;
- break;
- }
- break;
- case -1335731856:
- if (implMethodName.equals("getPlanStartTime")) {
- z = true;
- break;
- }
- break;
- case -761264846:
- if (implMethodName.equals("getOrderProcessId")) {
- z = true;
- break;
- }
- break;
- case -520385111:
- if (implMethodName.equals("getPlanEndTime")) {
- z = true;
- break;
- }
- break;
- case -170250029:
- if (implMethodName.equals("getOrderId")) {
- z = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case 637897077:
- if (implMethodName.equals("getComponentsNumber")) {
- z = true;
- break;
- }
- break;
- case 912439066:
- if (implMethodName.equals("getPriority")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getProductCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getComponentsNumber();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPlanStartTime();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPlanStartTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/util/Date;")) {
- return (v0) -> {
- return v0.getPlanEndTime();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessTool") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcessFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderProcessId();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPriority();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrderProcess") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getOrderId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsOrder") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FmsProductionStatisticsServiceImpl(final IFmsOrderService fmsOrderService, final IFmsOrderProcessService fmsOrderProcessService, final IFmsOrderProcessToolService fmsOrderProcessToolService, final IFmsOrderProcessFixtureService fmsOrderProcessFixtureService, final FmsWorkStationRecordMapper fmsWorkStationRecordMapper, final FmsRealTimeTrayServiceImpl fmsRealTimeTrayService) {
this.fmsOrderService = fmsOrderService;
@@ -197,6 +68,12 @@
public IPage<FmsProduceOrderVO> orderPage(Query query, FmsProduceQueryVO filter) {
IPage<FmsOrder> page = Condition.getPage(query);
String code = filter.getCode();
+ LambdaQueryWrapper<FmsOrder> wrapper = Wrappers.<FmsOrder>lambdaQuery().likeRight(StrUtil.isNotEmpty(code), FmsOrder::getCode, code)
+ .or().likeRight(StrUtil.isNotEmpty(code), FmsOrder::getProductCode, code)
+ .between((StrUtil.isNotEmpty(filter.getPlanStartTimeBegin()) && StrUtil.isNotEmpty(filter.getPlanStartTimeEnd()))
+ , FmsOrder::getPlanStartTime, filter.getPlanStartTimeBegin(), filter.getPlanStartTimeEnd())
+ .between((StrUtil.isNotEmpty(filter.getPlanEndTimeBegin()) && StrUtil.isNotEmpty(filter.getPlanEndTimeEnd())), FmsOrder::getPlanEndTime, filter.getPlanEndTimeBegin(), filter.getPlanEndTimeEnd());
+ /*
Wrapper wrapper = (LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().likeRight(StrUtil.isNotEmpty(code), (v0) -> {
return v0.getCode();
}, code).or()).likeRight(StrUtil.isNotEmpty(code), (v0) -> {
@@ -205,7 +82,7 @@
return v0.getPlanStartTime();
}, filter.getPlanStartTimeBegin(), filter.getPlanStartTimeEnd()).between(StrUtil.isNotEmpty(filter.getPlanEndTimeBegin()) && StrUtil.isNotEmpty(filter.getPlanEndTimeEnd()), (v0) -> {
return v0.getPlanEndTime();
- }, filter.getPlanEndTimeBegin(), filter.getPlanEndTimeEnd());
+ }, filter.getPlanEndTimeBegin(), filter.getPlanEndTimeEnd());*/
sort(filter.getSort(), wrapper);
IPage<FmsOrder> resPage = this.fmsOrderService.page(page, wrapper);
return FmsOrderConvert.INSTANCE.convertToProduceVO(resPage);
@@ -227,30 +104,38 @@
if (Objects.isNull(fmsOrder)) {
return FmsProduceProcessVO.builder().build();
}
+ List<FmsOrderProcess> fmsOrderProcesses = this.fmsOrderProcessService.list(Wrappers.<FmsOrderProcess>lambdaQuery().eq(FmsOrderProcess::getOrderId, orderId));
+ /*
List<FmsOrderProcess> fmsOrderProcesses = this.fmsOrderProcessService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getOrderId();
- }, orderId));
+ }, orderId));*/
if (CollectionUtils.isEmpty(fmsOrderProcesses)) {
return FmsProduceProcessVO.builder().build();
}
List<FmsOrderProcessVO> resultProcess = FmsOrderProcessConvert.INSTANCE.convert(fmsOrderProcesses);
- List<Long> processIds = (List) fmsOrderProcesses.parallelStream().map((v0) -> {
+ List<Long> processIds = fmsOrderProcesses.parallelStream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
+
+ List<FmsOrderProcessTool> orderProcessTools = this.fmsOrderProcessToolService.list(Wrappers.<FmsOrderProcessTool>lambdaQuery().in(FmsOrderProcessTool::getOrderProcessId, processIds));
+ /*
List<FmsOrderProcessTool> orderProcessTools = this.fmsOrderProcessToolService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderProcessId();
- }, processIds));
- Map<Long, List<FmsOrderProcessTool>> toolsMap = (Map) orderProcessTools.stream().collect(Collectors.groupingBy((v0) -> {
+ }, processIds));*/
+ Map<Long, List<FmsOrderProcessTool>> toolsMap = orderProcessTools.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getOrderProcessId();
}));
+ List<FmsOrderProcessFixture> processFixtures = this.fmsOrderProcessFixtureService.list(Wrappers.<FmsOrderProcessFixture>lambdaQuery().in(FmsOrderProcessFixture::getOrderProcessId, processIds));
+
+ /*
List<FmsOrderProcessFixture> processFixtures = this.fmsOrderProcessFixtureService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getOrderProcessId();
- }, processIds));
- Map<Long, List<FmsOrderProcessFixture>> fixturesMap = (Map) processFixtures.stream().collect(Collectors.groupingBy((v0) -> {
+ }, processIds));*/
+ Map<Long, List<FmsOrderProcessFixture>> fixturesMap =processFixtures.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getOrderProcessId();
}));
resultProcess.forEach(process -> {
- List<FmsOrderProcessTool> toolList = (List) toolsMap.get(process.getId());
+ List<FmsOrderProcessTool> toolList = toolsMap.get(process.getId());
if (CollectionUtil.isNotEmpty(toolList)) {
List<FmsOrderProcessToolVO> fmsOrderProcessToolVOS = FmsOrderProcessToolConvert.INSTANCE.convert(toolList);
process.setToolList(fmsOrderProcessToolVOS);
@@ -270,19 +155,23 @@
if (CollectionUtil.isEmpty(produceOrderPartList)) {
return Collections.emptyList();
}
- Map<String, List<FmsProducePartDTO>> partList = (Map) produceOrderPartList.stream().collect(Collectors.groupingBy((v0) -> {
+ Map<String, List<FmsProducePartDTO>> partList = produceOrderPartList.stream().collect(Collectors.groupingBy((v0) -> {
return v0.getPartCode();
}));
- partList.forEach(partCode, parts -> {
+ partList.forEach((partCode, parts) -> {
+ parts = parts.stream().sorted(Comparator.comparing(FmsProducePartDTO::getStartTime, Comparator.reverseOrder())).collect(Collectors.toList());
+ /*
List parts = (List) parts.stream().sorted(Comparator.comparing((v0) -> {
return v0.getStartTime();
- }, Comparator.reverseOrder())).collect(Collectors.toList());
- FmsProducePartDTO fmsProducePartDTO = (FmsProducePartDTO) parts.get(0);
+ }, Comparator.reverseOrder())).collect(Collectors.toList());*/
+ FmsProducePartDTO fmsProducePartDTO = parts.get(0);
+ FmsRealTimeTray fmsRealTimeTray = this.fmsRealTimeTrayService.getOne(Wrappers.<FmsRealTimeTray>lambdaQuery().eq(FmsRealTimeTray::getOrderProcessId, fmsProducePartDTO.getOrderProcessId()).eq(FmsRealTimeTray::getComponentsNumber, fmsProducePartDTO.getPartCode()));
+ /*
FmsRealTimeTray fmsRealTimeTray = (FmsRealTimeTray) this.fmsRealTimeTrayService.getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getOrderProcessId();
}, fmsProducePartDTO.getOrderProcessId())).eq((v0) -> {
return v0.getComponentsNumber();
- }, fmsProducePartDTO.getPartCode()));
+ }, fmsProducePartDTO.getPartCode()));*/
if (Objects.isNull(fmsRealTimeTray) && parts.size() == 1) {
parts.forEach(p -> {
p.setPartType(null);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsScheduleServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsScheduleServiceImpl.java
index 85ecd3c..bd20edf 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsScheduleServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsScheduleServiceImpl.java
@@ -1,23 +1,23 @@
package com.qianwen.smartman.modules.fms.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.ParamCache;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.FmsConstant;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.entity.Tray;
import com.qianwen.smartman.modules.cps.entity.Workstation;
+import com.qianwen.smartman.modules.cps.entity.WorkstationWorkbench;
import com.qianwen.smartman.modules.cps.enums.TrayEnum;
import com.qianwen.smartman.modules.cps.enums.WorkTypeEnum;
import com.qianwen.smartman.modules.cps.service.ITrayService;
@@ -34,7 +34,6 @@
import com.qianwen.smartman.modules.fms.service.IFmsScheduleService;
import com.qianwen.smartman.modules.fms.util.FmsForestUtil;
import com.qianwen.smartman.modules.fms.vo.ManualTrayVO;
-import org.springframework.stereotype.Service;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsScheduleServiceImpl.class */
@@ -46,121 +45,7 @@
private final IFmsOrderService fmsOrderService;
private final FmsForestClient fmsForestClient;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1757019252:
- if (implMethodName.equals("getCurrentPosition")) {
- z = true;
- break;
- }
- break;
- case -1028820157:
- if (implMethodName.equals("getPartType")) {
- z = true;
- break;
- }
- break;
- case -927447111:
- if (implMethodName.equals("getTrayCode")) {
- z = true;
- break;
- }
- break;
- case -557259320:
- if (implMethodName.equals("getWorkstationId")) {
- z = false;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -39017699:
- if (implMethodName.equals("getCurrentType")) {
- z = true;
- break;
- }
- break;
- case 515915377:
- if (implMethodName.equals("getCurrentStation")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/WorkstationWorkbench") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getWorkstationId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getTrayCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCurrentStation();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getCurrentType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getCurrentType();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCurrentPosition();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCurrentPosition();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Tray") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/fms/entity/FmsRealTimeTray") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getPartType();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
+
public FmsScheduleServiceImpl(final ITrayService trayService, final IFmsRealTimeTrayService fmsRealTimeTrayService, final IWorkstationWorkbenchService workstationWorkbenchService, final IWorkstationService workstationService, final IFmsOrderService fmsOrderService, final FmsForestClient fmsForestClient) {
this.trayService = trayService;
@@ -175,9 +60,11 @@
public Boolean check(ManualTrayVO manualTrayVO) {
checkManual();
checkTrayStatus(manualTrayVO.getTrayCode());
+ FmsRealTimeTray fmsRealTimeTray = this.fmsRealTimeTrayService.getOne(Wrappers.<FmsRealTimeTray>lambdaQuery().eq(FmsRealTimeTray::getTrayCode, manualTrayVO.getTrayCode()));
+ /*
FmsRealTimeTray fmsRealTimeTray = (FmsRealTimeTray) this.fmsRealTimeTrayService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getTrayCode();
- }, manualTrayVO.getTrayCode()));
+ }, manualTrayVO.getTrayCode()));*/
checkScheState(fmsRealTimeTray.getScheState());
checkTargetHasTray(manualTrayVO);
if (PositionTypeEnum.DEVICE.getType().equals(manualTrayVO.getEndType())) {
@@ -202,9 +89,8 @@
}
private void checkTrayStatus(String trayCode) {
- Tray tray = (Tray) this.trayService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, trayCode));
+ Tray tray = this.trayService.getOne(Wrappers.<Tray>lambdaQuery().eq(Tray::getCode, trayCode));
+
if (TrayEnum.StatusEnum.FREEZE.getStatus().equals(tray.getAvailability())) {
throw new ServiceException(MessageUtils.message("fms.schedule.tray.is.freeze", new Object[0]));
}
@@ -220,9 +106,12 @@
List<Long> strings = Func.toLongList(workstationIds);
workstationIdSet.addAll(strings);
});
+
+ List<String> workstationCodeList = this.workstationService.listByIds(workstationIdSet).stream().map(Workstation::getCode).collect(Collectors.toList());
+ /*
List<String> workstationCodeList = (List) this.workstationService.listByIds(workstationIdSet).stream().map((v0) -> {
return v0.getCode();
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
if (!workstationCodeList.contains(manualTrayVO.getEndPosition())) {
throw new ServiceException(MessageUtils.message("fms.schedule.order.not.assign.to.this.position", new Object[0]));
}
@@ -240,13 +129,19 @@
}
private void checkTargetHasTray(ManualTrayVO manualTrayVO) {
+ long count = this.fmsRealTimeTrayService.count(Wrappers.<FmsRealTimeTray>lambdaQuery()
+ .eq(PositionTypeEnum.DEVICE.getType().equals(manualTrayVO.getEndType()), FmsRealTimeTray::getCurrentPosition, manualTrayVO.getEndPosition())
+ .eq(FmsRealTimeTray::getCurrentStation, manualTrayVO.getEndStation())
+ .eq(FmsRealTimeTray::getCurrentType, manualTrayVO.getEndType()));
+
+ /*
long count = this.fmsRealTimeTrayService.count((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq(PositionTypeEnum.DEVICE.getType().equals(manualTrayVO.getEndType()), (v0) -> {
return v0.getCurrentPosition();
}, manualTrayVO.getEndPosition()).eq((v0) -> {
return v0.getCurrentStation();
}, manualTrayVO.getEndStation())).eq((v0) -> {
return v0.getCurrentType();
- }, manualTrayVO.getEndType()));
+ }, manualTrayVO.getEndType()));*/
if (count > CommonConstant.ZERO.intValue()) {
throw new ServiceException(MessageUtils.message("fms.schedule.target.position.has.already.exists.tray", new Object[0]));
}
@@ -263,19 +158,24 @@
}
private Workstation getWorkstation(String workstationCode) {
- return (Workstation) this.workstationService.getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCode();
- }, workstationCode));
+ return this.workstationService.getOne(Wrappers.<Workstation>lambdaQuery().eq(Workstation::getCode, workstationCode));
}
private Boolean isSingleWorkBench(Long workstationId) {
+ long count = this.workstationWorkbenchService.count(Wrappers.<WorkstationWorkbench>lambdaQuery().eq(WorkstationWorkbench::getWorkstationId, workstationId));
+ /*
long count = this.workstationWorkbenchService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getWorkstationId();
- }, workstationId));
+ }, workstationId));*/
return Boolean.valueOf(count <= ((long) CommonConstant.ONE.intValue()));
}
private void deviceIsInProcess(String position) {
+ long count = this.fmsRealTimeTrayService.count(Wrappers.<FmsRealTimeTray>lambdaQuery()
+ .eq(FmsRealTimeTray::getCurrentPosition, position)
+ .eq(FmsRealTimeTray::getCurrentType, PositionTypeEnum.DEVICE.getType())
+ .eq(FmsRealTimeTray::getPartType, Integer.valueOf(RealTimePartTypeEnum.IN_PROCESS.getType())));
+ /*
long count = this.fmsRealTimeTrayService.count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCurrentPosition();
}, position)).eq((v0) -> {
@@ -283,6 +183,7 @@
}, PositionTypeEnum.DEVICE.getType())).eq((v0) -> {
return v0.getPartType();
}, Integer.valueOf(RealTimePartTypeEnum.IN_PROCESS.getType())));
+ */
if (count > CommonConstant.ZERO.intValue()) {
throw new ServiceException(MessageUtils.message("fms.schedule.device.status.is.in.process.can.not.drag.in.or.out", new Object[0]));
}
--
Gitblit v1.9.3