修改首件检查

src/main/java/com/jeesite/modules/mes/entity/MesProductCheckOne.java

@@ -5,6 +5,7 @@ import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import lombok.Getter;
 
 import javax.validation.constraints.Size;
 import java.util.Date;
@@ -19,6 +20,7 @@ import java.util.List;
 		@Column(name="oprno", attrName="oprno", label="工位号"),
 		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
 		@Column(name="result", attrName="result", label="结果"),
+		@Column(name="remark", attrName="remark", label="备注"),
 		@Column(name="confirm_check", attrName="confirmCheck", label="确认检查", comment="确认检查(0待确认,1已确认)"),
 		@Column(name="create_by", attrName="createBy", label="create_by", isUpdate=false, isQuery=false),
 		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isUpdateForce=true),
@@ -33,6 +35,8 @@ public class MesProductCheckOne extends DataEntity<MesProductCheckOne> {
 	private String oprno;
 	private String lineSn;
 	private String result;
+	@Getter
+	private String remark;
 	private String confirmCheck;
 	private String urlString;
 	private List img = ListUtils.newArrayList();
@@ -41,6 +45,10 @@ public class MesProductCheckOne extends DataEntity<MesProductCheckOne> {
 		this(null);
 	}
 
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	public MesProductCheckOne(String id) {
 		super(id);
 	}

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

@@ -840,7 +840,7 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 							mesProductCheckOne1.setSn(sn);
 							mesProductCheckOne1.setOprno(checkOprno);
 							mesProductCheckOne1.setLineSn(lineSn);
-							mesProductCheckOne1.setResult("NG");
+							mesProductCheckOne1.setResult("UDF");
 							mesProductCheckOne1.setConfirmCheck("0");
 							mesProductCheckOne1.setCreateBy(userCode);
 							mesProductCheckOne1.setUpdateBy(userCode);

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

@@ -12,7 +12,6 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.utils.excel.ExcelExport;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.file.entity.FileUpload;
-import com.jeesite.modules.file.entity.FileUploadParams;
 import com.jeesite.modules.file.service.FileUploadService;
 import com.jeesite.modules.mes.dingtalk.MesDingTalkAlertService;
 import com.jeesite.modules.mes.entity.*;
@@ -1602,7 +1601,7 @@ public class MesProductRecordController extends BaseController {
 						mesProductCheckOne1.setSn(sn);
 						mesProductCheckOne1.setOprno(checkOprno);
 						mesProductCheckOne1.setLineSn(lineSn);
-						mesProductCheckOne1.setResult("NG");
+						mesProductCheckOne1.setResult("UDF");
 						mesProductCheckOne1.setConfirmCheck("0");
 						mesProductCheckOne1.setCreateBy("system");
 						mesProductCheckOne1.setUpdateBy("system");
@@ -5409,6 +5408,7 @@ public class MesProductRecordController extends BaseController {
 			String sn = firstNotBlank(mesProductCheckOne.getSn(), request.getParameter("sn"));
 			String oprno = firstNotBlank(mesProductCheckOne.getOprno(), request.getParameter("oprno"));
 			String lineSn = firstNotBlank(mesProductCheckOne.getLineSn(), request.getParameter("lineSn"));
+			String remark = firstNotBlank(mesProductCheckOne.getRemark(), request.getParameter("remark"));
 			String result = normalizeCheckOneResult(firstNotBlank(mesProductCheckOne.getResult(), request.getParameter("result")));
 			String confirmCheck = firstNotBlank(mesProductCheckOne.getConfirmCheck(), request.getParameter("confirmCheck"));
 			String userCode = firstNotBlank(request.getParameter("ucode"), request.getParameter("userCode"),
@@ -5456,8 +5456,10 @@ public class MesProductRecordController extends BaseController {
 			if (StringUtils.isNotBlank(userCode)) {
 				record.setUpdateBy(userCode);
 			}
+			if (StringUtils.isNotBlank(remark)) {
+				record.setRemark(remark);
+			}
 			mesProductCheckOneService.save(record);
-			uploadCheckOneImages(record, request);
 			fillCheckOneImages(record, request);
 
 			resp.setData(record);
@@ -5546,30 +5548,6 @@ public class MesProductRecordController extends BaseController {
 		}
 	}
 
-	private void uploadCheckOneImages(MesProductCheckOne record, HttpServletRequest request) {
-		if (record == null || StringUtils.isBlank(record.getId()) || !(request instanceof MultipartHttpServletRequest)) {
-			return;
-		}
-		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-		Iterator<String> fileNames = multipartRequest.getFileNames();
-		while (fileNames.hasNext()) {
-			String fileName = fileNames.next();
-			List<MultipartFile> files = multipartRequest.getFiles(fileName);
-			for (MultipartFile file : files) {
-				if (file == null || file.isEmpty()) {
-					continue;
-				}
-				FileUploadParams params = new FileUploadParams();
-				params.setFile(file);
-				params.setFileName(file.getOriginalFilename());
-				params.setBizKey(record.getId());
-				params.setBizType(CHECK_ONE_IMAGE_BIZ_TYPE);
-				params.setUploadType(FileUpload.TYPE_IMAGE);
-				fileUploadService.uploadFile(params);
-			}
-		}
-	}
-
 	private void fillCheckOneImages(MesProductCheckOne record, HttpServletRequest request) {
 		if (record == null || StringUtils.isBlank(record.getId())) {
 			return;
@@ -5581,19 +5559,21 @@ public class MesProductRecordController extends BaseController {
 		List<FileUpload> finfo = fileUploadService.findList(fu);
 		List imgList = ListUtils.newArrayList();
 		StringBuilder urlStringBuilder = new StringBuilder();
-		for (FileUpload fi : finfo) {
-			Map<String, Object> map = MapUtils.newHashMap();
-			map.put("id", fi.getFileEntity() == null ? fi.getId() : fi.getFileEntity().getFileId());
-			map.put("url", host + fi.getFileUrl());
-			map.put("name", fi.getFileName());
-			map.put("size", fi.getFileEntity() == null ? null : fi.getFileEntity().getFileSize());
-			if (StringUtils.isNotBlank(fi.getFileUrl())) {
-				if (urlStringBuilder.length() > 0) {
-					urlStringBuilder.append("|");
+		if (ListUtils.isNotEmpty(finfo)) {
+			for (FileUpload fi : finfo) {
+				Map<String, Object> map = MapUtils.newHashMap();
+				map.put("id", fi.getFileEntity() == null ? fi.getId() : fi.getFileEntity().getFileId());
+				map.put("url", host + fi.getFileUrl());
+				map.put("name", fi.getFileName());
+				map.put("size", fi.getFileEntity() == null ? null : fi.getFileEntity().getFileSize());
+				if (StringUtils.isNotBlank(fi.getFileUrl())) {
+					if (urlStringBuilder.length() > 0) {
+						urlStringBuilder.append("|");
+					}
+					urlStringBuilder.append(fi.getFileUrl());
 				}
-				urlStringBuilder.append(fi.getFileUrl());
+				imgList.add(map);
 			}
-			imgList.add(map);
 		}
 		record.setUrlString(urlStringBuilder.toString());
 		record.setImg(imgList);