From 7f16849cfa9362d32eaaf323c71350351f13b689 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 11 九月 2025 08:51:15 +0800
Subject: [PATCH] 添加看板库位库存接口
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
index 6a8b100..db5d4fe 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java
@@ -3,9 +3,11 @@
import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.md.entity.BPjingpianKC;
import com.mes.md.entity.KBBTJPDrawingBP;
import com.mes.md.entity.KBBTProgramsOperationLogBP;
import com.mes.md.entity.TaskingLog;
+import com.mes.md.mapper.BPjingpianKCMapper;
import com.mes.md.mapper.KBBTJPDrawingBPMapper;
import com.mes.md.mapper.KBBTProgramsOperationLogBPMapper;
import com.mes.md.mapper.TaskingLogMapper;
@@ -34,6 +36,8 @@
KBBTProgramsOperationLogBPMapper kBBTProgramsOperationLogBPMapper;
@Autowired
KBBTJPDrawingBPMapper kBBTJPDrawingBPMapper;
+ @Autowired
+ BPjingpianKCMapper bPjingpianKCMapper;
@Override
public List<Map> selectMechanicalReport(int dayCount, Date startDate, Date endDate, String taskType, String operationRecord, String lineType) {
@@ -377,8 +381,7 @@
/**
* 鏌ヨ搴撲綅鏁版嵁
* 鎸夊簱浣嶇粺璁★細
- * - 鏍囧噯宸ヨ壓锛氱粺璁′笂鐗�1鍜屼笂鐗�2鐨勮褰�
- * - 瀹氬埗宸ヨ壓锛氱粺璁℃棆杞�1鍜屾棆杞�2鐨勮褰�
+ * 鏌ヨ BPjingpianKC 琛ㄧ殑搴撲綅鏁版嵁
*/
@Override
public List<Map<String, Object>> selectWareHouse(int dayCount) {
@@ -392,30 +395,17 @@
cal.set(Calendar.MILLISECOND, 0);
cal.add(Calendar.DATE, -dayCount + 1);
Date startDate = cal.getTime();
-
- // 浣跨敤QueryWrapper鏋勫缓鏌ヨ
- QueryWrapper<TaskingLog> queryWrapper = new QueryWrapper<>();
- queryWrapper.select(
- "DATE_FORMAT(operation_record_time, '%Y-%m-%d') as date",
- "warehouse",
- "COUNT(*) as count"
- )
- .and(wrapper -> wrapper
- .and(w -> w
- .eq("task_type", "鏍囧噯")
- .in("operation_record", "涓婄墖1", "涓婄墖2")
- )
- .or(w -> w
- .eq("task_type", "瀹氬埗")
- .in("operation_record", "鏃嬭浆1", "鏃嬭浆2")
- )
- )
- .eq("operation_mode", "缁撴潫")
- .ge("operation_record_time", startDate)
- .groupBy("DATE_FORMAT(operation_record_time, '%Y-%m-%d')", "warehouse")
- .orderByAsc("date", "warehouse");
- return baseMapper.selectMaps(queryWrapper);
+ QueryWrapper<BPjingpianKC> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select(
+ "RecordDate as date",
+ "LGORTOT as warehouse",
+ "TotalLensStock as count"
+ )
+ .ge("RecordDate", startDate)
+ .orderByAsc("RecordDate", "LGORTOT");
+
+ return bPjingpianKCMapper.selectMaps(queryWrapper);
} catch (Exception e) {
log.error("鏌ヨ搴撲綅鏁版嵁澶辫触", e);
--
Gitblit v1.8.0