From 9000814f7ceba006c7d36c51d06666ba6dfddf6c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 11:33:08 +0800
Subject: [PATCH] change equip to device
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 11 ++++++-----
1 files changed, 6 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 674443e..0c23c40 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
@@ -52,6 +52,7 @@
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
private String fmUrl;
+
@Autowired
public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
this.deviceLastDao = deviceLastDao;
@@ -189,7 +190,7 @@
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;
@@ -199,7 +200,7 @@
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
if (node.isRecord) {
- record.equipCycleContent = node.equipCycleContent;
+ record.deviceCycleContent = node.equipCycleContent;
}
record.status = getStatus(params.status, node.isEnd,params.workType);
return record;
@@ -255,7 +256,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;
@@ -406,10 +407,10 @@
}
public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
- return deviceLifeDao.selectByEquipNo(deviceNo);
+ return deviceLifeDao.selectByDeviceNo(deviceNo);
}
public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
- return deviceProductionLogDao.selectByEquipNo(devoiceNo);
+ return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
}
}
--
Gitblit v1.8.0