From 50c5856086b9302fb8a8ecfe3db7e32a35c2ccff Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 05 七月 2024 14:32:47 +0800
Subject: [PATCH] -100-1 bug修复
---
jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java | 18 ++++++++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 53 +++++++++++---------------
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 5 +-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 2
4 files changed, 43 insertions(+), 35 deletions(-)
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 0d8c164..9c32991 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
@@ -51,10 +51,9 @@
@GetMapping("/initializedData")
public AjaxResult initializedData(BsFormulaChildInfo bsFormulaChildInfo)
{
- String productNum = "0RSPB001139E3AE5B0000035";
+ String productNum = "";
try {
-
- String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
+ String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".MES_ModuleCode";
Object productNumObject = miloService.readFromOpcUa(str).getValue();
if(ObjectUtil.isNotNull(productNumObject)){
productNum = productNumObject.toString();
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 039a00f..db13317 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
@@ -302,7 +302,7 @@
boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
//娣诲姞鍩虹鍙傛暟
- this.manualWorkstationsAddBasicParameters(daParamCollection);
+// this.manualWorkstationsAddBasicParameters(daParamCollection);
//鍗婅嚜鍔ㄥ伐浣嶏紝鍏堝皢鑷姩鏁版嵁淇濆瓨鍒版暟鎹簱
this.saveParameters(daParamCollection);
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java
index 5e96d8d..b1ff791 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java
@@ -1,9 +1,12 @@
package com.jcdm.main.da.testDeviceInterfaceTemp.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+
+import java.util.Date;
/**
* 娴嬭瘯璁惧鎺ュ彛鏁版嵁澶囦唤瀵硅薄 da_test_device_interface_temp
@@ -66,6 +69,9 @@
@Excel(name = "鍒涘缓鐢ㄦ埛")
private String createUser;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
/** 鏇存敼鐢ㄦ埛 */
@Excel(name = "鏇存敼鐢ㄦ埛")
private String updateUser;
@@ -86,7 +92,17 @@
@Excel(name = "棰勭暀瀛楁4")
private String spareField4;
- public void setId(Long id)
+ @Override
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ @Override
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 99bdc1e..8db214d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -627,14 +627,7 @@
this.headContent.cardCode = rowsData.trolleyYard;
});
this.getListFormulaChild()
- // this.addOverStationCollection()
this.workpieceInformation.inboundTime = this.getCurrentTime()
- const param = {
- processesCode: this.headContent.processesCode,
- }
- fistSetpNumber(param).then(response => {
- console.log("fistSetpNumber------"+response.msg)
- });
},
initializedData(){
@@ -827,6 +820,8 @@
self.getList()
self.cakeLamp.scanFinish = 1
self.cakeLamp.startWork = 1
+ this.cakeLamp.InPlace = 1
+
}
};
},
@@ -848,10 +843,6 @@
console.log("sfc=--"+this.headContent.sfcCode+"--")
if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
&& this.headContent.sfcCode !== undefined){
- // if(scanValue.includes("P9900173252")){
- // this.headContent.yzSfcCode = scanValue
- // this.bindYzSfc();
- // }else
if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){
this.headContent.cardCode = scanValue
this.bindcardCode(scanValue);
@@ -862,30 +853,32 @@
this.serialPortMethod(scanValue)
}
} else {
- if(this.headContent.processesCode === 'OP240'){
+ // if(this.headContent.processesCode === 'OP240'){
this.headContent.sfcCode = scanValue;
this.queryParams.productNum = scanValue;
this.getList()
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
- }else {
- let param = {
- trolleyYard: scanValue
- }
- findBytrolleyYardGetOne(param).then(response => {
- if(response.msg !== '2'){
- this.headContent.sfcCode = response.msg;
- this.queryParams.productNum = response.msg;
- this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- this.getList()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
- }else {
- this.$message('娌℃湁搴忓垪鍙�'+scanValue);
- return
- }
- });
- }
+ this.cakeLamp.InPlace = 1
+ // }else {
+ // let param = {
+ // trolleyYard: scanValue
+ // }
+ // findBytrolleyYardGetOne(param).then(response => {
+ // if(response.msg !== '2'){
+ // this.headContent.sfcCode = response.msg;
+ // this.queryParams.productNum = response.msg;
+ // this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ // this.getList()
+ // this.cakeLamp.scanFinish = 1
+ // this.cakeLamp.startWork = 1
+ // this.cakeLamp.InPlace = 1
+ // }else {
+ // this.$message('娌℃湁搴忓垪鍙�'+scanValue);
+ // return
+ // }
+ // });
+ // }
}
--
Gitblit v1.9.3