From c8673cbde4538b109e43042dc93cf33c46dca37e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 31 十二月 2024 10:56:57 +0800
Subject: [PATCH] 每日排产计划修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java | 21 +++++++++++++++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 11 +++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java | 12 ++++++++++++
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
index 06246bc..ea06fe7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentMapper.java
@@ -105,6 +105,7 @@
/**
* 瀵煎嚭list
+ *
* @param mdcEquipment
* @return
*/
@@ -112,6 +113,7 @@
/**
* 鏌ヨ鍗曡〃鏁版嵁
+ *
* @param tableName
* @return
*/
@@ -120,8 +122,18 @@
/**
* 鏍规嵁id鑾峰彇璁惧淇℃伅
+ *
* @param id
* @return
*/
MdcEquipmentDetailedDto findById(@Param("id") String id);
+
+ /**
+ * 鏍规嵁浜х嚎id鏌ヨ璁惧id闆嗗悎
+ *
+ * @param productionId
+ * @return
+ */
+ List<String> queryIdsByProduction(@Param("productionId") String productionId);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 42d2e73..035151d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -276,4 +276,15 @@
t1.id = #{ id }
</select>
+ <!--鏍规嵁浜х嚎id鏌ヨ璁惧id闆嗗悎-->
+ <select id="queryIdsByProduction" resultType="java.lang.String">
+ SELECT
+ me.equipment_id
+ FROM
+ mdc_equipment me
+ LEFT JOIN mdc_production_equipment mpe ON me.id = mpe.equipment_id
+ WHERE
+ mpe.production_id = #{ productionId }
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java
index 23169ee..bc20942 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MdcProductDayScheduleServiceImpl.java
@@ -12,10 +12,10 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.time.LocalDate;
import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @author Lius
@@ -29,6 +29,8 @@
@Resource
private MdcEquipmentMapper mdcEquipmentMapper;
+
+ private final List<String> equipments = Stream.of("5045-7110", "5045-7115", "5045-7118").collect(Collectors.toList());
@Override
@@ -50,8 +52,19 @@
map.put("5899-8061", "1818119019862515714");
for (ProductDayschedule c : list) {
if (map.containsKey(c.getEquipmentId())) {
- List<String> productionIds = Arrays.asList(map.get(c.getEquipmentId()).split(","));
- List<String> equipmentList = mdcEquipmentMapper.queryIdsByProductions(productionIds);
+ String productionId = map.get(c.getEquipmentId());
+ List<String> equipmentList = new ArrayList<>();
+ if ("5899-8060".equals(c.getEquipmentId()) && "鍚庝紶鍔ㄧ澹充綋".equals(c.getProductName())) {
+ // 3.8.11鍙锋満 鍚庝紶鍔ㄧ澹充綋
+ equipmentList = equipments;
+ } else if ("5899-8060".equals(c.getEquipmentId()) && "浼犲姩绠卞３浣�".equals(c.getProductName())) {
+ // 闄� 3.8.11鍙锋満涔嬪 浼犲姩绠卞３浣�
+ List<String> queryIdsByProduction = mdcEquipmentMapper.queryIdsByProduction(productionId);
+ equipmentList = queryIdsByProduction.stream().filter(equipment -> !equipments.contains(equipment)).collect(Collectors.toList());
+ } else {
+ equipmentList = mdcEquipmentMapper.queryIdsByProduction(productionId);
+ }
+
if (equipmentList != null && !equipmentList.isEmpty()) {
for (String equipmentId : equipmentList) {
MdcProductDayschedule mdc = new MdcProductDayschedule();
--
Gitblit v1.9.3