From a52d0875e95d60d228367f24fc937274df0b4244 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 18 五月 2024 08:56:15 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue | 2 +-
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/ProductionOrderComponentRequest.java | 9 +++++++++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2 +-
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/RestFulOrder.java | 12 ++++++++++++
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 1 +
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index d000934..7319f6b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -95,6 +95,7 @@
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
omProductionOrdeInfo.setCreateTime(new Date());
omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/ProductionOrderComponentRequest.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/ProductionOrderComponentRequest.java
new file mode 100644
index 0000000..1c677f6
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/ProductionOrderComponentRequest.java
@@ -0,0 +1,9 @@
+package com.jcdm.main.restful.qingYan.doman;
+
+import lombok.Data;
+
+@Data
+public class ProductionOrderComponentRequest {
+ private String materialCode;
+ private String operationSteps;
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/RestFulOrder.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/RestFulOrder.java
new file mode 100644
index 0000000..f11e93e
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/RestFulOrder.java
@@ -0,0 +1,12 @@
+package com.jcdm.main.restful.qingYan.doman;
+
+import lombok.Data;
+
+@Data
+public class RestFulOrder {
+ private String productNum;
+ private String stationCode;
+ private String materialCode;
+ private String productionOrderNum;
+// private Long planQty;
+}
diff --git a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
index 3cc833e..14ceaf4 100644
--- a/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -561,7 +561,7 @@
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
if(this.headContent.sfcCode !== ''){
- this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+ this.$message('棰勮宸ヤ綅鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
} else {
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 7c194ab..35f4aa7 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -714,7 +714,7 @@
this.headContent.cardCode = scanValue
this.bindcardCode();
}else {
- this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
+ this.$message('宸ヤ綅缁堢鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
}
--
Gitblit v1.9.3