From 080b6ef99a53e35fc2c1fd5b4a3ef84e0656c98c Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 16:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/config/WebListenerConfiguration.java | 50 ++++++++++++++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 5 +
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 114 ++++++++++++++++++++++++-------------
3 files changed, 126 insertions(+), 43 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 9d10fb8..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
@@ -53,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 +130,7 @@
public void setOthFileMapper(OthFileMapper othFileMapper) {
this.othFileMapper = othFileMapper;
}
+
@Autowired
public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
this.deviceLifeLastDao = deviceLifeLastDao;
@@ -134,13 +148,25 @@
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);
+ }
}
});
@@ -148,7 +174,7 @@
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));
@@ -162,7 +188,7 @@
saveDeviceLife(deviceLast);
}
if (CollectionUtils.isNotEmpty(materialList)) {
- saveSnEx(workLast, deviceList, materialList, plan);
+ saveSnEx(workLast, deviceList, materialList);
}
return count;
}
@@ -184,12 +210,12 @@
BeanUtils.copyProperties(deviceLast, lastLife);
lastLife.setId(null);
int count = deviceLifeLastDao.updateByDeviceNo(lastLife);
- if (count == 0){
+ 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
@@ -198,8 +224,7 @@
if (preRecord != null) {
record.id = preRecord.id;
record.inTime = preRecord.outTime;
- record.outLineTime = preRecord.outLineTime;
- }else{
+ } else {
record.inTime = new Date();
record.inLineTime = new Date();
assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
@@ -221,27 +246,28 @@
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
- if(node.getIsEnd() && record.outLineTime == null){
+ 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 = 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);
}
}
@@ -253,17 +279,17 @@
* @param isEndNode 鏄惁缁撴潫鑺傜偣
* @return 鐘舵��
*/
- private Integer 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 -> null;//DeviceStatus.COMPLETED.getCode();
case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
@@ -315,31 +341,34 @@
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));
@@ -353,7 +382,7 @@
doc.orgName = file.orgName;
doc.extName = file.extName;
});
- return proFiles;
+ return proFiles;
}
public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
@@ -369,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;
@@ -392,6 +422,7 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
+
private PltProduct addWebUrl(PltProduct pro) {
if (pro != null) {
if (pro.image != null) {
@@ -413,20 +444,21 @@
}
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<>();
+ 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){
+ PltProduct product = productDao.selectByCode(deviceNo.substring(3, 6));
+ if (product != null) {
map.put("proName", product.getName());
map.put("proType", product.getType());
}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/config/WebListenerConfiguration.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/config/WebListenerConfiguration.java
new file mode 100644
index 0000000..b79c88c
--- /dev/null
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/config/WebListenerConfiguration.java
@@ -0,0 +1,50 @@
+package com.dy.pmsStation.config;
+
+import com.dy.common.webListener.GenerateIdSetSuffixListener;
+import jakarta.servlet.ServletContextListener;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class WebListenerConfiguration {
+
+ /**
+ * 鍚姩椤哄簭
+ */
+ //private static final int order_config = 0 ;
+ private static final int order_idSetSuffix = 1 ;
+
+ /*
+ * 瑙ｆ瀽鍚勭***config.xml閰嶇疆鐨凜onfigListener锛屽綋鍓峴pringboot宸ョ▼鏆傛椂涓嶉噰鐢ㄦ绉嶉厤缃柟寮�
+ *
+ @Bean
+ public ConfigListener getGlConfigListener(){
+ return new ConfigListener() ;
+ }
+ /**
+ * 澶栭儴鎻愪緵Listener
+ * @param listener 澶栭儴鎻愪緵Listener
+ * @return 娉ㄥ唽Bean
+ @Bean
+ public ServletListenerRegistrationBean<? extends ServletContextListener> regConfigListener(ConfigListener listener) {
+ ServletListenerRegistrationBean<ConfigListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
+ listenerRegistrationBean.setListener(listener);
+ listenerRegistrationBean.setOrder(order_config);
+ return listenerRegistrationBean;
+ }
+ */
+
+ /**
+ * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屾牴鎹厤缃� 璁剧疆ID浜х敓鍣ㄧ殑鍚庣紑
+ * @return 娉ㄥ唽Bean
+ */
+ @Bean
+ public ServletListenerRegistrationBean<? extends ServletContextListener> regIdSuffixListener() {
+ ServletListenerRegistrationBean<GenerateIdSetSuffixListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
+ listenerRegistrationBean.setListener(new GenerateIdSetSuffixListener());
+ listenerRegistrationBean.setOrder(order_idSetSuffix);
+ return listenerRegistrationBean;
+ }
+
+}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index c995cd0..bd51d42 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -15,6 +15,7 @@
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -220,7 +221,7 @@
if (product != null) {
result.setProId(product.getId());
result.setProName(product.getName());
- String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
result.setDevicePrefix(devicePrefix);
}
}
@@ -308,7 +309,7 @@
}
result.setProId(product.getId());
result.setProName(product.getName());
- String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
+ String devicePrefix = QrCodeConstant.TypeProduct + product.getCode() + assyPlan.getBatchNo();
result.setDevicePrefix(devicePrefix);
return result;
}
--
Gitblit v1.8.0