From 9abf3d239625426e2664f6dfc3a4bd40247a8d0d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 16 七月 2024 09:08:52 +0800
Subject: [PATCH] add workid in history
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 4b7fb7c..e2f69a2 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
@@ -198,7 +198,10 @@
if (preRecord != null) {
record.id = preRecord.id;
record.inTime = preRecord.outTime;
+ record.outLineTime = preRecord.outLineTime;
}else{
+ record.inTime = new Date();
+ record.inLineTime = new Date();
assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
}
record.outTime = new Date();
@@ -218,7 +221,8 @@
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
- if(node.getIsEnd()){
+ if(node.getIsEnd() && record.outLineTime == null){
+ record.outLineTime = new Date();
assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
}
assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
@@ -415,14 +419,17 @@
public Map<String,String> queryByDeviceNo(String deviceNo) {
Map<String,String> map = new HashMap<>();
map.put("deviceNo", deviceNo);
- map.put("proName", "-");
- map.put("proType", "-");
+ 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());
}
+ /*else{
+ throw new RuntimeException("璇ョ紪鐮�("+deviceNo +")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
+ }*/
return map;
}
--
Gitblit v1.8.0