From 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 24 六月 2024 19:00:22 +0800
Subject: [PATCH] 1，优化人工工位参数采集temp表删除方法 pushGeelycvMesFeedback 2，优化人工工位更新过站记录方法 workpieceRelease 3，优化未绑定小车码弹框提示 4，优化人工工位扫码重复会添加参数采集记录的问题及拧紧数据会添加上物料采集上的问题
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java | 3
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 121 ++++++++++++++++++++---------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java | 3
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 23 ++++-
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java | 5 +
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 36 ++++++++-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java | 5 +
jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml | 11 ++
jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml | 4 +
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java | 3
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 17 +++-
13 files changed, 183 insertions(+), 52 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 a83227a..b22018a 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
@@ -14,6 +14,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
@@ -345,14 +346,26 @@
try {
for (int i = 0; i < split.length; i++) {
daParamCollectionService.pushGeelycvMesFeedback(split[i], bsFormulaChildInfo.getLocationCode());
- String barCode = bsFormulaChildInfo.getProductBarcode();
+
+ String barCode = split[i];
String locationCode = bsFormulaChildInfo.getLocationCode();
- DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
- if (passingStationCollectionOne != null) {
- passingStationCollectionOne.setOutRsSign("1");
- passingStationCollectionOne.setOutboundTime(new Date());
- daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
+
+ if(StringUtils.isNotBlank(locationCode)&&StringUtils.isNotBlank(barCode)){
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setOutRsSign("1");
+ daPassingStationCollection.setOutboundTime(new Date());
+ daPassingStationCollection.setSfcCode(barCode);
+ daPassingStationCollection.setLocationCode(locationCode);
+ int updateDaPassingStation = daPassingStationCollectionService.updateDaPassingStationCollectionBySfcCodeAndLocationCode(daPassingStationCollection);
+ logger.info("鍔犵儹鑶滀汉宸ュ伐浣嶆洿鏂拌繃绔欒褰晆pdateDaPassingStationCollectionBySfcCodeAndLocationCode:鏇存柊浜唟}鏉℃暟鎹�-鏇存柊鏉′欢pack鐮亄}-宸ヤ綅{}",updateDaPassingStation,barCode,locationCode);
}
+
+// DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
+// if (passingStationCollectionOne != null) {
+// passingStationCollectionOne.setOutRsSign("1");
+// passingStationCollectionOne.setOutboundTime(new Date());
+// daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
+// }
}
}catch (Exception e){
}
@@ -405,7 +418,16 @@
);
for (BsFormulaChildInfo formulaChildInfo : infos) {
if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
- bsFormulaChildInfos.add(formulaChildInfo);
+ if(null != formulaChildInfo.getCollectData()){
+ if(!formulaChildInfo.getCollectData().equals(bsFormulaChildInfo.getScanBarcode())){
+ bsFormulaChildInfos.add(formulaChildInfo);
+ }else{
+ result = "2";
+ return AjaxResult.success(result);
+ }
+ }else{
+ bsFormulaChildInfos.add(formulaChildInfo);
+ }
break;
}
}
@@ -437,8 +459,6 @@
}
}
}
- }else {
- result = "1";
}
return AjaxResult.success(result);
}
@@ -514,12 +534,23 @@
daParamCollectionService.pushGeelycvMesFeedback(bsFormulaChildInfo.getProductBarcode(), bsFormulaChildInfo.getLocationCode());
String barCode = bsFormulaChildInfo.getProductBarcode();
String locationCode = bsFormulaChildInfo.getLocationCode();
- DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
- if (passingStationCollectionOne != null) {
- passingStationCollectionOne.setOutRsSign("1");
- passingStationCollectionOne.setOutboundTime(new Date());
- daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
+
+ if(StringUtils.isNotBlank(locationCode)&&StringUtils.isNotBlank(barCode)){
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setOutRsSign("1");
+ daPassingStationCollection.setOutboundTime(new Date());
+ daPassingStationCollection.setSfcCode(barCode);
+ daPassingStationCollection.setLocationCode(locationCode);
+ int updateDaPassingStation = daPassingStationCollectionService.updateDaPassingStationCollectionBySfcCodeAndLocationCode(daPassingStationCollection);
+ logger.info("鏅�氫汉宸ュ伐浣嶆洿鏂拌繃绔欒褰晆pdateDaPassingStationCollectionBySfcCodeAndLocationCode:鏇存柊浜唟}鏉℃暟鎹�-鏇存柊鏉′欢pack鐮亄}-宸ヤ綅{}",updateDaPassingStation,barCode,locationCode);
}
+
+// DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
+// if (passingStationCollectionOne != null) {
+// passingStationCollectionOne.setOutRsSign("1");
+// passingStationCollectionOne.setOutboundTime(new Date());
+// daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
+// }
}catch (Exception e){
}
return AjaxResult.success();
@@ -535,43 +566,53 @@
List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
for (String s : collect) {
if(s.equals("")){
- return AjaxResult.error("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
+ return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
}
}
- BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
- listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
- listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+
+ //娣诲姞鎷х揣鍙傛暟-鍙傛暟閲囬泦琛�
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
+ daParamCollection.setTightenTheArray(bsFormulaChildInfo.getTightenTheArray());
+ daParamCollection.setProductBarcode(bsFormulaChildInfo.getProductBarcode());
+ daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
+ daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
+ daParamCollectionService.addTighteningParameters(daParamCollection);
+
String paramCode = bsFormulaChildInfo.getTightenTheArray();
- if(paramCode.contains("N")){
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ if(paramCode.contains("NG")){
+ /* 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,璇烽噸鏂版壂鎻忥紒");
+*/
+ bsFormulaChildInfo.setResults("NG");
+ bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+ return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}else {
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- if(bsFormulaChildInfos.get(0).getSpareField2()!=null&&bsFormulaChildInfos.get(0).getSpareField3()!=null){
+ //List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ if(bsFormulaChildInfo.getSpareField2()!=null&&bsFormulaChildInfo.getSpareField3()!=null){
String tightenArray = bsFormulaChildInfo.getTightenTheArray().replace("[", "").replace("]", "").replace(" ", "");
String[] tightenDataParts = tightenArray.split(",");
- b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField2()),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField3()));
+ b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfo.getSpareField2()),Double.parseDouble(bsFormulaChildInfo.getSpareField3()));
}
if(b){
- bsFormulaChildInfos.get(0).setResults("OK");
- bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- logger.info("鏌ヨ鏉′欢鍙傛暟锛�"+listQuery);
- logger.info("鏌ヨ缁撴灉锛�"+bsFormulaChildInfos.get(0));
- Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
+ bsFormulaChildInfo.setResults("OK");
+ bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ Integer stepNumber = Integer.valueOf(bsFormulaChildInfo.getStepSort());
try {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
- String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ String spareField4 = bsFormulaChildInfo.getSpareField4();
if (spareField4 != null && !spareField4.isEmpty()) {
// 鎵ц鎿嶄綔
- if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ if(spareField4.equals("1")){
try {
// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
@@ -587,17 +628,19 @@
}
}
}else {
- List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- bsFormulaChildInfos1.get(0).setResults("NG");
+ //List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ bsFormulaChildInfo.setResults("NG");
String originalString = bsFormulaChildInfo.getTightenTheArray();
String modifiedString = originalString.replaceFirst("OK", "NG");
- bsFormulaChildInfos1.get(0).setCollectData(modifiedString);
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos1.get(0));
- return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
+ bsFormulaChildInfo.setCollectData(modifiedString);
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+ return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}
}
- return AjaxResult.success("鎵弿鎴愬姛锛�");
+
+
+ return AjaxResult.success("鎷х揣鎴愬姛锛�");
}
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 e84ac6a..1a378e7 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
@@ -30,6 +30,7 @@
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.restful.qingYan.doman.ChildVO;
@@ -94,6 +95,9 @@
@Autowired
private IDaParamCollectionTempService daParamCollectionTempService;
+
+ @Autowired
+ private IOmProductionOrdeInfoService omProductionOrdeInfoService;
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -312,8 +316,26 @@
//缁檕pc鍙�21
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
if(daParamCollection.getLocationCode().equals("OP240")){
- RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("OP230鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
+ String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "OP230", format.format(new Date()));
+ if("".equals(reportResult)){
+ //鎵ц鎶ュ伐澶辫触鏂规硶
+ }else{
+ //瑙ｆ瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂�
+
+ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂�
+ }
+ logger.info("OP230鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult);
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+// RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
}
+
+
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -525,10 +547,16 @@
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
logger.info("寮傛鏂规硶鎵ц缁撴潫");
logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
- List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
- Long[] array = idsList.toArray(new Long[0]);
- int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+
+ DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
+ daParamCollectionTemp.setSfcCode(packID);
+ daParamCollectionTemp.setLocationCode(stationCode);
+ int i = daParamCollectionTempService.deleteDaParamCollectionTempBySfcCodeAndLocationCode(daParamCollectionTemp);
logger.info("鍒犻櫎涓存椂琛ㄦ暟鎹潯鏁皗}-宸ヤ綅{}-pack鐮亄}",i,stationCode,packID);
+// List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
+// Long[] array = idsList.toArray(new Long[0]);
+// int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+// logger.info("鍒犻櫎涓存椂琛ㄦ暟鎹潯鏁皗}-宸ヤ綅{}-pack鐮亄}",i,stationCode,packID);
});
}catch (Exception e){
System.out.println(e.getMessage());
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java
index 4947b6f..0dc964b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/mapper/DaParamCollectionTempMapper.java
@@ -60,4 +60,6 @@
* @return 缁撴灉
*/
public int deleteDaParamCollectionTempByIds(Long[] ids);
+
+ int deleteDaParamCollectionTempBySfcCodeAndLocationCode(DaParamCollectionTemp daParamCollectionTemp);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
index 293326a..9cdbaec 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/IDaParamCollectionTempService.java
@@ -53,6 +53,9 @@
*/
public int deleteDaParamCollectionTempByIds(Long[] ids);
+ public int deleteDaParamCollectionTempBySfcCodeAndLocationCode(DaParamCollectionTemp daParamCollectionTemp);
+
+
/**
* 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ俊鎭�
*
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
index e233f0e..ef11255 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollectionTemp/service/impl/DaParamCollectionTempServiceImpl.java
@@ -87,6 +87,11 @@
return daParamCollectionTempMapper.deleteDaParamCollectionTempByIds(ids);
}
+ @Override
+ public int deleteDaParamCollectionTempBySfcCodeAndLocationCode(DaParamCollectionTemp daParamCollectionTemp) {
+ return daParamCollectionTempMapper.deleteDaParamCollectionTempBySfcCodeAndLocationCode(daParamCollectionTemp);
+ }
+
/**
* 鍒犻櫎璁惧浜у搧杩囩▼鍙傛暟閲囬泦涓存椂琛ㄤ俊鎭�
*
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
index 6978765..131f9c8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -1,6 +1,7 @@
package com.jcdm.main.da.passingStationCollection.domain;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -51,7 +52,7 @@
private Date inboundTime;
/** 鍑虹珯鏃堕棿 */
-// @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍑虹珯鏃堕棿")
private Date outboundTime;
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java
index 3d52d14..7eb4e5a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/mapper/DaPassingStationCollectionMapper.java
@@ -60,4 +60,6 @@
* @return 缁撴灉
*/
public int deleteDaPassingStationCollectionByIds(Long[] ids);
+
+ int updateDaPassingStationCollectionBySfcCodeAndLocationCode(DaPassingStationCollection daPassingStationCollection);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
index 38e1422..5c3c9cd 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/IDaPassingStationCollectionService.java
@@ -53,6 +53,9 @@
*/
public int updateDaPassingStationCollection(DaPassingStationCollection daPassingStationCollection);
+ public int updateDaPassingStationCollectionBySfcCodeAndLocationCode(DaPassingStationCollection daPassingStationCollection);
+
+
/**
* 鎵归噺鍒犻櫎浜у搧杩囩珯閲囬泦
*
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
index d5ac935..f2c2bd7 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/service/impl/DaPassingStationCollectionServiceImpl.java
@@ -120,6 +120,11 @@
return daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollection);
}
+ @Override
+ public int updateDaPassingStationCollectionBySfcCodeAndLocationCode(DaPassingStationCollection daPassingStationCollection) {
+ return daPassingStationCollectionMapper.updateDaPassingStationCollectionBySfcCodeAndLocationCode(daPassingStationCollection);
+ }
+
/**
* 鎵归噺鍒犻櫎浜у搧杩囩珯閲囬泦
*
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 df3fdb3..331b1d9 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
@@ -47,10 +47,19 @@
//{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","resultCode":"S","resultText":"鎶ュ伐鎴愬姛"},"message":"API璋冪敤鎴愬姛"}
public static String getWorkReportResultFeedback(String productNum,String stationCode,String confirmTime)
{
- String url = getRealmName + "/workReportResultFeedback?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
- HttpResponse response = HttpRequest.get(url).execute();
- HttpRequest httpRequest = HttpRequest.get(url);
- return response.body();
+ String result = "";
+ try {
+ String url = getRealmName + "/workReportResultFeedback?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
+ HttpResponse response = HttpRequest.get(url).execute();
+ HttpRequest httpRequest = HttpRequest.get(url);
+ result = response.body();
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ return result;
+ }
+
+
}
/**
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml
index 3bbb7b4..db23e99 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollectionTemp/DaParamCollectionTempMapper.xml
@@ -170,6 +170,10 @@
delete from da_param_collection_temp where id = #{id}
</delete>
+ <delete id="deleteDaParamCollectionTempBySfcCodeAndLocationCode" parameterType="DaParamCollectionTemp">
+ delete from da_param_collection_temp where sfc_code = #{sfcCode} and location_code = #{locationCode}
+ </delete>
+
<delete id="deleteDaParamCollectionTempByIds" parameterType="String">
delete from da_param_collection_temp where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
diff --git a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
index d5d6350..52f9e15 100644
--- a/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/passingStationCollection/DaPassingStationCollectionMapper.xml
@@ -104,6 +104,17 @@
</trim>
</insert>
+ <update id="updateDaPassingStationCollectionBySfcCodeAndLocationCode" parameterType="DaPassingStationCollection">
+ UPDATE da_passing_station_collection
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="outboundTime != null">outbound_time = #{outboundTime},</if>
+ <if test="outRsSign != null">out_rs_sign = #{outRsSign},</if>
+ </trim>
+ WHERE
+ sfc_code = #{sfcCode}
+ AND location_code = #{locationCode}
+ </update>
+
<update id="updateDaPassingStationCollection" parameterType="DaPassingStationCollection">
update da_passing_station_collection
<trim prefix="SET" suffixOverrides=",">
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b11f999..4872951 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -505,6 +505,8 @@
console.log(response)
if(response.msg === "3"){
this.cakeLamp.release= 1 //鍏佽鏀捐
+ }else if(response.msg === "2"){
+ this.$message.error('鎵爜閲嶅璇烽噸鏂版壂鐮侊紒');
}
this.getListFormulaChild()
});
@@ -700,7 +702,7 @@
}
if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
- self.$message('鎬绘垚鐮佷负绌猴紝璇锋鏌ワ紒')
+ self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
return
}
@@ -739,7 +741,9 @@
});
}
}else {
- self.$message('鏈粦瀹氬皬杞︾爜绂佹鏀捐');
+ self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', {
+ dangerouslyUseHTMLString: true
+ });
}
});
} else if (event.data.includes("[")) {
@@ -750,26 +754,37 @@
for (let i = 0; i < self.formulaChildList.length; i++) {
let formulaChild = self.formulaChildList[i];
let results = formulaChild.results;
+
if (results === '' || results === null || results === 'NG') {
formulaChilds = formulaChild;
break;
}
}
+ if(formulaChilds === ""){
+ self.$message.error('鏈伐浣嶅凡宸ヤ綔瀹屾垚锛�');
+ return;
+ }
const param = {
+ id: formulaChilds.id,
tightenTheArray: event.data,
paramCode: formulaChilds.paramCode,
workOrderNo: self.workpieceInformation.workOrderNo,
productCode: self.workpieceInformation.productCode,
locationCode: self.headContent.processesCode,
productBarcode: self.headContent.sfcCode,
+ spareField1: formulaChilds.spareField1,
+ spareField2: formulaChilds.spareField2,
+ spareField3: formulaChilds.spareField3,
+ spareField4: formulaChilds.spareField4,
+ stepSort: formulaChilds.stepSort
}
if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
return;
}
if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
- addTighteningParameters(param).then(response => {});
updateTighteningFormula(param).then(response => {
+ //addTighteningParameters(param).then(response => {});
self.getListFormulaChild()
}).catch(error =>{
self.getListFormulaChild()
@@ -787,7 +802,7 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
-
+ console.log("sfc=--"+this.headContent.sfcCode+"--")
if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
&& this.headContent.sfcCode !== undefined){
if(scanValue.includes("P9900173252")){
--
Gitblit v1.9.3