From 3581b1687306f77b7463c4c0a23d30ddfb6e9bb7 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 28 四月 2024 19:11:22 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 7f64c48..9fea30c 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
@@ -1,5 +1,6 @@
package com.jcdm.main.bs.formulaChild.service.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,9 @@
{
@Autowired
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ @Autowired
+ private IBsFormulaChildInfoService bsFormulaChildInfoService;
@Autowired
private DaParamCollectionMapper daParamCollectionMapper;
@@ -145,15 +149,24 @@
return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
}
+ //1-闈炴湰宸ヤ綅鐗╂枡 2-姝ｅ父鎵弿鍙户缁笅娆� 3-鎵弿缁撴潫宸茬粡鏄渶鍚庝竴浣嶅伐姝�
@Override
public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
- BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
- checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
- checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
- checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
-// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
+ 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")
+ );
+ 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));
@@ -161,10 +174,21 @@
bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
addParameterCollection(bsFormulaChildInfo);
+ if (spareField4 != null && !spareField4.isEmpty()) {
+ // 鎵ц鎿嶄綔
+ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ try {
+ result = "3";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}else {
- return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
+ result = "1";
}
- return AjaxResult.success("鎴愬姛");
+ return AjaxResult.success(result);
}
public void addParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){
@@ -181,7 +205,14 @@
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
- bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
+ .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
+ for (BsFormulaChildInfo info : list) {
+ info.setCollectData("");
+ info.setResults("");
+ bsFormulaChildInfoService.saveOrUpdate(info);
+ }
return AjaxResult.success();
}
--
Gitblit v1.9.3