From 7402d66b621b9b76c9932590b5c47d330486cf04 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 07 八月 2024 15:52:48 +0800
Subject: [PATCH] 生产1P1S码
---
jcdm-ui/src/views/main/da/psConf/index.vue | 48 +++++++++++++++++++++++++-----------------------
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 5 ++---
2 files changed, 27 insertions(+), 26 deletions(-)
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 500ad9a..6c931be 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
@@ -1134,6 +1134,8 @@
code = StringUtils.leftPad(String.valueOf(Integer.valueOf(code)+1),7, "0");;//搴忓垪鍙�
result = mfCode+proTypeCode+batteryTypeCode+specificationsCode+traceInfoCode+proDateCode+code;
+ log.info("璇诲彇鍒扮數鑺爜涓猴細{},1P1S鐮佷负锛歿}",sfcCode,result);
+
//鏇存柊鏃ユ湡鍜屽簭鍒楀彿
LambdaUpdateWrapper<DaPsConf> lambdaUpdateWrapper = new LambdaUpdateWrapper<DaPsConf>();
lambdaUpdateWrapper.set(DaPsConf::getProDateCode,proDateCode);//鐢熶骇鏃ユ湡
@@ -1149,9 +1151,6 @@
}catch (Exception e) {
throw new RuntimeException(e);
}
- }
- public static void main(String[] args) throws Exception {
- get1P1S("");
}
}
diff --git a/jcdm-ui/src/views/main/da/psConf/index.vue b/jcdm-ui/src/views/main/da/psConf/index.vue
index ed42a39..64f8f43 100644
--- a/jcdm-ui/src/views/main/da/psConf/index.vue
+++ b/jcdm-ui/src/views/main/da/psConf/index.vue
@@ -74,6 +74,10 @@
<el-table border v-loading="loading" :data="psConfList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="渚涘簲鍟嗚瘑鍒爜" align="center" prop="spareField1">
+ </el-table-column>
+ <el-table-column label="渚涘簲鍟嗗悕绉�" align="center" prop="remarks">
+ </el-table-column>
<el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="mfCode">
</el-table-column>
<el-table-column label="浜у搧绫诲瀷浠ｇ爜" align="center" prop="proTypeCode">
@@ -88,18 +92,15 @@
</el-table-column>
<el-table-column label="搴忓垪鍙�" align="center" prop="sfcCode">
</el-table-column>
- <el-table-column label="鐘舵�� (鍚敤enable锛岀鐢╠isable锛�" align="center" prop="state">
+ <el-table-column label="鐘舵�� (鍚敤1锛岀鐢�0锛�" align="center" prop="state">
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks">
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁1" align="center" prop="spareField1">
- </el-table-column>
- <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+
+<!-- <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
</el-table-column>
<el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
</el-table-column>
<el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
- </el-table-column>
+ </el-table-column>-->
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -134,12 +135,18 @@
/>
<!-- 娣诲姞鎴栦慨鏀�1P1S閰嶇疆瀵硅瘽妗� -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="600px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-form-item label="渚涘簲鍟嗚瘑鍒爜" prop="spareField1">
+ <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ヤ緵搴斿晢璇嗗埆鐮�" />
+ </el-form-item>
+ <el-form-item label="渚涘簲鍟嗗悕绉�" prop="remarks">
+ <el-input v-model="form.remarks" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" />
+ </el-form-item>
<el-form-item label="鍘傚晢浠ｇ爜" prop="mfCode">
<el-input v-model="form.mfCode" placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�" />
</el-form-item>
@@ -155,22 +162,17 @@
<el-form-item label="杩芥函淇℃伅浠ｇ爜" prop="traceInfoCode">
<el-input v-model="form.traceInfoCode" placeholder="璇疯緭鍏ヨ拷婧俊鎭唬鐮�" />
</el-form-item>
- <el-form-item label="鐢熶骇鏃ユ湡浠ｇ爜" prop="proDateCode">
- <el-input v-model="form.proDateCode" placeholder="璇疯緭鍏ョ敓浜ф棩鏈熶唬鐮�" />
- </el-form-item>
+<!-- <el-form-item label="鐢熶骇鏃ユ湡浠ｇ爜" prop="proDateCode">
+ <el-input v-model="form.proDateCode" placeholder="璇疯緭鍏ョ敓浜ф棩鏈熶唬鐮侊紙涓嶅～锛�" />
+ </el-form-item>-->
<el-form-item label="搴忓垪鍙�" prop="sfcCode">
- <el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ュ簭鍒楀彿" />
+ <el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ュ簭鍒楀彿"/>
</el-form-item>
- <el-form-item label="鐘舵�� (鍚敤enable锛岀鐢╠isable锛�" prop="state">
- <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬� (鍚敤enable锛岀鐢╠isable锛�" />
+ <el-form-item label="鐘舵��" prop="state">
+ <el-input v-model="form.state" placeholder="璇疯緭鍏ョ姸鎬� (鍚敤1锛岀鐢�0锛�" />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-form-item label="棰勭暀瀛楁1" prop="spareField1">
- <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />
- </el-form-item>
- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+
+<!-- <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
<el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />
</el-form-item>
<el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
@@ -178,7 +180,7 @@
</el-form-item>
<el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
<el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
- </el-form-item>
+ </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
--
Gitblit v1.9.3