From e387a74a0b132d383775a743a18d794a34a422b3 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 15 四月 2025 16:54:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java | 68 ++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java new file mode 100644 index 0000000..333d09d --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdcJc/service/impl/MesRcJobreportServiceImpl.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.mdcJc.service.impl; + +import org.jeecg.common.util.dynamic.db.DynamicDBUtil; +import org.jeecg.modules.mdcJc.dto.MesRcJobreport; +import org.jeecg.modules.mdcJc.service.MesRcJobreportService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: Lius + * @CreateTime: 2025-04-14 + * @Description: + */ +@Service +public class MesRcJobreportServiceImpl implements MesRcJobreportService { + + + @Override + public List<MesRcJobreport> findPartProcessInfo(String date, List<String> equipmentIdList) { + List<MesRcJobreport> result = new ArrayList<>(); + + // 绌哄弬鏁版鏌� + if (equipmentIdList == null || equipmentIdList.isEmpty()) { + return result; + } + + // 鏋勫缓鍔ㄦ�両N瀛愬彞 + String inClause = String.join(",", Collections.nCopies(equipmentIdList.size(), "?")); + + // 鏋勫缓瀹夊叏SQL锛堟敞鎰廤HERE瀛愬彞鐨勭┖鏍硷級 + String sql = "SELECT the_data AS thedate, " + + "device_number AS deviceNumber, " + + "okuqty, qty " + + "FROM hegelv " + + "WHERE the_data = ? " + // 浣跨敤鍙傛暟鍖栨煡璇� + "AND device_number IN (" + inClause + ")"; + + // 鍑嗗鍙傛暟锛堟棩鏈熷湪鍓嶏紝璁惧ID鍦ㄥ悗锛� + List<String> params = new ArrayList<>(); + params.add(date); + params.addAll(equipmentIdList); + + System.out.println("SQL鍙傛暟: date=" + date + ", equipmentIds=" + equipmentIdList); + + List<Map<String, Object>> mapList = DynamicDBUtil.findList("basicDB", sql, params.toArray()); + + if (mapList == null || mapList.isEmpty()) { + return result; + } + + result = mapList.stream().map(map -> { + MesRcJobreport mesRcJobreport = new MesRcJobreport(); + mesRcJobreport.setBillDate(map.get("thedate").toString()); + mesRcJobreport.setDeviceNumber(map.get("deviceNumber").toString()); + mesRcJobreport.setOkuqty(new BigDecimal(map.get("okuqty").toString())); + mesRcJobreport.setQty(new BigDecimal(map.get("qty").toString())); + return mesRcJobreport; + }).collect(Collectors.toList()); + + return result; + } +} -- Gitblit v1.9.3