From 9f7fcb82f43ac4905623b0239d0f3ef7f4079e47 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 08:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 473 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 409 insertions(+), 64 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 cbd6c1e..f825f4a 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
@@ -1,35 +1,46 @@
package com.dy.pmsStation.assemblyStep;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.dy.pmsGlobal.daoPlt.PltProductQualityInspectionItemsMapper;
-import com.dy.pmsGlobal.daoPlt.PltProductTestInspectionItemsMapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.dy.pmsGlobal.daoOth.OthFileMapper;
+import com.dy.pmsGlobal.daoPlt.*;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
import com.dy.pmsGlobal.daoSta.*;
-import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems;
-import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems;
+import com.dy.pmsGlobal.dyFile.FileOperate;
+import com.dy.pmsGlobal.dyFile.FileRestVo;
+import com.dy.pmsGlobal.pojoOth.OthFile;
+import com.dy.pmsGlobal.pojoPlt.*;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
+import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
+import com.dy.pmsGlobal.util.DeviceResult;
+import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
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
public class AssemblyStepSv {
- private static final int STATUS_OK = 1;
- private static final int STATUS_COMPLETE = 2;
- private static final int STATUS_REPAIR = 3;
- private static final int STATUS_WASTE = 4;
+ private static final String WORK_TYPE_ASSEMBLY = "1";
+ private static final String WORK_TYPE_TEST = "2";
+ private static final String WORK_TYPE_INSPECTION = "3";
+ private static final String WORK_TYPE_REPAIR = "4";
+ private static final String WORK_TYPE_OTHER = "5";
private StaDeviceLastMapper deviceLastDao;
private StaDeviceLifeMapper deviceLifeDao;
+ private StaDeviceLifeLastMapper deviceLifeLastDao;
private StaWipSnExMapper wipSnExDao;
private StaDeviceProductionLogMapper deviceProductionLogDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
@@ -39,6 +50,13 @@
private StaRepairInfoMapper repairInfoDao;
private PltProductQualityInspectionItemsMapper qualityItemsDao;
private PltProductTestInspectionItemsMapper testItemsDao;
+ private PltProductMapper productDao;
+ private PltProParamsMapper paramsDao;
+ private PltProductFileMapper productFileDao;
+ private FileOperate fileOperate;
+ private OthFileMapper othFileMapper;
+ @Value("${dy.webFile.fmUrl}")
+ private String fmUrl;
@Autowired
public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
@@ -90,6 +108,36 @@
this.testItemsDao = testItemsDao;
}
+ @Autowired
+ public void setProductDao(PltProductMapper productDao) {
+ this.productDao = productDao;
+ }
+
+ @Autowired
+ public void setParamsDao(PltProParamsMapper paramsDao) {
+ this.paramsDao = paramsDao;
+ }
+
+ @Autowired
+ public void setProductFileDao(PltProductFileMapper productFileDao) {
+ this.productFileDao = productFileDao;
+ }
+
+ @Autowired
+ public void setFileOperate(FileOperate fileOperate) {
+ this.fileOperate = fileOperate;
+ }
+
+ @Autowired
+ public void setOthFileMapper(OthFileMapper othFileMapper) {
+ this.othFileMapper = othFileMapper;
+ }
+
+ @Autowired
+ public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
+ this.deviceLifeLastDao = deviceLifeLastDao;
+ }
+
@Transactional
public int save(QueryVo params) {
long workId = Long.parseLong(params.workId);
@@ -99,29 +147,33 @@
}
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<>();
-
- deviceSet.forEach(device -> {
- if (device.contains(plan.batchNo)) {
- deviceList.add(device);
+ List<Map<String, String>> materialList = new ArrayList<>();
+ List<PltProduct> productList = productDao.selectAll(null);
+ deviceSet.forEach(deviceNo -> {
+ if (deviceNo.contains(plan.batchNo)) {
+ deviceList.add(deviceNo);
} else {
- materialList.add(device);
+ //鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡,濡傛灉鏄�,鍒欐坊鍔犵墿鏂欏埌ex琛ㄤ腑
+ Map<String, String> result = queryByDeviceNo(deviceNo, productList);
+ if (StringUtils.isNotBlank(result.get("proName"))) {
+ materialList.add(result);
+ }
}
});
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));
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
- deviceLastDao.updateByPrimaryKeySelective(deviceLast);
+ deviceLastDao.updateByPrimaryKey(deviceLast);
saveDeviceProductionLog(deviceLast);
@@ -130,7 +182,7 @@
saveDeviceLife(deviceLast);
}
if (CollectionUtils.isNotEmpty(materialList)) {
- saveSnEx(workLast, deviceList, materialList, plan);
+ saveSnEx(workLast, deviceList, materialList);
}
return count;
}
@@ -145,109 +197,297 @@
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 鏍规嵁deviceNo 鎵惧埌瀵瑰簲浠诲姟
+ PrAssemblyPlan assemblyPlan = queryPlanByDeviceNo(deviceNo); //PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
StaDeviceLast preRecord = deviceLastDao.selectByDeviceNo(deviceNo);
if (preRecord != null) {
record.id = preRecord.id;
record.inTime = preRecord.outTime;
+ record.inLineTime = preRecord.inLineTime;
+ 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.planId = assemblyPlan.getId();
record.workId = Long.parseLong(params.workId);
record.stationId = workLast.stationId;
- record.equipNo = deviceNo;
+ record.deviceNo = deviceNo;
record.currNode = workLast.nodeId;
-// record.setNextNode(getNextNode(params.status,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;
+ Boolean isEnd = false;//鏄惁缁忓巻杩囨垨姝ｅ湪缁忓巻缁撴潫鑺傜偣
+ if (workLast.nodeId == null) {
+ if (record.outLineTime != null) {
+ isEnd = true;
+ }
+ if(StringUtils.isNotBlank(params.getContent())){
+ record.nodeContent = params.getContent();
+ }
+ } else {
+ PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
+ record.nodeContent = node.content;
+ if (node.isRecord) {
+ record.deviceCycleContent = node.deviceCycleContent;
+ }
+ if (node.getIsEnd() && record.outLineTime == null) {
+ record.outLineTime = new Date();
+ assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
+ isEnd = true;
+ } else if (record.outLineTime != null) {
+ isEnd = true;
+ }
}
- record.status = getStatus(params.status, node.isEnd);
+ record.status = getStatus(params.status, isEnd, workLast.workType.toString());
+ record.result = getResult(params.status, workLast.workType.toString());
+ assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
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:鍝佹涓嶉�氳繃
+ * 20240717褰撳墠鐘舵�� 鐘舵��: 1, 缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
*
- * @param status 鐘舵��
- * @param isEndNode 鏄惁缁撴潫鑺傜偣
+ * @param status 鐘舵��
+ * @param isEnd 鏄惁缁忓巻杩囩粨鏉熻妭鐐�
* @return 鐘舵��
*/
- private int getStatus(String status, boolean isEndNode) {
- return switch (status) {
- case QrCodeConstant.MarkOk -> isEndNode ? STATUS_COMPLETE : STATUS_OK;
- case QrCodeConstant.MarkUnqualified -> STATUS_REPAIR;
- case QrCodeConstant.MarkWaste -> STATUS_WASTE;
- default -> throw new RuntimeException("鐘舵�侀敊璇�");
- };
+ private Integer getStatus(String status, boolean isEnd, String workType) {
+ //缁勮 2024/07/17 鐩墠缁勮workType 1 鍙湁MarkOk //娴嬭瘯 //鍝佹
+ if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)|| WORK_TYPE_OTHER.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
+ case QrCodeConstant.MarkQualified -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceStatus.REPAIR.getCode();
+ case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ }
+ //缁翠慨
+ throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
}
+ /**
+ * 缁撴灉: 1:閫氳繃,2:娴嬭瘯閫氳繃,3:鍝佹閫氳繃,4:缁翠慨閫氳繃,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃,7:鎶ュ簾
+ *
+ * @param status 鍓嶇鍑烘潵鐨勭姸鎬�
+ * @return 缁撴灉
+ */
+ private Integer getResult(String status, String workType) {
+ //缁勮 涓存椂浠诲姟-鍏朵粬
+ if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_OTHER.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.PASS.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //娴嬭瘯
+ } else if (WORK_TYPE_TEST.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkQualified -> DeviceResult.TEST_PASS.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceResult.TEST_FAIL.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //鍝佹
+ } else if (WORK_TYPE_INSPECTION.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkQualified -> DeviceResult.INSPECTION_PASS.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceResult.INSPECTION_FAIL.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //缁翠慨
+ } else if (WORK_TYPE_REPAIR.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.REPAIR_PASS.getCode();
+ case QrCodeConstant.MarkWaste -> DeviceResult.WASTE.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ }
+ throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
+ }
+
+ @Transactional
public int repair(QueryVo vo) {
long workId = Long.parseLong(vo.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
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;
+ if (preDeviceRecord != null) {
+ repairInfo.fromNode = preDeviceRecord.currNode;
+ }
repairInfoDao.insertSelective(repairInfo);
- StaDeviceLast deviceLast = new StaDeviceLast();
- BeanUtils.copyProperties(preDeviceRecord, deviceLast);
- deviceLast.repairId = repairInfo.id;
- deviceLast.errorCode = vo.errorMsg;
- deviceLast.assistants = vo.assistants;
- //濡傛灉鍘熻妭鐐规槸缁撴潫鑺傜偣鎴栦箣鍚庣殑鑺傜偣锛屾槸鍒欐洿鏂颁负瀹屾垚,鍚﹀垯鏇存柊涓虹粍瑁呬腑(榛樿缁翠慨鑺傜偣鐨勭姸鎬佸彧鑳戒负 纭畾鎴� 鎶ュ簾)
- boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
- if (QrCodeConstant.MarkWaste.equals(vo.status)) {
- deviceLast.status = STATUS_WASTE;
- } else {
- deviceLast.status = isEndNode ? STATUS_COMPLETE : STATUS_OK;
- }
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
+ deviceLast.setRepairId(repairInfo.getId());
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
- deviceLastDao.updateByPrimaryKeySelective(deviceLast);
+ deviceLastDao.updateByPrimaryKey(deviceLast);
saveDeviceProductionLog(deviceLast);
-
- if (isEndNode) {
+ //鍙缁忓巻杩囩粨鏉熻妭鐐�,灏变竴鐩磋褰昫evice life
+ if (preDeviceRecord != null && preDeviceRecord.getOutLineTime() != null) {
saveDeviceLife(deviceLast);
}
return count;
}
+ @Transactional
+ public int testing(QueryVo vo) {
+ long workId = Long.parseLong(vo.workId);
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
+ int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
+ deviceLastDao.updateByPrimaryKey(deviceLast);
+ saveDeviceProductionLog(deviceLast);
+ PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
+ if (node != null && node.isRecord) {
+ saveDeviceLife(deviceLast);
+ }
+ return count;
+ }
+
+ @Transactional
+ public int inspectQuality(QueryVo vo) {
+ long workId = Long.parseLong(vo.workId);
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
+ int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
+ deviceLastDao.updateByPrimaryKey(deviceLast);
+ saveDeviceProductionLog(deviceLast);
+ PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
+ if (node != null && node.isRecord) {
+ saveDeviceLife(deviceLast);
+ }
+ return count;
+ }
+
+ //鏃犱换鍔¤鍒掍腑鐨勫叾浠� 浼爓orkId ,鎵嬪啓宸ヤ綔鍐呭 , 鏁伴噺
+ @Transactional
+ public int otherWork(QueryVo vo) {
+ long workId = Long.parseLong(vo.workId);
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ int count = 0;
+ //淇濆瓨宸ヤ綔璁板綍 //濡傛灉鏈夎澶囩爜
+ if(vo.deviceNo != null && StringUtils.isNotBlank(vo.deviceNo[0])){
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
+ count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
+ deviceLastDao.updateByPrimaryKey(deviceLast);
+ saveDeviceProductionLog(deviceLast);
+ }else{
+ StaDeviceProductionLog log = new StaDeviceProductionLog();
+ log.setId(null); // 璁惧鐢熶骇鏃ュ織ID璁句负null锛岃〃绀烘柊澧�
+ log.setDeviceNo(""); //RepairId planId currNode deviceCycleContent memo
+ log.setWorkId(workId);
+ log.setStationId(workLast.getStationId());
+ log.setNodeContent(vo.getContent());
+ log.setStatus(DeviceStatus.COMPLETED.getCode());//瀹屾垚鐘舵��
+ log.setResult(DeviceResult.PASS.getCode());//閫氳繃
+ log.setErrorMsg(vo.getErrorMsg());
+ log.setAssistants(workLast.getAssistants());
+ log.setInTime(new Date());
+ log.setOutTime(new Date());
+ log.setUpdatedBy(workLast.getUserId());
+ log.setNumber(vo.getNumber());
+ count = deviceProductionLogDao.insertSelective(log);
+
+ }
+ return count;
+ }
+
+ //鏍规嵁鑺傜偣鏌ュ嚭鑺傜偣浣滀笟鎸囧涔�
+ public PrProductionNode getSopByNodeId(String nodeId) {
+ if (com.alibaba.excel.util.StringUtils.isBlank(nodeId)) {
+ throw new RuntimeException("鑺傜偣ID涓嶈兘涓虹┖");
+ }
+ PrProductionNode node = nodeDao.selectByPrimaryKey(Long.parseLong(nodeId));
+ if (node == null) {
+ throw new RuntimeException("鑺傜偣ID涓嶅瓨鍦�,璇锋鏌�");
+ }
+ if (node.instruction != null) {
+ addUrl(node.instruction);
+ }
+ return node;
+ }
+
+ //涓昏鎶�鏈弬鏁� 淇╀釜鏂规硶鍚� platform-->product-->productSv
+ public List<PltProductParams> getParamsByProId(String proId) {
+ if (StringUtils.isBlank(proId)) {
+ throw new RuntimeException("浜у搧ID涓嶈兘涓虹┖");
+ }
+ List<PltProductParams> proParams = paramsDao.selectParams(Long.parseLong(proId));
+ return proParams;
+ }
+
+ // 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢
+ public List<PltProductFile> getFileByProId(String proId) {
+ if (StringUtils.isBlank(proId)) {
+ throw new RuntimeException("浜у搧ID涓嶈兘涓虹┖");
+ }
+ List<PltProductFile> proFiles = productFileDao.selectDocuments(Long.parseLong(proId));
+ proFiles.stream().forEach(doc -> {
+ OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
+ if (file == null) {
+ return;
+ }
+ FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
+ doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
+ doc.orgName = file.orgName;
+ doc.extName = file.extName;
+ });
+ return proFiles;
+ }
+
public List<PltProductQualityInspectionItems> getQualityItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);//item start count
+ params.put("disabled", "0");
//鏌ヨ绗﹀悎鏉′欢鐨勮褰�
return qualityItemsDao.selectSome(params);
}
@@ -255,6 +495,111 @@
public List<PltProductTestInspectionItems> getTestItems(String proId) {
Map<String, Object> params = new HashMap<>();
params.put("proId", proId);
+ params.put("disabled", "0");
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())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private void addUrl(PrWorkingInstruction ins) {
+ if (ins == null || ins.fileId == null) {
+ return;
+ }
+ OthFile file = othFileMapper.selectByPrimaryKey(ins.fileId);
+ if (file == null) {
+ return;
+ }
+ FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
+ ins.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + ins.fileId;
+ ins.orgName = file.orgName;
+ ins.extName = file.extName;
+ }
+
+ private PltProduct addWebUrl(PltProduct pro) {
+ if (pro != null) {
+ if (pro.image != null) {
+ String filePathWithWebUrl = getFilePathWithWebUrl(pro.image);
+ pro.imageWebPath = filePathWithWebUrl;
+ pro.imageWebPathZip = fileOperate.getImgFileZipPath(filePathWithWebUrl);
+ }
+
+ pro.proFiles.stream().forEach(doc -> {
+ OthFile file = othFileMapper.selectByPrimaryKey(doc.fileId);
+ if (file == null) {
+ return;
+ }
+ FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
+ doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
+ doc.orgName = file.orgName;
+ doc.extName = file.extName;
+ });
+ }
+ 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, List<PltProduct> productList) {
+ Map<String, String> map = new HashMap<>();
+ map.put("deviceNo", deviceNo);
+ map.put("proName", "");
+ map.put("proType", "");
+ map.put("proId", "");
+ map.put("proCode", "");
+ //鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡
+ if (CollectionUtils.isEmpty(productList)) {
+ productList = productDao.selectAll(null);
+ }
+ 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.put("deviceNo", deviceNo);
+ map.put("proName", product.getName());
+ map.put("proType", product.getType());
+ BigInteger proId = BigInteger.valueOf(product.getId());
+ map.put("proId", proId.toString());
+ map.put("proCode", product.getCode());
+ }
+ return map;
+ }
+
+ //鏌ヨ浜у搧鎵�鍦ㄧ殑浠诲姟
+ public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
+ String proCode = "";
+ String lotCode = "";
+ if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
+ proCode = deviceNo.substring(3, 6);
+ lotCode = deviceNo.substring(6, 15);
+ }
+ PrAssemblyPlan plan = assemblyPlanDao.selectByDeviceNo(proCode, lotCode);
+ if (plan != null) {
+ plan.setBatchNo(lotCode);
+ }
+ return plan;
+ }
+
+ public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
+ return deviceLifeDao.selectByDeviceNo(deviceNo);
+ }
+
+ public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
+ return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
+ }
+
+
}
--
Gitblit v1.8.0