diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 06b8f218..95e8884a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -53,10 +53,12 @@ public class ErpMaterial extends BaseEntity private String itemPR; /** 物料类型 */ private String materialType; + /** 物料类型名称 */ @Excel(name = "物料类型名称",sort = 5) private String materialTypeName; + /** 加工方式(0采购、1生产加工、2委外加工、3生产装配、4委外加工或采购) */ @Excel(name = "加工方式",sort = 9,dictType = "processMethod") private String processMethod; @@ -65,16 +67,21 @@ public class ErpMaterial extends BaseEntity @Excel(name = "单位",sort = 6) private String unit; + + /** 物料型号 */ + @Excel(name = "型号",sort = 7) + private String materialModel; + /** 品牌 */ - @Excel(name = "品牌",sort = 7) + @Excel(name = "品牌",sort = 8) private String brand; /** 描述 */ - @Excel(name = "描述",sort = 8) + @Excel(name = "描述",sort = 9) private String describe; /** 入库部门 */ - @Excel(name = "入库部门",sort = 9,dictType = "warehouseDept") + @Excel(name = "入库部门",sort = 10,dictType = "warehouseDept") private String warehouseDept; /*工程员*/ private String businessMembers; @@ -235,7 +242,17 @@ public class ErpMaterial extends BaseEntity { return unit; } - public void setBrand(String brand) + + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + + public void setBrand(String brand) { this.brand = brand; } @@ -462,6 +479,7 @@ public class ErpMaterial extends BaseEntity .append("materialType", getMaterialType()) .append("processMethod", getProcessMethod()) .append("unit", getUnit()) + .append("materialModel", getMaterialModel()) .append("brand", getBrand()) .append("describe", getDescribe()) .append("warehouseDept", getWarehouseDept()) diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml index 6ef415d7..e7d86ae0 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml @@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -48,14 +49,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, del_flag, create_by, create_time, update_by, update_time, remark, bomNo, material_no, material_name, audit_status, use_status,cancel_remark, hava_product_tem,product_item,itemName, material_type, process_method, - unit, brand, `describe`, warehouse_dept,business_members,instance_id,instance_type,submit_instance_id, + unit, material_model, brand, `describe`, warehouse_dept,business_members,instance_id,instance_type,submit_instance_id, cancel_instance_id,restore_instance_id,apply_title,apply_user,apply_time from erp_material select erp.id, erp.del_flag, erp.create_by, erp.create_time, erp.update_by, erp.update_time, erp.remark,erp.bomNo, erp.material_no , erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem,erp.product_item,erp.itemName, erp.material_type - , erp.process_method, erp.unit, erp.brand, erp.describe, erp.warehouse_dept,erp.supplier_id,erp.business_members,erp.cancel_remark + , erp.process_method, erp.unit, erp.material_model, erp.brand, erp.describe, erp.warehouse_dept,erp.supplier_id,erp.business_members,erp.cancel_remark ,erp.instance_id,erp.instance_type,erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time ,att.id as photo_attach_id from erp_material erp @@ -137,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select erp.id, erp.del_flag, erp.create_by, erp.remark,erp.bomNo, erp.material_no, erp.material_name, erp.audit_status, erp.use_status, erp.hava_product_tem, - erp.material_type, erp.process_method, erp.unit, erp.brand, erp.`describe`, + erp.material_type, erp.process_method, erp.unit,erp.material_model, erp.brand, erp.`describe`, erp.warehouse_dept,erp.business_members,cate.parent_id,cate.name as material_type_name from erp_material erp left join ( @@ -213,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_type, process_method, unit, + material_model, brand, `describe`, warehouse_dept, @@ -247,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialType}, #{processMethod}, #{unit}, + #{materialModel}, #{brand}, #{describe}, #{warehouseDept}, @@ -289,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_type = #{materialType}, process_method = #{processMethod}, unit = #{unit}, + material_model = #{materialModel}, brand = #{brand}, `describe` = #{describe}, warehouse_dept = #{warehouseDept}, @@ -345,7 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -
+ +
+ +
+ +
+
+
@@ -404,6 +411,7 @@ materialType: erpMaterialData.materialType, processMethod: erpMaterialData.processMethod, unit: erpMaterialData.unit, + materialModel: erpMaterialData.materialModel, brand: erpMaterialData.brand, describe: erpMaterialData.describe, warehouseDept: erpMaterialData.warehouseDept, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html index 3174a8ba..a708a0f2 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html @@ -51,6 +51,13 @@
+
+ +
+ +
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html index b8c12d38..a7330c65 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html @@ -24,7 +24,7 @@
- @@ -35,7 +35,7 @@
-
@@ -49,6 +49,14 @@
+ +
+ +
+ +
+
+
@@ -423,6 +431,7 @@ materialType: erpMaterialData.materialType, processMethod: erpMaterialData.processMethod, unit: erpMaterialData.unit, + materialModel: erpMaterialData.materialModel, brand: erpMaterialData.brand, describe: erpMaterialData.describe, warehouseDept: erpMaterialData.warehouseDept, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html index c5773025..2bb2c0bd 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html @@ -184,7 +184,12 @@ {title: '物料名称',field: 'materialName',align: 'center'}, {title: '描述',field: 'describe',align: 'center', formatter: function(value, row, index) { - return $.table.tooltip(value, 10, "open"); + return $.table.tooltip(value, 5, "open"); + } + }, + {title: '型号',field: 'materialModel',align: 'center', + formatter: function(value, row, index) { + return $.table.tooltip(value, 5, "open"); } }, {title: '品牌',field: 'brand',align: 'center'}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/select.html b/ruoyi-admin/src/main/resources/templates/erp/material/select.html index 97cb8c85..d197f5fe 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/select.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/select.html @@ -66,6 +66,8 @@ {title: '物料类型',field: 'materialType', formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);} }, + + {title: '型号', field: 'materialModel',}, {title: '品牌', field: 'brand',}, {title: '单位',field: 'unit',formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}}, {title: '描述',field: 'describe',}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html index d331c13b..3e974e55 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html @@ -78,6 +78,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html index 94ff6b26..79a2cb2a 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html @@ -78,6 +78,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html index 432d5400..0329b450 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html @@ -51,7 +51,7 @@
- @@ -65,7 +65,7 @@
- @@ -80,9 +80,15 @@
- +
- + +
+
+
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html index 01a7b4f4..89999db5 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html @@ -78,6 +78,12 @@
+
+ +
+ +
+