From 1e8e849c1cbd576dde8dc01efc63f80cf602e2eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 06 七月 2024 10:00:00 +0800
Subject: [PATCH] station name can not have the same name
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 546fbeb..674443e 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
@@ -194,6 +194,7 @@
record.updatedBy = workLast.userId;
record.assistants = params.assistants;
+ record.errorMsg = params.errorMsg;
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
@@ -389,4 +390,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.selectByEquipNo(deviceNo);
+ }
+
+ public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
+ return deviceProductionLogDao.selectByEquipNo(devoiceNo);
+ }
}
--
Gitblit v1.8.0