OP500拍照检验

src/main/java/com/jeesite/modules/mes/service/MesProductRecordService.java

@@ -13,6 +13,8 @@ import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.common.service.ServiceException;
+import com.jeesite.modules.file.entity.FileUpload;
+import com.jeesite.modules.file.service.FileUploadService;
 import com.jeesite.modules.file.utils.FileUploadUtils;
 import com.jeesite.modules.mes.dao.*;
 import com.jeesite.modules.mes.entity.*;
@@ -47,6 +49,9 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 	private MesProductCateService mesProductCateService;
 
 	@Autowired
+	private FileUploadService fileUploadService;
+	@Autowired
+
 	private MesTemplateItemsService mesTemplateItemsService;
 
 	@Autowired
@@ -533,6 +538,29 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 		return "RSNS";
 	}
 
+	public boolean checkOP500Photo(String sn,String lineSn){
+
+		MesProductRecord mesProductRecord=new MesProductRecord();
+		mesProductRecord.setSn(sn);
+		mesProductRecord.setLineSn(lineSn);
+		mesProductRecord.setOprno("OP500A");
+		mesProductRecord.setCraft("100000");
+		MesProductRecord mesProductRecord1 = findInfo(mesProductRecord);
+		if (mesProductRecord1==null){
+			return false;
+		}
+
+		FileUpload fu = new FileUpload();
+		fu.setBizKey(mesProductRecord1.getId());
+		fu.setBizType("mesProductRecord_image");
+		List<FileUpload> finfo = fileUploadService.findList(fu);
+		if (finfo==null){
+			return false;
+		}
+		return true;
+	}
+
+
 	// 多个件同时工作
 	@Transactional
 	public void updateMultipleRecords(String sn, String oprno, String craft, String content, String userCode, List<ParamsResp> paramsResps,String lineSn,List<BindMaterialResp> bmlists){

src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -362,7 +362,6 @@ public class MesProductRecordController extends BaseController {
 			if(!ObjectUtils.isEmpty(mt)){
 				page.getList().get(i).setMessageType(mt.getCate());
 				page.getList().get(i).setTitle(mt.getTitle());
-
 			}
 		}
 		return page;
@@ -3700,13 +3699,13 @@ public class MesProductRecordController extends BaseController {
 			return CommonUitl.getXml("NG;参数错误;");
 		}
 
+
 		String[] commands = commandString.split(";", -1);
 		// 01--序号检查  04--结果上传  05--序号过站
 		if (!commands[0].equals("01") && !commands[0].equals("04") && !commands[0].equals("05")) {
 			return CommonUitl.getXml("NG;命令错误;");
 		} else {
 			if (("01").equals(commands[0])) {
-
 				if (commands.length != 8 ) {
 					return CommonUitl.getXml("NG;长度错误;");
 				}
@@ -3715,12 +3714,20 @@ public class MesProductRecordController extends BaseController {
 				String lineSn = "XT";
 				String oldOprno = oprno;
 				oprno = CommonUitl.formatOprno(oprno);
+
+
 				if (StringUtils.isEmpty(sn)) {
 					return CommonUitl.getXml("NG;工件码不能为空;");
 				}
 				if (StringUtils.isEmpty(oprno)) {
 					return CommonUitl.getXml("NG;工位号不能为空;");
 				}
+				Boolean checkOP500Photo = mesProductRecordService.checkOP500Photo(sn, lineSn);
+
+				if (!checkOP500Photo){
+					return CommonUitl.getXml("OP500未拍照或未加工");
+				}
+
 				String userCode = commands[1];
 				String ret = checkQualityResult(oldOprno, sn, lineSn, userCode);
 				if (ret.equals("RSUD")) {
@@ -3756,6 +3763,7 @@ public class MesProductRecordController extends BaseController {
 		return CommonUitl.getXml("NG;参数错误;");
 	}
 
+
 	@PostMapping(value = "cc")
 	@ResponseBody
 	public String cc(HttpServletRequest request) {