From e2670e7912ea7316d1f9fb518d980b8a4ef94055 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 四月 2024 10:23:28 +0800
Subject: [PATCH] 点位订阅
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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..91899ee 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
@@ -39,6 +39,9 @@
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
@Autowired
+ private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+ @Autowired
private DaParamCollectionMapper daParamCollectionMapper;
@Autowired
@@ -145,15 +148,23 @@
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));
+ String result = "";
+// BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
+// checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+// checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
+//// checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
+// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
+ .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfo::getMaterialCode, bsFormulaChildInfo.getScanBarcode().substring(1, 2))
+ );
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 +172,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 +203,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