修改更新人

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

@@ -1,40 +1,37 @@
 package com.jeesite.modules.mes.service;
 
-import java.sql.Wrapper;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.lang.func.LambdaUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jeesite.common.cache.CacheUtils;
 import com.jeesite.common.collect.ListUtils;
-import com.jeesite.common.collect.MapUtils;
 import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
+import com.jeesite.common.service.CrudService;
 import com.jeesite.common.service.ServiceException;
 import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.mes.dao.*;
+import com.jeesite.modules.mes.dao.MesProcessProductDao;
+import com.jeesite.modules.mes.dao.MesProductDao;
+import com.jeesite.modules.mes.dao.MesProductHbDao;
+import com.jeesite.modules.mes.dao.MesProductRecordDao;
 import com.jeesite.modules.mes.entity.*;
-import com.jeesite.modules.mes.resp.*;
+import com.jeesite.modules.mes.resp.BindMaterialResp;
+import com.jeesite.modules.mes.resp.MesShiftDataResp;
+import com.jeesite.modules.mes.resp.OpParamsResp;
+import com.jeesite.modules.mes.resp.ParamsResp;
 import com.jeesite.modules.mes.util.CommonUitl;
 import com.jeesite.modules.mes.util.CopyUtil;
-import com.jeesite.modules.sys.dao.UserDao;
+import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.utils.ProtocolParam;
-import io.swagger.models.auth.In;
-import org.apache.poi.util.StringUtil;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.service.CrudService;
 import org.springframework.util.ObjectUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 生产记录Service
  * @author hzd
@@ -815,6 +812,14 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 
 					mesProductRecord.setMaterielSn(materielSn);
 					mesProductRecord.setContent(content);
+
+					if (StringUtils.isNotBlank(userCode)) {
+						User user = new User();
+						user.setUserCode(userCode);
+						user.setUserName(userCode);
+						mesProductRecord.setCurrentUser(user);
+					}
+
 					super.update(mesProductRecord);
 
 					//更新工艺号为400001的工序结果
@@ -827,6 +832,12 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 					mesProductRecord3.setOprno(oldOprno);
 					mesProductRecord3.setContent(content);
 					mesProductRecord3.setMaterielSn(userCode);
+					if (StringUtils.isNotBlank(userCode)) {
+						User user = new User();
+						user.setUserCode(userCode);
+						user.setUserName(userCode);
+						mesProductRecord3.setCurrentUser(user);
+					}
 					mesProductRecordDao.update(mesProductRecord3);
 
 

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

@@ -411,6 +411,7 @@ public class MesProductRecordController extends BaseController {
 			mesProductRecord.getSqlMap().getWhere().and("content", QueryType.EQ, "UDF");
 		}
 	}
+	//设置工位名称
 
 	private void fillProductRecordListFields(List<MesProductRecord> list) {
 		if (ListUtils.isEmpty(list)) {
@@ -4728,7 +4729,7 @@ public class MesProductRecordController extends BaseController {
 				Map<String, Object> map = MapUtils.newHashMap();
 				map.put("lineSn", lineSn);
 				map.put("title", process.getTitle());
-				map.put("oprno", process.getOprno());
+				map.put("oprno", process.getOprno()+process.getTitle());
 				dataList.add(map);
 			}
 			resp.setResult(Global.TRUE);
@@ -4759,6 +4760,7 @@ public class MesProductRecordController extends BaseController {
 			return resp;
 		}
 		try {
+			oprno = oprno.substring(0, 5);
 			Date startTime = parsePdaScanTime(startTimeStr);
 			Date endTime = parsePdaScanTime(endTimeStr);
 			if (startTime == null || endTime == null) {
@@ -4773,6 +4775,11 @@ public class MesProductRecordController extends BaseController {
 			}
 
 			int total = mesPdaScanRecordService.countNormalByQuery(lineSn, oprno, ucode, startTime, endTime);
+			if (total==0){
+				resp.setResult(Global.FALSE);
+				resp.setMessage("未找到相关记录");
+				return resp;
+			}
 			List<MesPdaScanRecord> recordList = mesPdaScanRecordService.findNormalListByQuery(lineSn, oprno, ucode,
 					startTime, endTime);
 			List<Map<String, Object>> dataList = ListUtils.newArrayList();
@@ -4782,11 +4789,17 @@ public class MesProductRecordController extends BaseController {
 				map.put("createDate", DateUtils.formatDate(record.getCreateDate(), "yyyy-MM-dd HH:mm:ss"));
 				dataList.add(map);
 			}
-
 			Map<String, Object> data = MapUtils.newHashMap();
+
+			List<MesLineProcess> processList = mesLineProcessService.findOprnoListByLineSn(lineSn);
+			for (MesLineProcess mesLineProcess : processList) {
+				if (mesLineProcess.getOprno().equals(oprno)){
+					data.put("oprno", oprno+mesLineProcess.getTitle());
+				}
+			}
+
 			data.put("total", total);
 			data.put("lineSn", lineSn);
-			data.put("oprno", oprno);
 			data.put("ucode", ucode);
 			data.put("list", dataList);
 			resp.setResult(Global.TRUE);

src/main/resources/config/application.yml

@@ -163,13 +163,13 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mes_liuan?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  #url: jdbc:mysql://127.0.0.1:3306/ce_liu?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloude_npd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
- # url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
- # username: mes_cloud
- # password: s2ENj7KaEySTC7dW
-  username: root
-  password: 123456
+  url: jdbc:mysql://192.168.9.181:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  username: mes_cloud
+  password: s2ENj7KaEySTC7dW
+ # username: root
+ # password: 123456
   testSql: SELECT 1
 
   #  # Oracle 数据库配置（若使用 12c，请修改 /modules/core/pom.xml 文件，打开 12c 依赖，去掉 11g 依赖）