From 2aae2ddd866c3fc88f37c44f69a38f6de076b502 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 12 七月 2024 10:39:55 +0800
Subject: [PATCH] 人工工位未做完工序给plc回22 未扫总成码回26
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 11 +++--------
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 15 +++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java | 3 +++
jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js | 9 +++++++++
4 files changed, 30 insertions(+), 8 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 c22e90c..b93706a 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
@@ -46,6 +46,21 @@
private MiloService miloService;
/**
+ * 鏈仛瀹屽伐搴忓洖澶峱lc淇″彿
+ */
+ @GetMapping("/unfinishedProcess")
+ public AjaxResult unfinishedProcess(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ try {
+ String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(bsFormulaChildInfo.getRecordDataDone()).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return AjaxResult.success();
+ }
+
+ /**
* 鎵爜纭
*/
@GetMapping("/initializedData")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
index ee0cf8c..21a304d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
@@ -116,6 +116,9 @@
private String workOrderNo;
@TableField(exist = false)
+ private Integer recordDataDone;
+
+ @TableField(exist = false)
private Date collectionTime;
@TableField(exist = false)
diff --git a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
index 28432d8..fab2be7 100644
--- a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
+++ b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
@@ -37,6 +37,15 @@
})
}
+export function unfinishedProcess(query) {
+ return request({
+ url: '/bs/formulaChild/unfinishedProcess',
+ method: 'get',
+ params: query
+
+ })
+}
+
// 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
export function initializedData(query) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index ec1cb6a..3d4e227 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -302,7 +302,7 @@
fistSetpNumber, initializedData,
listFormulaChild,
noPageListFormulaChild,
- releaseCheck,
+ releaseCheck, unfinishedProcess,
updateResults,
updateTighteningFormula,
workpieceRelease
@@ -738,18 +738,13 @@
if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
return;
}
- // if(self.headContent.cardCode === null || self.headContent.cardCode === ''){
- // self.$alert('<strong style="color: red;font-size: 30px">鏈壂鎻忓皬杞︾爜绂佹鏀捐</strong>', '鎻愮ず', {
- // dangerouslyUseHTMLString: true
- // });
- // return;
- // }
-
if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
self.$message('鏈仛瀹屽伐搴忕姝㈡斁琛�');
+ unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
return;
}
--
Gitblit v1.9.3