[feat]

生产管理 生产订单
修改设备履历物料类，新增物料型号字段；
修改添加设备履历页面，表单新增字段物料型号，新增设备时自动将物料型号填充到设备型号；

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;

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: "",
                 // 假设每个新增的行都有一个唯一的标识符或者索引，这里为了演示直接使用时间戳