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()) { 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])){ 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>
