From bbc5784cc34d65e64d639d949e75b978fe07bdb3 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 06 五月 2024 12:30:48 +0800
Subject: [PATCH] 更新首页
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 10dcfe2..acb02f6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -140,7 +140,7 @@
bsOrderScheduling.setStartTime(s1);
bsOrderScheduling.setEndTime(s2);
List<BsOrderScheduling> todayList = bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
- todayList = todayList.stream().filter(x -> ObjectUtil.isNotEmpty(x.getCvtOfflineTime())).collect(Collectors.toList());
+ todayList = todayList.stream().filter(x -> ObjectUtil.isNotEmpty(x.getFinalAssemblyOfflineTime())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(todayList)){
List<String> allModel = todayList.stream().map(BsOrderScheduling::getModel).distinct().collect(Collectors.toList());
Map<String, List<BsOrderScheduling>> collect = new HashMap<>();
@@ -149,7 +149,7 @@
List<Integer> arr = new ArrayList<>();
vo.setName(s);
collect = todayList.stream().filter(x -> s.equals(x.getModel())).collect(Collectors.groupingBy(item -> new SimpleDateFormat("yyyy-MM-dd HH").format(item
- .getCvtOfflineTime())));
+ .getFinalAssemblyOfflineTime())));
Map<Integer,Integer> temp = new HashMap<>();
if (CollUtil.isNotEmpty(collect)){
for (String string : collect.keySet()) {
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index c91312f..a77d4cc 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -461,11 +461,11 @@
//鏇存柊宸ュ崟鐘舵��
if ("OP790".equals(parts[1])) {
- bsOrderScheduling.setReport20("1");
+ bsOrderScheduling.setReport20("0");
bsOrderScheduling.setProductionStatus("3");
bsOrderScheduling.setFinalAssemblyOfflineTime(new Date());
}else if("OP050".equals(parts[1])){
- bsOrderScheduling.setReport10("1");
+ bsOrderScheduling.setReport10("0");
bsOrderScheduling.setProductionStatus("2");
bsOrderScheduling.setBoxClosingOnlineTime(new Date());
}else if("OP120".equals(parts[1])){
diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index 3afc5b3..6cada42 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -79,7 +79,7 @@
<if test="finalAssemblyOfflineTime != null and finalAssemblyOfflineTime != ''"> and final_assembly_offline_time = #{finalAssemblyOfflineTime}</if>
<if test="cvtLaunchTime != null and cvtLaunchTime != ''"> and cvt_launch_time = #{cvtLaunchTime}</if>
<if test="cvtOfflineTime != null and cvtOfflineTime != ''"> and cvt_offline_time = #{cvtOfflineTime}</if>
- <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and cvt_offline_time between #{startTime} and #{endTime}</if>
+ <if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> and final_assembly_offline_time between #{startTime} and #{endTime}</if>
<if test="engineNoList != null and engineNoList.size() > 0">
and engine_no in
<foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
@@ -89,7 +89,7 @@
<if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
and engine_no in
<foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
- #{engine}
+ #{engine} order by order_no,engine_no
</foreach>
</if>
</where>
--
Gitblit v1.9.3