From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 08:30:56 +0800
Subject: [PATCH] 1、 钢化前钢化出片逻辑调整，避免卧转立信号对调度任务的影响 2、修改出片方式，当玻璃未在关系表时，默认出一片 3、中空新增进片线路校验，避免钢化重复报工
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
index c7aa409..74225cc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/FlowCardServiceImpl.java
@@ -1,6 +1,7 @@
package com.mes.pp.service.impl;
import com.mes.pp.entity.FlowCard;
+import com.mes.pp.entity.dto.FlowCardDTO;
import com.mes.pp.mapper.FlowCardMapper;
import com.mes.pp.service.FlowCardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,7 +12,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -21,12 +22,22 @@
public class FlowCardServiceImpl extends ServiceImpl<FlowCardMapper, FlowCard> implements FlowCardService {
@Override
- public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber){
- return baseMapper.selectProject(processId,technologyNumber);
+ public List<Map<String, Object>> selectProject(String processId, Integer technologyNumber) {
+ return baseMapper.selectProject(processId, technologyNumber);
}
@Override
- public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber){
+ public List<Map<String, Object>> selectFlowCard(String processId, Integer technologyNumber) {
return baseMapper.selectFlowCard(processId, technologyNumber);
}
+
+ @Override
+ public List<Map<String, Object>> selectLabel(String processId, Integer technologyNumber) {
+ return baseMapper.selectLabel(processId, technologyNumber);
+ }
+
+ @Override
+ public List<FlowCardDTO> flowCardReportForms(String orderId) {
+ return baseMapper.flowCardReportForms(orderId);
+ }
}
--
Gitblit v1.8.0