From eb6733b112d1c6ca85faace02ebda6ae073b5721 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 16 七月 2024 14:47:32 +0800
Subject: [PATCH] fix some error: method save ex and generator id for station
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 174 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 130 insertions(+), 44 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..96edc4a 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
@@ -24,7 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigInteger;
import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -36,6 +38,7 @@
private StaDeviceLastMapper deviceLastDao;
private StaDeviceLifeMapper deviceLifeDao;
+ private StaDeviceLifeLastMapper deviceLifeLastDao;
private StaWipSnExMapper wipSnExDao;
private StaDeviceProductionLogMapper deviceProductionLogDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
@@ -52,46 +55,57 @@
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
private String fmUrl;
+
@Autowired
public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
this.deviceLastDao = deviceLastDao;
}
+
@Autowired
public void setDeviceLifeDao(StaDeviceLifeMapper deviceLifeDao) {
this.deviceLifeDao = deviceLifeDao;
}
+
@Autowired
public void setWipSnExDao(StaWipSnExMapper wipSnExDao) {
this.wipSnExDao = wipSnExDao;
}
+
@Autowired
public void setDeviceProductionLogDao(StaDeviceProductionLogMapper deviceProductionLogDao) {
this.deviceProductionLogDao = deviceProductionLogDao;
}
+
@Autowired
public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
+
@Autowired
public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
this.assemblyPlanDao = assemblyPlanDao;
}
+
@Autowired
public void setNodeDao(PrProductionNodeMapper nodeDao) {
this.nodeDao = nodeDao;
}
+
@Autowired
public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
this.repairInfoDao = repairInfoDao;
}
+
@Autowired
public void setQualityItemsDao(PltProductQualityInspectionItemsMapper qualityItemsDao) {
this.qualityItemsDao = qualityItemsDao;
}
+
@Autowired
public void setTestItemsDao(PltProductTestInspectionItemsMapper testItemsDao) {
this.testItemsDao = testItemsDao;
}
+
@Autowired
public void setProductDao(PltProductMapper productDao) {
this.productDao = productDao;
@@ -117,6 +131,11 @@
this.othFileMapper = othFileMapper;
}
+ @Autowired
+ public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
+ this.deviceLifeLastDao = deviceLifeLastDao;
+ }
+
@Transactional
public int save(QueryVo params) {
long workId = Long.parseLong(params.workId);
@@ -126,24 +145,36 @@
}
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<>();
+ List<Map<String, String>> materialList = new ArrayList<>();
List<PltProduct> productList = productDao.selectAll(null);
- deviceSet.forEach(device -> {
- if (device.contains(plan.batchNo)) {
- deviceList.add(device);
- } else if(isOurProduct(device,productList)){
- materialList.add(device);
+ deviceSet.forEach(deviceNo -> {
+ if (deviceNo.contains(plan.batchNo)) {
+ deviceList.add(deviceNo);
+ } else {
+ //鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡,濡傛灉鏄�,鍒欐坊鍔犵墿鏂欏埌ex琛ㄤ腑
+ PltProduct product = null;
+ if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
+ product = productList.stream().filter(p -> deviceNo.startsWith(QrCodeConstant.TypeProduct + p.getCode())).findFirst().orElse(null);
+ }
+ if(product != null){
+ Map<String, String> map = new HashMap<>();
+ map.put("deviceNo", deviceNo);
+ map.put("proName", product.getName());
+ BigInteger proId = BigInteger.valueOf(product.getId());
+ map.put("proId", proId.toString());
+ materialList.add(map);
+ }
}
});
if (deviceList.isEmpty()) {
- throw new RuntimeException("璁惧鍙�(" + params.deviceNo + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
+ throw new RuntimeException("璁惧鍙�(" + Arrays.toString(params.deviceNo) + ")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
}
if (deviceList.size() > 1) {
- throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓睘浜庡綋鍓嶄换鍔¤鍒�");
+ throw new RuntimeException("鍦ㄤ骇璁惧(" + deviceList.stream().collect(Collectors.joining(",")) + ")鏈変笖鍙兘鏈変竴涓睘浜庡綋鍓嶄换鍔¤鍒�");
}
StaDeviceLast deviceLast = buildDeviceLast(params, workLast, deviceList.get(0));
@@ -157,7 +188,7 @@
saveDeviceLife(deviceLast);
}
if (CollectionUtils.isNotEmpty(materialList)) {
- saveSnEx(workLast, deviceList, materialList, plan);
+ saveSnEx(workLast, deviceList, materialList);
}
return count;
}
@@ -172,71 +203,95 @@
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) {
+ 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;
+ } 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;
}
- private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<String> materialList, PrAssemblyPlan plan) {
- for (String material : materialList) {
+ private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList, List<Map<String, String>> materialList) {
+ for (Map<String, String> material : materialList) {
StaWipSnEx snEx = new StaWipSnEx();
snEx.deviceNo = deviceList.get(0);
- snEx.productId = plan.process.proId;
- snEx.productNo = material;
+ snEx.productNo = material.get("deviceNo");
+ snEx.productName = material.get("proName");
+ snEx.productId = Long.parseLong(material.get("proId"));
snEx.createTime = workLast.startTime;
snEx.createBy = workLast.userId;
- snEx.productName = plan.proName;
+
wipSnExDao.insertSelective(snEx);
}
}
/**
- * 鐘舵��: 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)) {
+ if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
return switch (status) {
- case QrCodeConstant.MarkOk -> isEndNode? DeviceStatus.COMPLETED.getCode(): DeviceStatus.ASSEMBLING.getCode();
+ case QrCodeConstant.MarkOk -> isEndNode ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
case QrCodeConstant.MarkUnqualified, QrCodeConstant.MarkPreUnqualified -> DeviceStatus.REPAIR.getCode();
case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
default -> throw new RuntimeException("鐘舵�侀敊璇�");
};
- //鍝佹,娴嬭瘯
- }else if(WORK_TYPE_INSPECTION.equals(workType)||WORK_TYPE_TEST.equals(workType)){
+ //鍝佹,娴嬭瘯
+ } 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 +306,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,37 +335,40 @@
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);
return count;
}
+
//鏍规嵁鑺傜偣鏌ュ嚭鑺傜偣浣滀笟鎸囧涔�
public PrProductionNode getSopByNodeId(String nodeId) {
- if(com.alibaba.excel.util.StringUtils.isBlank(nodeId)){
+ if (com.alibaba.excel.util.StringUtils.isBlank(nodeId)) {
throw new RuntimeException("鑺傜偣ID涓嶈兘涓虹┖");
}
PrProductionNode node = nodeDao.selectByPrimaryKey(Long.parseLong(nodeId));
- if(node == null){
+ if (node == null) {
throw new RuntimeException("鑺傜偣ID涓嶅瓨鍦�,璇锋鏌�");
}
- if(node.instruction != null){
+ if (node.instruction != null) {
addUrl(node.instruction);
}
- return node;
+ return node;
}
+
//涓昏鎶�鏈弬鏁� 淇╀釜鏂规硶鍚� platform-->product-->productSv
public List<PltProductParams> getParamsByProId(String proId) {
- if(StringUtils.isBlank(proId)){
+ if (StringUtils.isBlank(proId)) {
throw new RuntimeException("浜у搧ID涓嶈兘涓虹┖");
}
List<PltProductParams> proParams = paramsDao.selectParams(Long.parseLong(proId));
- return proParams;
+ return proParams;
}
+
// 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢
public List<PltProductFile> getFileByProId(String proId) {
- if(StringUtils.isBlank(proId)){
+ if (StringUtils.isBlank(proId)) {
throw new RuntimeException("浜у搧ID涓嶈兘涓虹┖");
}
List<PltProductFile> proFiles = productFileDao.selectDocuments(Long.parseLong(proId));
@@ -324,7 +382,7 @@
doc.orgName = file.orgName;
doc.extName = file.extName;
});
- return proFiles;
+ return proFiles;
}
public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
@@ -340,16 +398,17 @@
return testItemsDao.selectSome(params);
}
- private boolean isOurProduct(String deviceNo, List<PltProduct> products){
- if(StringUtils.isNotEmpty(deviceNo) && deviceNo.length() ==22 ){
- for(PltProduct product:products){
- if(deviceNo.startsWith(QrCodeConstant.TypeProduct + product.getCode())){
+ private boolean isOurProduct(String deviceNo, List<PltProduct> products) {
+ if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
+ for (PltProduct product : products) {
+ if (deviceNo.startsWith(QrCodeConstant.TypeProduct + product.getCode())) {
return true;
}
}
}
return false;
}
+
private void addUrl(PrWorkingInstruction ins) {
if (ins == null || ins.fileId == null) {
return;
@@ -363,6 +422,7 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
+
private PltProduct addWebUrl(PltProduct pro) {
if (pro != null) {
if (pro.image != null) {
@@ -384,9 +444,35 @@
}
return pro;
}
+
private String getFilePathWithWebUrl(Long fileId) {
OthFile file = othFileMapper.selectByPrimaryKey(fileId);
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