diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java
index 96a90b1..8358ecb 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java
@@ -116,4 +116,9 @@ public class MaterialDto implements Serializable {
*/
private String stewing_time;
+ /**
+ * 物料类型
+ */
+ private String material_type;
+
}
diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue
index 46d1511..8fa0224 100644
--- a/wms/qd/src/views/wms/database/material/index.vue
+++ b/wms/qd/src/views/wms/database/material/index.vue
@@ -28,7 +28,7 @@
-
+
@@ -39,6 +39,10 @@
+
+
+
+
@@ -71,6 +75,7 @@
+
@@ -136,6 +141,7 @@ const defaultForm = {
material_name: null,
material_spec: null,
material_model: null,
+ material_type: null,
english_name: null,
create_id: null,
create_name: null,
@@ -184,6 +190,9 @@ export default {
is_auto_package: [
{ required: true, message: '是否人工打包不能为空', trigger: 'blur' }
],
+ material_type: [
+ { required: true, message: '物料类型不能为空', trigger: 'blur' }
+ ],
stewing_time: [
{ required: true, message: '静止时间不能为空', trigger: 'blur' }
]