From b56f0b0c09f150b8a6747b3076ea07053b07a940 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 15:24:10 +0800
Subject: [PATCH] getWorkLast change null to error
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 2238604..f7d2c49 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -36,6 +36,7 @@
private StaDeviceLastMapper deviceLastDao;
private StaDeviceLifeMapper deviceLifeDao;
+ private StaDeviceLifeLastMapper deviceLifeLastDao;
private StaWipSnExMapper wipSnExDao;
private StaDeviceProductionLogMapper deviceProductionLogDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
@@ -116,6 +117,10 @@
public void setOthFileMapper(OthFileMapper othFileMapper) {
this.othFileMapper = othFileMapper;
}
+ @Autowired
+ public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
+ this.deviceLifeLastDao = deviceLifeLastDao;
+ }
@Transactional
public int save(QueryVo params) {
@@ -172,7 +177,16 @@
private void saveDeviceLife(StaDeviceLast deviceLast) {
StaDeviceLife life = new StaDeviceLife();
BeanUtils.copyProperties(deviceLast, life);
+ life.setId(null);
deviceLifeDao.insertSelective(life);
+
+ StaDeviceLifeLast lastLife = new StaDeviceLifeLast();
+ BeanUtils.copyProperties(deviceLast, lastLife);
+ lastLife.setId(null);
+ int count = deviceLifeLastDao.updateByDeviceNo(lastLife);
+ if (count == 0){
+ deviceLifeLastDao.insertSelective(lastLife);
+ }
}
private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast,String deviceNo) {
@@ -189,19 +203,19 @@
record.planId = workLast.planId;
record.workId = Long.parseLong(params.workId);
record.stationId = workLast.stationId;
- record.equipNo = deviceNo;
+ record.deviceNo = deviceNo;
record.currNode = workLast.nodeId;
record.updatedBy = workLast.userId;
- record.assistants = params.assistants;
+ record.assistants = workLast.assistants;
record.errorMsg = params.errorMsg;
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
if (node.isRecord) {
- record.equipCycleContent = node.equipCycleContent;
+ record.deviceCycleContent = node.deviceCycleContent;
}
- record.status = getStatus(params.status, node.isEnd,params.workType);
+ record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
return record;
}
@@ -255,7 +269,7 @@
StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
StaRepairInfo repairInfo = new StaRepairInfo();
repairInfo.workId = workId;
- repairInfo.equipNo = vo.deviceNo;
+ repairInfo.deviceNo = vo.deviceNo;
repairInfo.repairTime = new Date();
repairInfo.repairBy = workLast.userId;
repairInfo.repairReason = vo.errorMsg;
@@ -390,4 +404,26 @@
FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
return fileRestVo.fileWebUrl + file.filePath;
}
+
+ public Map<String,String> queryByDeviceNo(String deviceNo) {
+ Map<String,String> map = new HashMap<>();
+ map.put("deviceNo", deviceNo);
+ map.put("proName", "-");
+ map.put("proType", "-");
+
+ PltProduct product = productDao.selectByCode(deviceNo.substring(3,6));
+ if(product != null){
+ map.put("proName", product.getName());
+ map.put("proType", product.getType());
+ }
+ return map;
+ }
+
+ public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
+ return deviceLifeDao.selectByDeviceNo(deviceNo);
+ }
+
+ public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
+ return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
+ }
}
--
Gitblit v1.8.0