From 73e3000765da2e3079c0f393f5046b68ea964a31 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 21 Sep 2023 15:47:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=20=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 9483fac5..bf4dc3b6 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -400,7 +400,6 @@
     						</el-form-item>
     				</el-form>
     			<div slot="footer" class="dialog-footer">
-    				<el-button type="primary" @click="submitForm">确 定</el-button>
     				<el-button @click="cancelAttached">取 消</el-button>
     			</div>
     		</el-dialog>

From 53d7a788437fb146c3d902441970b06dacb0af1c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 21 Sep 2023 16:47:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index f1b731cf..fa9849bc 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -107,6 +107,8 @@
           {{ scope.row.status == 1 ? "正常" : "停用" }}
         </template>
       </el-table-column>
+      <el-table-column label="设备IP" align="center" prop="plcIp" width="150"/>
+      <el-table-column label="设备端口号" align="center" prop="plcPort" width="100"/>
 			<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
 			<el-table-column label="工段" align="center" prop="workshopSection" />
 			<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
@@ -190,7 +192,19 @@
                     </el-col>
                     <el-col :span="12">
 						<el-form-item label="工作中心编码" prop="workshopCode">
-							<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
+							<el-input v-model="form.workshopCode" placeholder="请输入所属工作中心编码" />
+						</el-form-item>
+                    </el-col>
+                </el-row>
+				<el-row :gutter="10" class="mb8">
+                    <el-col :span="12">
+						<el-form-item label="设备IP" prop="plcIp">
+							<el-input v-model="form.plcIp" placeholder="请输入设备IP" />
+						</el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+						<el-form-item label="设备端口号" prop="plcPort">
+							<el-input v-model="form.plcPort" placeholder="请输入设备端口号" />
 						</el-form-item>
                     </el-col>
                 </el-row>
@@ -277,6 +291,18 @@
     						</el-form-item>
                         </el-col>
                     </el-row>
+				<el-row :gutter="10" class="mb8">
+                    <el-col :span="12">
+						<el-form-item label="设备IP" prop="plcIp">
+							<el-input v-model="form.plcIp" placeholder="" disabled/>
+						</el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+						<el-form-item label="设备端口号" prop="plcPort">
+							<el-input v-model="form.plcPort" placeholder="" disabled/>
+						</el-form-item>
+                    </el-col>
+                </el-row>
     				<el-row :gutter="10" class="mb8">
                         <el-col :span="12">
     						<el-form-item label="单台能力工时" prop="unitWorkingHours">