Browse Source

pda图片路径优化,增加视觉管控OP420

jingbo 1 day ago
parent
commit
7e0ceeb6ef

+ 1 - 1
src/main/java/com/jeesite/modules/mes/web/MesIconsController.java

@@ -147,7 +147,7 @@ public class MesIconsController extends BaseController {
 				fu.setBizType("mesIcons_image");
 				List<FileUpload> finfo = fileUploadService.findList(fu);
 				if(ListUtils.isNotEmpty(finfo)){
-					map.setImg(finfo.get(0).getFileUrl());
+					map.setImg(host+finfo.get(0).getFileUrl());
 				}
 				mapList.add(map);
 			}

+ 23 - 0
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -3066,6 +3066,29 @@ public class MesProductRecordController extends BaseController {
 			}
 
 
+			if (CommonUitl.formatOprno(oprno).equals("OP420")){
+				MesDeviceTime mesDeviceTime = new MesDeviceTime();
+				mesDeviceTime.setSn(sn);
+				mesDeviceTime.setProductCate(lineSn);
+				mesDeviceTime.setOprno("OP400");
+				MesDeviceTime mesDeviceTime1 = mesDeviceTimeService.findInfo(mesDeviceTime);
+				if (!ObjectUtils.isEmpty(mesDeviceTime1)){
+					if(mesDeviceTime1.getEndDate() != null){
+						Date endDate = mesDeviceTime1.getEndDate();
+						long differenceInMillis = System.currentTimeMillis() - endDate.getTime();
+						long twoHoursInMillis = 15 * 60 * 1000;
+						if (differenceInMillis >= twoHoursInMillis) {
+							ret = "RSUD";
+						} else {
+							hashMap.put("Message", "静置时间未到");
+							hashMap.put("Result", "Fail");
+							return hashMap;
+						}
+					}
+				}
+			}
+
+
 			// 开始工作
 			MesDeviceTime mesDeviceTime = new MesDeviceTime();
 			mesDeviceTime.setOprno(oprno);