From 16170b1d8429f7c31bb1a323b93c2de5137f2c6f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 九月 2025 08:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/BPjingpianKCMapper.java | 15 +++++++
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingLogServiceImpl.java | 40 +++++++------------
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/BPjingpianKC.java | 53 ++++++++++++++++++++++++++
UI-Project/src/views/KanbanDisplay2/kanbanDisplay2.vue | 4 +-
4 files changed, 85 insertions(+), 27 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/BPjingpianKC.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/BPjingpianKC.java
new file mode 100644
index 0000000..742fdf4
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/entity/BPjingpianKC.java
@@ -0,0 +1,53 @@
+package com.mes.md.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 搴撲綅搴撳瓨琛�
+ *
+ * @author huang
+ * @since 2025/9/10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "BPjingpianKC")
+public class BPjingpianKC implements Serializable {
+ /**
+ * 搴撲綅搴撳瓨琛ㄤ富閿�(瀹㈡埛鎻愪緵鏍锋湰)
+ */
+ @TableId(value = "Id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @TableField(value="LGORTOT")
+ private String LGORTOT;
+
+ /**
+ * 搴撳瓨鏁伴噺
+ */
+ @TableField(value="TotalLensStock")
+ private String TotalLensStock;
+
+ /**
+ * 鏃ユ湡
+ */
+ @TableField(value="RecordDate")
+ private Date RecordDate;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(value="CreatedDate")
+ private Date CreatedDate;
+
+}
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/BPjingpianKCMapper.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/BPjingpianKCMapper.java
new file mode 100644
index 0000000..d14da0c
--- /dev/null
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/mapper/BPjingpianKCMapper.java
@@ -0,0 +1,15 @@
+package com.mes.md.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.md.entity.BPjingpianKC;
+
+/**
+ * 搴撲綅搴撳瓨 Mapper 鎺ュ彛
+ *
+ * @author huang
+ * @since 2025/9/10
+ */
+@DS("salve_JomooKBB")
+public interface BPjingpianKCMapper extends MPJBaseMapper<BPjingpianKC> {
+}
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);
diff --git a/UI-Project/src/views/KanbanDisplay2/kanbanDisplay2.vue b/UI-Project/src/views/KanbanDisplay2/kanbanDisplay2.vue
index bb39374..0b49a9a 100644
--- a/UI-Project/src/views/KanbanDisplay2/kanbanDisplay2.vue
+++ b/UI-Project/src/views/KanbanDisplay2/kanbanDisplay2.vue
@@ -199,9 +199,9 @@
resWareHouse.data.forEach(item => {
const dateIndex = dates.indexOf(item.date);
if (dateIndex !== -1) {
- if (item.warehouse === '7014') {
+ if (item.warehouse === 7014) {
data7014[dateIndex] = item.count;
- } else if (item.warehouse === '7016') {
+ } else if (item.warehouse === 7016) {
data7016[dateIndex] = item.count;
}
}
--
Gitblit v1.8.0