From 6e3e50ceb896a0da003ff887abdbc2760c9aa979 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 22 七月 2024 13:17:14 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml | 13 ++
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 2
jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue | 23 ++--
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 30 ++++--
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 16 +-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java | 6 +
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 144 ++++++++++++----------------
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 10 +-
jcdm-admin/src/main/resources/application-druid.yml | 4
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 9 +
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4
11 files changed, 135 insertions(+), 126 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index 51f6d02..70f56ed 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/jcdm-admin/src/main/resources/application-druid.yml
@@ -21,8 +21,8 @@
url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm042-Mes
username: sa
# password: JCDM@2023
- password: admin@123
-# password: 1!deshine
+# password: admin@123
+ password: 1!deshine
# password: 123456
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index 5930cf2..6e78dfb 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -1,5 +1,6 @@
package com.jcdm.main.bs.formulaChild.controller;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
@@ -117,12 +118,6 @@
@GetMapping("/fistSetpNumber")
public AjaxResult fistSetpNumber(BsFormulaChildInfo bsFormulaChildInfo)
{
-// try {
-// String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build());
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
Integer stepNumber = 1;
try {
List<BsFormulaChildInfo> op260 = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode()));
@@ -130,7 +125,11 @@
.filter(obj -> obj.getResults() != null && !obj.getResults().isEmpty())
.collect(Collectors.toList());
if(filteredList.size() > 0){
- stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1;
+ if("1".equals(bsFormulaChildInfo.getArtificialNgFlag())){
+ stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort());
+ }else {
+ stepNumber = Integer.valueOf(filteredList.get(filteredList.size()-1).getStepSort())+1;
+ }
}
String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
@@ -144,85 +143,39 @@
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
-// @GetMapping("/noPageListFormulaChild")
-// public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
-// {
-//
-// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
-// .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
-// .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
-// );
-// if (CollUtil.isNotEmpty(list)){
-// List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
-// List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList());
-// list = collect1;
-// list.addAll(collect2);
-// }
-//
-// if("1".equals(bsFormulaChildInfo.getArtificialNgFlag())){
-// List<BsFormulaChildInfoTemp> tempList = bsFormulaChildInfoTempService.list(new LambdaQueryWrapper<BsFormulaChildInfoTemp>()
-// .eq(BsFormulaChildInfoTemp::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
-// .eq(BsFormulaChildInfoTemp::getProductCode, bsFormulaChildInfo.getProductCode())
-// .eq(BsFormulaChildInfoTemp::getSfcCode, bsFormulaChildInfo.getSfcBarcode()));
-//
-// for (int i = 0; i < list.size(); i++) {
-// BsFormulaChildInfo formulaChildInfo = list.get(i);
-// if(i < tempList.size()){
-// BsFormulaChildInfoTemp childInfoTemp = tempList.get(i);
-// if(ObjectUtil.isNotEmpty(childInfoTemp)){
-// formulaChildInfo.setResults(childInfoTemp.getResults());
-// formulaChildInfo.setCollectData(childInfoTemp.getCollectData());
-// bsFormulaChildInfoService.saveOrUpdate(formulaChildInfo);
-// }
-// }
-// if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
-// if(formulaChildInfo.getCollectData().contains("[")){
-// String data = formulaChildInfo.getCollectData();
-// data = data.replace("[", "").replace("]", "").replace(" ", "");
-// String[] tightenDataParts = data.split(",");
-// formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
-// }
-// }
-// }
-//
-// //缁檖lc鍐檔g宸ユ
-// BsFormulaChildInfoTemp lastTemp = tempList.get(tempList.size()-1);
-// try {
-// Integer stepSort = Integer.valueOf(lastTemp.getStepSort()+1);
-// logger.info("ng宸ヤ欢缁檖lc鍐欏伐姝ヤ负:{}---宸ヤ綅{}---pack鐮亄}",stepSort,lastTemp.getProcessesCode(),lastTemp.getSfcCode());
-// String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
-// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(stepSort+1).build());
-// } catch (Exception e) {
-// throw new RuntimeException(e);
-// }
-//
-// //娓呴櫎宸ュ崟鏍囪
-// LambdaUpdateWrapper<OmProductionOrdeInfo> updateWrapper = new LambdaUpdateWrapper<>();
-// updateWrapper.set(OmProductionOrdeInfo::getArtificialNgFlag, "");
-// updateWrapper.eq(OmProductionOrdeInfo::getProductNum, lastTemp.getSfcCode());
-// boolean update = omProductionOrdeInfoService.update(new OmProductionOrdeInfo(), updateWrapper);
-// }else {
-// for (BsFormulaChildInfo formulaChildInfo : list) {
-// if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
-// if(formulaChildInfo.getCollectData().contains("[")){
-// String data = formulaChildInfo.getCollectData();
-// data = data.replace("[", "").replace("]", "").replace(" ", "");
-// String[] tightenDataParts = data.split(",");
-// formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
-// }
-// }
-// }
-// }
-// return getDataTable(list);
-// }
-
@GetMapping("/noPageListFormulaChild")
public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
{
+ if("1".equals(bsFormulaChildInfo.getArtificialNgFlag())){
+ List<BsFormulaChildInfoTemp> tempList = bsFormulaChildInfoTempService.list(new LambdaQueryWrapper<BsFormulaChildInfoTemp>()
+ .eq(BsFormulaChildInfoTemp::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
+ .eq(BsFormulaChildInfoTemp::getProductCode, bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfoTemp::getSfcCode, bsFormulaChildInfo.getSfcBarcode()));
+
+ List<Long> ids = new ArrayList<>();
+ for (int i = 0; i < tempList.size(); i++) {
+ BsFormulaChildInfoTemp childInfoTemp = tempList.get(i);
+ LambdaUpdateWrapper <BsFormulaChildInfo> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.set( BsFormulaChildInfo::getResults, childInfoTemp.getResults());
+ updateWrapper.set( BsFormulaChildInfo::getCollectData, childInfoTemp.getCollectData());
+ updateWrapper.eq( BsFormulaChildInfo::getId, childInfoTemp.getChildId());
+ bsFormulaChildInfoService.update(new BsFormulaChildInfo(),updateWrapper);
+
+ if(i == tempList.size()-1){
+ LambdaUpdateWrapper<OmProductionOrdeInfo> orderInfoUpdateWrapper = new LambdaUpdateWrapper<>();
+ orderInfoUpdateWrapper.set(OmProductionOrdeInfo::getArtificialNgFlag, "");
+ orderInfoUpdateWrapper.eq(OmProductionOrdeInfo::getProductNum, childInfoTemp.getSfcCode());
+ boolean update = omProductionOrdeInfoService.update(new OmProductionOrdeInfo(), orderInfoUpdateWrapper);
+ }
+
+ ids.add(childInfoTemp.getId());
+ }
+ bsFormulaChildInfoTempService.removeByIds(ids);
+ }
List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
- .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
+ .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
);
if (CollUtil.isNotEmpty(list)){
List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
@@ -230,6 +183,7 @@
list = collect1;
list.addAll(collect2);
}
+
for (BsFormulaChildInfo formulaChildInfo : list) {
if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
if(formulaChildInfo.getCollectData().contains("[")){
@@ -240,9 +194,37 @@
}
}
}
+
return getDataTable(list);
}
+// @GetMapping("/noPageListFormulaChild")
+// public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
+// {
+//
+// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+// .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
+// .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode())
+// );
+// if (CollUtil.isNotEmpty(list)){
+// List<BsFormulaChildInfo> collect1 = list.stream().filter(x -> Constants.OK.equals(x.getResults())).collect(Collectors.toList());
+// List<BsFormulaChildInfo> collect2 = list.stream().filter(x -> !Constants.OK.equals(x.getResults())).collect(Collectors.toList());
+// list = collect1;
+// list.addAll(collect2);
+// }
+// for (BsFormulaChildInfo formulaChildInfo : list) {
+// if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
+// if(formulaChildInfo.getCollectData().contains("[")){
+// String data = formulaChildInfo.getCollectData();
+// data = data.replace("[", "").replace("]", "").replace(" ", "");
+// String[] tightenDataParts = data.split(",");
+// formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
+// }
+// }
+// }
+// return getDataTable(list);
+// }
+
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
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 a0387fe..b74e37d 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
@@ -554,15 +554,15 @@
bsFormulaChildInfo.setResults("NG");
bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
-// Integer ngTimes = bsFormulaChildInfo.getNgTimes();
-// bsFormulaChildInfo.setNgTimes(ngTimes+1);
-// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
-//
-// if(bsFormulaChildInfo.getNgTimes() > 3){
-// this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
-// WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
-// return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
-// }
+ Integer ngTimes = bsFormulaChildInfo.getNgTimes();
+ bsFormulaChildInfo.setNgTimes(ngTimes+1);
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ if(bsFormulaChildInfo.getNgTimes() > 3){
+ this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
+ return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
+ }
return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}else {
//List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
@@ -600,7 +600,17 @@
String originalString = bsFormulaChildInfo.getTightenTheArray();
String modifiedString = originalString.replaceFirst("OK", "NG");
bsFormulaChildInfo.setCollectData(modifiedString);
+// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ Integer ngTimes = bsFormulaChildInfo.getNgTimes();
+ bsFormulaChildInfo.setNgTimes(ngTimes+1);
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ if(bsFormulaChildInfo.getNgTimes() > 3){
+ this.recordNgTighteningData(bsFormulaChildInfo.getLocationCode(), bsFormulaChildInfo.getProductCode(), bsFormulaChildInfo.getProductBarcode());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "NG");
+ return AjaxResult.error("瓒呰繃涓夋鎷х揣 pack NG涓嬬嚎锛�");
+ }
return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}
@@ -626,7 +636,7 @@
childInfoTemp.setProcessesCode(childInfo.getProcessesCode());
childInfoTemp.setProductCode(childInfo.getProductCode());
childInfoTemp.setStepSort(childInfo.getStepSort());
-// childInfoTemp.setLineCode(childInfo.getId());
+ childInfoTemp.setChildId(childInfo.getId());
bsFormulaChildInfoTempService.save(childInfoTemp);
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java
index 2750968..f97bf92 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChildInfoTemp/domain/BsFormulaChildInfoTemp.java
@@ -1,5 +1,6 @@
package com.jcdm.main.bs.formulaChildInfoTemp.domain;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
@@ -11,6 +12,7 @@
* @author Yi
* @date 2024-07-15
*/
+@Data
public class BsFormulaChildInfoTemp extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -20,6 +22,10 @@
/** 鎬绘垚鐮� */
@Excel(name = "鎬绘垚鐮�")
+ private Long childId;
+
+ /** 鎬绘垚鐮� */
+ @Excel(name = "鎬绘垚鐮�")
private String sfcCode;
/** 浜х嚎 */
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index b067763..71c8193 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -505,8 +505,8 @@
public void pushGeelycvMesFeedback(String packID, String stationCode) {
logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
-// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String totalResult = "0";
List<DaParamCollectionTemp> paramList = daParamCollectionTempService.list(new LambdaQueryWrapper<DaParamCollectionTemp>().eq(DaParamCollectionTemp::getSfcCode, packID).eq(DaParamCollectionTemp::getLocationCode, stationCode));
if(paramList.size() > 0){
@@ -572,8 +572,8 @@
public void automaticWorkstationPushGeelycvMesFeedback(String packID, String stationCode,List<DaParamCollection> paramList) {
logger.info("杩涘叆宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉昦utomaticWorkstationPushGeelycvMesFeedback",stationCode);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
-// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String totalResult = "0";
if(paramList.size() > 0){
logger.info("杩涘叆宸ヤ綅{}-鎷兼暟鎹�",stationCode);
@@ -659,6 +659,7 @@
@Override
public void enterWeighing(DaParamCollection daParamCollection) {
String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
long timestampMillis = Instant.now().toEpochMilli();
ParentVO parentVO = new ParentVO();
ChildVO childVO = new ChildVO();
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index cf7f1fb..e088503 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -42,7 +42,7 @@
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鏂拌嚜鍔ㄥ伐绔�
- public List<String> automaticList = Arrays.asList("POP270","POP282", "POP281", "POP283", "POP285", "POP286", "POP290","OP365","POP300", "POP320", "POP400");
+ public List<String> automaticList = Arrays.asList("POP270", "POP281", "POP283", "POP285", "POP286", "POP290","OP365","POP300", "POP320", "POP400");
//閲囬泦妯＄粍宸ヤ綅 ModuleCode
public List<String> moduleCodeList = Arrays.asList("POP281","POP282","POP283","POP285","OP365", "POP286", "POP284");
@@ -51,7 +51,7 @@
public List<String> agvId = Arrays.asList("POP290", "POP320", "POP400","POP270");
//娴嬭瘯璁惧鎵嬪姩宸ヤ綅
- public List<String> testList = Arrays.asList("POP360-1","POP360-2","POP360-3","POP360-4","POP410-1","POP410-2","POP410-3","POP370","POP420-1","POP420-2","POP420-3");
+ public List<String> testList = Arrays.asList("POP360-1","POP360-2","POP360-3","POP360-4","POP410-1","POP410-2","POP410-3","POP370","POP420-1","POP420-2","POP420-3","POP282");
//绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index 8cc1b31..9b982fd 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -16,13 +16,13 @@
System.out.println("resultCode: " + resultCode);
}
- public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
-//
- public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
+// public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
+////
+// public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
-// public static final String getRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration";
+ public static final String getRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration";
-// public static final String postRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/interface";
+ public static final String postRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/interface";
public static final String siteCode = "3983";
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index c1bd0af..4e32574 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -102,7 +102,7 @@
daTestDeviceInterface.setCheckList(s);
daTestDeviceInterface.setCreateTime(new Date());
daTestDeviceInterfaceService.save(daTestDeviceInterface);
- if(parentVO.getStationCode().contains("OP480")){
+ if(parentVO.getStationCode().contains("POP410")){
if(StringUtils.isNotBlank(parentVO.getProductNum())){
OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum()));
if(ObjectUtil.isNotNull(one)){
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml
index ac0cd99..5f08819 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChildInfoTemp/BsFormulaChildInfoTempMapper.xml
@@ -32,10 +32,12 @@
<result property="ngTimes" column="ng_times" />
<result property="ngCollectData" column="ng_collect_data" />
<result property="ngResults" column="ng_results" />
+ <result property="childId" column="child_id" />
+
</resultMap>
<sql id="selectBsFormulaChildInfoTempVo">
- select id, sfc_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field1, spare_field2, spare_field3, spare_field4, collect_data, results, ng_times, ng_collect_data, ng_results from bs_formula_child_info_temp
+ select id, sfc_code, child_id,line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field1, spare_field2, spare_field3, spare_field4, collect_data, results, ng_times, ng_collect_data, ng_results from bs_formula_child_info_temp
</sql>
<select id="selectBsFormulaChildInfoTempList" parameterType="BsFormulaChildInfoTemp" resultMap="BsFormulaChildInfoTempResult">
@@ -102,7 +104,8 @@
<if test="ngTimes != null">ng_times,</if>
<if test="ngCollectData != null">ng_collect_data,</if>
<if test="ngResults != null">ng_results,</if>
- </trim>
+ <if test="childId != null">child_id,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sfcCode != null">#{sfcCode},</if>
<if test="lineCode != null">#{lineCode},</if>
@@ -130,7 +133,9 @@
<if test="ngTimes != null">#{ngTimes},</if>
<if test="ngCollectData != null">#{ngCollectData},</if>
<if test="ngResults != null">#{ngResults},</if>
- </trim>
+ <if test="childId != null">#{childId},</if>
+
+ </trim>
</insert>
<update id="updateBsFormulaChildInfoTemp" parameterType="BsFormulaChildInfoTemp">
@@ -162,6 +167,8 @@
<if test="ngTimes != null">ng_times = #{ngTimes},</if>
<if test="ngCollectData != null">ng_collect_data = #{ngCollectData},</if>
<if test="ngResults != null">ng_results = #{ngResults},</if>
+ <if test="childId != null">child_id = #{childId},</if>
+
</trim>
where id = #{id}
</update>
diff --git a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
index ae6a172..38f81c4 100644
--- a/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/heatingFilmTerminal/index.vue
@@ -244,7 +244,7 @@
import {listWorkReport} from "@/api/main/om/workReport/workReport";
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
- clearWorkpieceRelease,
+ clearWorkpieceRelease, inPlaceInspection,
jrmUpdateResults, jrmWorkpieceRelease,
listFormulaChild,
noPageListFormulaChild,
@@ -332,8 +332,8 @@
content: '',
activeName: 'first',
// url: "ws://192.168.2.248:8080/websocket/message/",
- url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.2.76:8080/websocket/message/",
+ // url: "ws://10.103.210.248:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -593,12 +593,11 @@
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- if(this.headContent.processesCode === 'OP240'){
- this.onLineBinDing = true
- }
- if(this.headContent.processesCode === 'OP260'){
- this.showInput = true
- }
+
+ inPlaceInspection({processesCode: this.headContent.processesCode}).then(response => {
+ console.log(response)
+ this.cakeLamp.InPlace = response.data
+ });
console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
@@ -682,16 +681,20 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.module !== ''){
+ console.log('this.headContent.module !== \'\' true')
this.$message('鎵爜妯＄粍鐗╂枡鐮�'+scanValue);
this.serialPortMethod(scanValue)
} else {
- if(scanValue.includes("ORSM")){
+ console.log('this.headContent.module !== \'\' false')
+ if(scanValue.includes("0RSMB")){
this.headContent.module = scanValue;
this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
this.getList()
// this.cakeLamp.InPlace = 1
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
+ }else {
+ this.$message.error('鎵爜璇嗗埆閿欒鐨勪骇鍝佸簭鍒楀彿'+scanValue+'璇烽噸鏂版壂鐮�');
}
}
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b230e60..94f9903 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -394,8 +394,8 @@
content: '',
activeName: 'first',
// url: "ws://192.168.2.248:8080/websocket/message/",
- url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.2.76:8080/websocket/message/",
+ // url: "ws://10.103.210.248:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -426,7 +426,6 @@
originalArray: [],
yzSfcFlag: 1,
endYz: false,
- artificialNgFlag: null,
}
},
beforeDestroy() {
@@ -536,12 +535,10 @@
// this.formulaChildList = []
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
- console.log(this.artificialNgFlag)
- if(this.artificialNgFlag !== null){
- this.formulaChildParams.artificialNgFlag = this.artificialNgFlag
+ if(this.formulaChildParams.artificialNgFlag !== null){
this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
}
- console.log(this.formulaChildParams)
+ console.log("getListFormulaChild"+this.formulaChildParams.artificialNgFlag)
noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
if (this.formulaChildList.length >0){
@@ -619,13 +616,14 @@
this.workpieceInformation.productModel = rowsData.productModel;
this.workpieceInformation.productName = rowsData.productName;
this.headContent.cardCode = rowsData.trolleyYard;
- this.artificialNgFlag = rowsData.artificialNgFlag;
+ this.formulaChildParams.artificialNgFlag = rowsData.artificialNgFlag;
});
this.getListFormulaChild()
// this.addOverStationCollection()
this.workpieceInformation.inboundTime = this.getCurrentTime()
const param = {
processesCode: this.headContent.processesCode,
+ productCode: this.workpieceInformation.productCode
}
fistSetpNumber(param).then(response => {
console.log("fistSetpNumber------"+response.msg)
@@ -800,6 +798,8 @@
self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
return;
}
+ self.formulaChildParams.artificialNgFlag = null
+ console.log("self.formulaChildParams.artificialNgFlag"+self.formulaChildParams.artificialNgFlag)
if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
updateTighteningFormula(param).then(response => {
//addTighteningParameters(param).then(response => {});
--
Gitblit v1.9.3