From 9a5b0bb58eb2afdf5d98ac12823c496839392866 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 09 四月 2024 08:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 3081f83..1023a88 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,17 +2,26 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
+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涓氬姟灞傚鐞�
@@ -21,13 +30,21 @@
* @date 2023-12-26
*/
@Service
-public class BsFormulaChildInfoServiceImpl implements IBsFormulaChildInfoService
+public class BsFormulaChildInfoServiceImpl extends ServiceImpl<BsFormulaChildInfoMapper,BsFormulaChildInfo> implements IBsFormulaChildInfoService
{
@Autowired
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
@Autowired
private DaParamCollectionMapper daParamCollectionMapper;
+
+ @Autowired
+ private MiloService miloService;
+
+ @Autowired
+ private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
+
+ Map<String, Session> map = WebSocketUsers.getUsers();
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭�
@@ -130,17 +147,17 @@
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);
+ checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
+// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
if(bsFormulaChildInfos.size()>0){
+ 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());
addParameterCollection(bsFormulaChildInfo);
-// BsFormulaChildInfo count = bsFormulaChildInfoMapper.getCount(checkInfo);
-// Integer i = count.getCounts();
}else {
return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
}
@@ -169,6 +186,7 @@
public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
+ listQuery.setOperationType("1");
String paramCode = bsFormulaChildInfo.getTightenTheArray();
if(paramCode.contains("N")){
List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
@@ -181,6 +199,25 @@
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 {
+// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+// daPassingStationCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+// daPassingStationCollections.get(0).setOutboundTime(new Date());
+// daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+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