From c9b04383c77f91ac309e37e70783edcf8a9298b5 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 18 五月 2024 23:24:12 +0800
Subject: [PATCH] websocket代码整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/coproduction/service/impl/OrderProcessServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/coproduction/service/impl/OrderProcessServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/coproduction/service/impl/OrderProcessServiceImpl.java
index ec4ecc6..219c789 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/coproduction/service/impl/OrderProcessServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/coproduction/service/impl/OrderProcessServiceImpl.java
@@ -98,14 +98,14 @@
@Autowired
private ICommonGroupService commonGroupService;
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public OrderProcessGeneralDetailVO startDetailGeneral(Long orderProcessId) {
OrderProcess orderProcess = getById(orderProcessId);
checkCanStartWork(orderProcess);
return this.baseMapper.startDetailGeneral(orderProcessId);
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
@Transactional(rollbackFor = {Exception.class})
public List<OrderProcessStartResultVO> startGeneral(OrderProcessStartGeneralVO orderProcessStartGeneralVO) {
@@ -175,7 +175,7 @@
return orderProcessStartResultVO;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public List<OrderProcessDetailVO> detail(Long orderId) {
List<OrderProcessDetailVO> items = ((OrderProcessMapper) this.baseMapper).listByOrderId(orderId);
items.forEach(orderProcessRelateDetailVO -> {
@@ -199,7 +199,7 @@
}
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
@Transactional(rollbackFor = {Exception.class})
public Boolean reportWork(ReportWorkDTO reportWorkDTO) {
long orderId = Func.toLong(reportWorkDTO.getOrderId());
@@ -277,7 +277,7 @@
});
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public void dealCompleteProcessSurplusRecords(String orderId) {
PlanAndOrderDTO planAndOrderDTO = checkPlanAndOrder(Long.valueOf(Func.toLong(orderId)));
List<OrderProcess> orderProcesses = currentOrderProcesses(planAndOrderDTO.getOrder());
@@ -637,7 +637,7 @@
return null;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public List<OrderProcess> generateOrderProcess(OrderAssignVO orderAssignVO, Order order) {
List<PlanProcessWorkStationAssignVO> planProcessWorkStationAssignVOList = orderAssignVO.getPlanProcessWorkStationAssignVOList();
Map<Long, PlanProcessWorkStationAssignVO> processToWorkstation = (Map<Long, PlanProcessWorkStationAssignVO>)planProcessWorkStationAssignVOList.stream().collect(Collectors.toMap(PlanProcessWorkStationAssignVO::getPlanProcessId, v -> v));
@@ -676,7 +676,7 @@
})).get();
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public OrderProcessParallelDetailVO startDetailParallel(Long orderProcessId) {
OrderProcessParallelDetailVO result = new OrderProcessParallelDetailVO();
OrderProcess orderProcess = (OrderProcess) getById(orderProcessId);
@@ -688,7 +688,7 @@
return result;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public List<OrderProcessStartResultVO> startParallel(OrderProcessStartParallelVO orderProcessStartParallelVO) {
OrderProcess orderProcess = (OrderProcess) getById(orderProcessStartParallelVO.getOrderProcessId());
checkCanStartWork(orderProcess);
@@ -734,12 +734,12 @@
return resultByStartDTO.getOrderProcessStartResultVOList();
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public OrderProcessRelationVO getRelation(OrderProcessRelationQueryVO orderProcessRelationQueryVO) {
return ((OrderProcessMapper) this.baseMapper).getRelation(orderProcessRelationQueryVO);
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
@Transactional(rollbackFor = {Exception.class})
public Boolean reportParallel(ReportWorkDTO reportWorkDTO) {
List<OrderProcessReportWorkDTO> reportWorkDTOList = reportWorkDTO.getReportWorkDTOList();
@@ -753,7 +753,7 @@
return result;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public void dealChildProcess(List<OrderProcessReportWorkDTO> reportWorkDTOList) {
List<String> processIds = (List<String>)reportWorkDTOList.stream().filter(s -> Func.isEmpty(s.getMainSequenceId())).map(OrderProcessReportWorkDTO::getProcessId).distinct().collect(Collectors.toList());
if (Func.isNotEmpty(processIds)) {
@@ -789,7 +789,7 @@
return childProcesses;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public Integer parallelProcessAround(List<ReportParallelProcessDTO> parallelProcessDTO, Boolean isEdit) {
Map<String, ParallelNumDTO> notReportMap = new HashMap<>(8);
Map<String, ParallelNumDTO> alreadyReportMap = new HashMap<>(8);
@@ -827,7 +827,7 @@
return checkMainProcess(mainProcessRecord, mainOrderProcess, childProcessRecords, notReportMap, alreadyReportMap, isEdit);
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public Integer getChildReportNum(Long orderProcessId) {
OrderProcess orderProcess = (OrderProcess)getById(orderProcessId);
Long mainSequenceId = orderProcess.getMainSequenceId();
@@ -934,7 +934,7 @@
return new ParallelNumDTO().setReportNum(reportNum).setYield(yield).setNoScrappedNum(noScrappedNum);
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public List<WorkstationInGroupVO> treeWorkstation(Long planId, String processCode, Integer sort) {
List<PlanProcess> planProcessList = this.planProcessService.list(Wrappers.<PlanProcess>lambdaQuery()
.eq(PlanProcess::getPlanId, planId)
@@ -956,7 +956,7 @@
return this.commonGroupService.groupWorkstationList(commonGroupTypeVO);
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
public List<OrderProcessDetailVO> listDetailByOrderId(Long orderId) {
return ((OrderProcessMapper) this.baseMapper).listDetailByOrderId(orderId);
}
@@ -1194,7 +1194,7 @@
return orderProcesses;
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
@Transactional(rollbackFor = {Exception.class})
public Boolean editReportWork(ReportWorkDTO reportWorkDTO) {
long orderId = Func.toLong(reportWorkDTO.getOrderId());
@@ -1335,7 +1335,7 @@
}
}
- @Override // org.springblade.modules.coproduction.service.IOrderProcessService
+
@Transactional(rollbackFor = {Exception.class})
public Boolean delReportWork(ReportWorkDTO reportWorkDTO) {
long orderId = Func.toLong(reportWorkDTO.getOrderId());
--
Gitblit v1.9.3