From 843c50e9c2b35196f5f4c150e33fdc6f6c2d6826 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 09:34:31 +0800
Subject: [PATCH] 测试节点通过后,状态取上一节点状态,而不是默认完成
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 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..9d10fb8 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) {
@@ -126,7 +131,7 @@
}
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
- Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
+ Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo));
// 鍒嗙被璁惧鍙峰拰鐗╂枡鍙�
List<String> deviceList = new ArrayList<>();
List<String> materialList = new ArrayList<>();
@@ -140,7 +145,7 @@
});
if (deviceList.isEmpty()) {
- throw new RuntimeException("璁惧鍙�(" + params.deviceNo + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
+ throw new RuntimeException("璁惧鍙�(" + Arrays.toString(params.deviceNo) + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
}
if (deviceList.size() > 1) {
throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓睘浜庡綋鍓嶄换鍔¤鍒�");
@@ -172,35 +177,59 @@
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) {
//缁勮鏁版嵁
StaDeviceLast record = new StaDeviceLast();
-
+ //pr_assembly_plan input_number +1 鎶曞叆鏁板姞1
+ PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
StaDeviceLast preRecord = deviceLastDao.selectByDeviceNo(deviceNo);
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();
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);
+ if(node.getIsEnd() && record.outLineTime == null){
+ record.outLineTime = new Date();
+ assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
+ }
+ assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
+ record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
+ if(record.status == null){
+ record.status = preRecord.status;
+ }
return record;
}
@@ -218,13 +247,13 @@
}
/**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
+ * 鐘舵��: 0:寰呯敓浜�,1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
*
* @param status 鐘舵��
* @param isEndNode 鏄惁缁撴潫鑺傜偣
* @return 鐘舵��
*/
- private int getStatus(String status, boolean isEndNode,String workType) {
+ private Integer getStatus(String status, boolean isEndNode,String workType) {
//缁勮,缁翠慨
if (WORK_TYPE_ASSEMBLY.equals(workType)||WORK_TYPE_REPAIR.equals(workType)) {
return switch (status) {
@@ -236,7 +265,7 @@
//鍝佹,娴嬭瘯
}else if(WORK_TYPE_INSPECTION.equals(workType)||WORK_TYPE_TEST.equals(workType)){
return switch (status) {
- case QrCodeConstant.MarkOk -> DeviceStatus.COMPLETED.getCode();
+ case QrCodeConstant.MarkOk -> null;//DeviceStatus.COMPLETED.getCode();
case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
default -> throw new RuntimeException("鐘舵�侀敊璇�");
@@ -251,17 +280,17 @@
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
- StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
+ StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo[0]);
StaRepairInfo repairInfo = new StaRepairInfo();
repairInfo.workId = workId;
- repairInfo.equipNo = vo.deviceNo;
+ repairInfo.deviceNo = vo.deviceNo[0];
repairInfo.repairTime = new Date();
repairInfo.repairBy = workLast.userId;
repairInfo.repairReason = vo.errorMsg;
repairInfo.fromNode = preDeviceRecord.currNode;
repairInfoDao.insertSelective(repairInfo);
- StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
@@ -280,7 +309,7 @@
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
- StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
saveDeviceProductionLog(deviceLast);
@@ -389,4 +418,29 @@
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());
+ }
+ /*else{
+ throw new RuntimeException("璇ョ紪鐮�("+deviceNo +")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
+ }*/
+ 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