From c860ca1d4ceaa4065ac5f0257d7b4181880acedd Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 11 五月 2024 08:59:10 +0800
Subject: [PATCH] -接收工单
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index 07f7325..a555451 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -6,6 +6,7 @@
import java.util.Map;
import java.util.stream.Collectors;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -214,7 +215,7 @@
Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -232,6 +233,53 @@
}
}
+ }
+ return AjaxResult.success(result);
+ }
+
+ @Override
+ public AjaxResult jrmUpdateResults(BsFormulaChildInfo bsFormulaChildInfo) {
+ String result = "";
+ List<BsFormulaChildInfo> bsFormulaChildInfos = new ArrayList<>();
+ List<BsFormulaChildInfo> infos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
+ .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfo::getOperationType, "2")
+ ).stream().filter(x -> StrUtil.isBlank(x.getCollectData())).collect(Collectors.toList());
+
+
+ for (BsFormulaChildInfo formulaChildInfo : infos) {
+ if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
+ bsFormulaChildInfos.add(formulaChildInfo);
+ break;
+ }
+ }
+ if(bsFormulaChildInfos.size()>0){
+ String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode());
+ bsFormulaChildInfos.get(0).setResults("OK");
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getScanBarcode());
+ bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
+ bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
+ jrmAddParameterCollection(bsFormulaChildInfo);
+
+ if (spareField4 != null && !spareField4.isEmpty()) {
+ // 鎵ц鎿嶄綔
+ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ try {
+ result = "3";
+ String strA = bsFormulaChildInfo.getLocationCode() + "A";
+ String strB = bsFormulaChildInfo.getLocationCode() + "B";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }else {
+ result = "1";
}
return AjaxResult.success(result);
}
@@ -303,6 +351,28 @@
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
+ public void jrmAddParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){
+ String scanBarCode = bsFormulaChildInfo.getSfcBarcode();
+ String[] modeleSplit = scanBarCode.split(",");
+// for (String modele : modeleSplit) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
+ daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
+ daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
+ daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
+ daParamCollection.setCollectionTime(new Date());
+ if(bsFormulaChildInfo.getParamCode().contains("B")){
+ daParamCollection.setSfcCode(modeleSplit[1]);
+ }else {
+ daParamCollection.setSfcCode(modeleSplit[0]);
+ }
+// daParamCollection.setSfcCode(modele);
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+// }
+
+ }
+
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
@@ -345,7 +415,7 @@
Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.3