From 362e152057e2d9f2e25ff0a4c3b36d47bcab7d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Thu, 28 Nov 2024 13:57:27 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E7=89=A9=E6=96=99=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=B6=E8=87=AA=E5=8A=A8=E5=B0=86=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=9E=8B=E5=8F=B7=E5=A1=AB=E5=85=85=E5=88=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9E=8B=E5=8F=B7=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/dto/SysEquipMaterialDto.java    |  1 +
 .../system/makeorder/addEquipmentResume.html         | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
index ec38427e..8391db03 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
@@ -18,6 +18,7 @@ public class SysEquipMaterialDto implements Serializable {
     private String materialCode;
     private String materialName;
     private String materialType;
+    private String materialModel;
     private String processMethod;
     private String brand;
     private String photoUrl;
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
index 7767d645..d3780c5d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addEquipmentResume.html
@@ -65,7 +65,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">半成品类型：</label>
+                        <label class="col-sm-4 control-label is-required">加工方式：</label>
                         <div class="col-sm-8">
                             <select disabled name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
                                 <option value=""></option>
@@ -96,6 +96,14 @@
                 </div>
             </div>
             <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">型号：</label>
+                        <div class="col-sm-8">
+                            <input readonly name="materialModel" th:field="*{materialModel}" class="form-control" type="text">
+                        </div>
+                    </div>
+                </div>
                 <div class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-4 control-label">描述：</label>
@@ -485,7 +493,7 @@
         function addEquipMaterialDetail() {
             var newRow = {
                 equipmentId: "",
-                equipmentModel: "",
+                equipmentModel: equipMaterial.materialModel,
                 serialNo: "",
                 producePic: "",
                 // 假设每个新增的行都有一个唯一的标识符或者索引，这里为了演示直接使用时间戳