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/order/service/impl/OrdersServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
index 0a3227b..02feeb9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/service/impl/OrdersServiceImpl.java
@@ -4,19 +4,23 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.order.entity.*;
+import com.mes.order.entity.dto.InterlayerDTO;
import com.mes.order.entity.dto.OrderDTO;
import com.mes.order.mapper.OrderdetailMapper;
import com.mes.order.mapper.OrdersMapper;
import com.mes.order.service.OrdersService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -24,9 +28,11 @@
*/
@Service
@DS("sd")
+@Slf4j
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
-@Autowired
-private OrderdetailMapper orderdetailMapper;
+ @Resource
+ private OrderdetailMapper orderdetailMapper;
+
@Override
public List<Orders> selectOrders() {
//鑾峰彇鎵�鏈夋湭瀹屾垚鐨勮鍗�
@@ -43,27 +49,38 @@
}
@Override
- public List<OrderDTO> selectOrderPercent(){
+ public List<OrderDTO> selectOrderPercent() {
return baseMapper.selectOrderPercent();
}
@Override
- public HollowOrderDTO queryOrderByFlowCardId(String flowCardId){
+ public HollowOrderDTO queryOrderByFlowCardId(String flowCardId) {
return baseMapper.queryOrderByFlowCardId(flowCardId);
}
@Override
- public List<HollowGlassDetailsDTO> queryFlowCardIdMaxLayerGlassInfo(String flowCardId, int totalLayer){
+ public List<HollowGlassDetailsDTO> queryFlowCardIdMaxLayerGlassInfo(String flowCardId, int totalLayer) {
return baseMapper.queryFlowCardIdMaxLayerGlassInfo(flowCardId, totalLayer);
}
@Override
- public List<HollowGlassDetailsDTO> queryFlowCardIdLayerGlassInfo(String flowCardId, int totalLayer, int layer){
+ public List<HollowGlassDetailsDTO> queryFlowCardIdLayerGlassInfo(String flowCardId, int totalLayer, int layer) {
return baseMapper.queryFlowCardIdLayerGlassInfo(flowCardId, totalLayer, layer);
}
@Override
- public OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId){
+ @Cacheable(value = "orderDetails", key = "#flowCardId", unless = "#result == null")
+ public OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId) {
+ log.info("鏌ヨ鏁版嵁搴撲竴娆★細{}", flowCardId);
return baseMapper.queryProductNameByFlowCardId(flowCardId);
}
+
+ @Override
+ public List<ProcessCardReport> queryLackByERP(String flowCardId) {
+ return baseMapper.queryLackByERP(flowCardId);
+ }
+ @Override
+ public List<InterlayerDTO> queryInterlayerByERP(String flowCardId) {
+ return baseMapper.queryInterlayerByERP(flowCardId);
+ }
}
--
Gitblit v1.8.0