From 5218032b30db4a1e19ac6bb243b71900a600da28 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 19 三月 2024 10:37:57 +0800
Subject: [PATCH] 设备保养计划修改
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 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 79f3d9c..2fb51e2 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
@@ -2,16 +2,23 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
+import com.kangaroohy.milo.model.ReadWriteEntity;
+import com.kangaroohy.milo.service.MiloService;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;
+
+import javax.websocket.Session;
/**
* 閰嶆柟閰嶇疆瀛愪俊鎭疭ervice涓氬姟灞傚鐞�
@@ -27,6 +34,11 @@
@Autowired
private DaParamCollectionMapper daParamCollectionMapper;
+
+ @Autowired
+ private MiloService miloService;
+
+ Map<String, Session> map = WebSocketUsers.getUsers();
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭�
@@ -112,19 +124,35 @@
}
@Override
- public List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
+ public BsFormulaChildInfo getCount(String productCode, String processesCode) {
+ BsFormulaChildInfo info = new BsFormulaChildInfo();
+ info.setProcessesCode(processesCode);
+ info.setProductCode(productCode);
+ return bsFormulaChildInfoMapper.getCount(info);
+ }
+
+ @Override
+ public BsFormulaChildInfo releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
}
@Override
public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
+ BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
+ checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+ checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
+ bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
if(bsFormulaChildInfos.size()>0){
+ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode());
bsFormulaChildInfos.get(0).setResults("OK");
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getMaterialCode());
+ bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getScanBarcode());
bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
+ bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
addParameterCollection(bsFormulaChildInfo);
+// BsFormulaChildInfo count = bsFormulaChildInfoMapper.getCount(checkInfo);
+// Integer i = count.getCounts();
}else {
return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
}
@@ -139,6 +167,7 @@
daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(bsFormulaChildInfo.getSfcBarcode());
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
@@ -147,4 +176,41 @@
bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
return AjaxResult.success();
}
+
+ @Override
+ public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
+ BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
+ listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
+ String paramCode = bsFormulaChildInfo.getTightenTheArray();
+ if(paramCode.contains("N")){
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ bsFormulaChildInfos.get(0).setResults("NG");
+ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
+ }else {
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ bsFormulaChildInfos.get(0).setResults("OK");
+ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ if (spareField4 != null && !spareField4.isEmpty()) {
+ // 鎵ц鎿嶄綔
+ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ try {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ }
+ return AjaxResult.success("鎵弿鎴愬姛锛�");
+ }
+
+
+
+
}
--
Gitblit v1.9.3