From 3c61c5f4bc92f75b4fe60653eaa676a21cde4325 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 19 十二月 2024 17:09:02 +0800
Subject: [PATCH] edit BI Device log and planList
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 5 +++--
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml | 11 ++++++++---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java | 2 +-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
index a23092e..f5c4ff1 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -27,10 +27,15 @@
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByDeviceNo" resultType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
- select
+ SELECT
<include refid="Base_Column_List" />
- from sta_wip_sn_ex
- where device_no = #{deviceNo,jdbcType=VARCHAR}
+ FROM (
+ SELECT
+ <include refid="Base_Column_List" />
+ , ROW_NUMBER() OVER (PARTITION BY device_no,product_no ORDER BY create_time DESC) AS rn
+ FROM sta_wip_sn_ex WHERE device_no = #{deviceNo,jdbcType=VARCHAR}
+ ) t
+ WHERE rn = 1;
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
index 8ddcc73..7ce7c80 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
@@ -33,7 +33,7 @@
public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
Map<String, Object> result = sv.getDeviceInfo(deviceNo);
- return BaseResponseUtils.buildSuccess(null);
+ return BaseResponseUtils.buildSuccess(result);
}
/**
* 鏍规嵁鏃堕棿鍖洪棿鏌ヨ 鎵�鏈夎繃绔欒褰�
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
index 663fe40..366d9d3 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -122,7 +122,7 @@
public List<JSONObject> queryPlanList() {
List<JSONObject> list = assemblyPlanDao.queryPlanList();
- Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
+ /*Map<String, JSONObject> map = new ConcurrentHashMap<>(); // 浣跨敤骞跺彂瀹夊叏鐨凪ap
for (JSONObject item : list) {
String planId = String.valueOf(item.getObj("planId"));
JSONObject innerObject = new JSONObject()
@@ -141,6 +141,7 @@
map.put(planId, outObject);
}
}
- return map.values().stream().collect(Collectors.toList());
+ return map.values().stream().collect(Collectors.toList());*/
+ return list;
}
}
--
Gitblit v1.8.0