root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat]工程管理 

物料前端
物料列表页面 新增型号字段，设置型号超过5个字符隐藏部分内容
物料前端新增页面新增 型号字段，设置为必填，提交方法新增型号字段
物料前端修改页面新增 型号字段，设置为必填，提交方法新增型号字段；加工方式和加工类型设置为不可修改
物料前端详情页面新增型号字段，设置为只读不可修改
物料前端工程经理、工程主管、研发总监审核页面新增型号字段，设置为只读不可修改
物料前端驳回调整页面新增 型号字段，设置为必填，提交方法新增型号字段；加工方式和加工类型设置为不可修改
物料选择页面列表新增型号字段
物料后端
物料实体类新增型号字段和对应的方法
物料mapper.xml层 返回对象、查询方法、修改方法、新增方法都加上型号字段
dev
liuxiaoxu 4 weeks ago
parent
dc4f763959
commit
4791b23792
11 changed files with 96 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
  2. 18
      ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
  3. 10
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  4. 7
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  5. 13
      ruoyi-admin/src/main/resources/templates/erp/material/edit.html
  6. 7
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  7. 2
      ruoyi-admin/src/main/resources/templates/erp/material/select.html
  8. 6
      ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
  9. 6
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  10. 14
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
  11. 6
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

26
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
View File

@ -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())

18
ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
View File

@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="materialTypeName" column="material_type_name" />
<result property="processMethod" column="process_method" />
<result property="unit" column="unit" />
<result property="materialModel" column="material_model"/>
<result property="brand" column="brand" />
<result property="describe" column="describe" />
<result property="warehouseDept" column="warehouse_dept" />
@ -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
</sql>
<select id="selectErpMaterialList" parameterType="ErpMaterialVo" resultMap="ErpMaterialResult">
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.business_members
, erp.unit, erp.material_model, erp.brand, erp.`describe`, erp.warehouse_dept,erp.business_members
,erp.instance_id,erp.instance_type,process_type_dict.dict_label as instance_type_name,
erp.submit_instance_id,erp.cancel_instance_id,erp.restore_instance_id,erp.apply_title,erp.apply_user,erp.apply_time,
ss.supplier_name,cate.parent_id
@ -122,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectErpMaterialById" parameterType="Long" resultMap="ErpMaterialResult">
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 id="selectErpMaterialByMaterialNo" resultMap="ErpMaterialResult">
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.process_method, erp.unit, erp.material_model, erp.brand, erp.describe, erp.warehouse_dept,erp.supplier_id,erp.business_members
,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
@ -162,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select em.id, em.del_flag, em.create_by, em.create_time, em.update_by, em.update_time, em.remark,
em.bomNo, em.material_no, em.material_name, em.audit_status,em.use_status,
em.hava_product_tem,em.product_item,em.itemName, em.material_type, em.process_method,
em.unit, em.brand, em.`describe`, em.warehouse_dept,em.business_members,
em.unit, em.material_model, em.brand, em.`describe`, em.warehouse_dept,em.business_members,
eb.id as bom_id from erp_material em
left join erp_bom eb on em.material_no = eb.material_no
<where>
@ -175,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectCateErpMaterialList" resultMap="ErpMaterialResult">
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"
<if test="materialType != null">material_type,</if>
<if test="processMethod != null">process_method,</if>
<if test="unit != null">unit,</if>
<if test="materialModel != null">material_model,</if>
<if test="brand != null">brand,</if>
<if test="describe != null">`describe`,</if>
<if test="warehouseDept != null">warehouse_dept,</if>
@ -247,6 +249,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialType != null">#{materialType},</if>
<if test="processMethod != null">#{processMethod},</if>
<if test="unit != null">#{unit},</if>
<if test="materialModel != null">#{materialModel},</if>
<if test="brand != null">#{brand},</if>
<if test="describe != null">#{describe},</if>
<if test="warehouseDept != null">#{warehouseDept},</if>
@ -289,6 +292,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialType != null">material_type = #{materialType},</if>
<if test="processMethod != null">process_method = #{processMethod},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="materialModel != null">material_model = #{materialModel},</if>
<if test="brand != null">brand = #{brand},</if>
<if test="describe != null">`describe` = #{describe},</if>
<if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
@ -345,7 +349,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="searchMaterialsByPrefix" parameterType="String" resultMap="ErpMaterialResult">
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 (

10
ruoyi-admin/src/main/resources/templates/erp/material/add.html
View File

@ -47,7 +47,14 @@
</select>
</div>
</div>
<div class="form-group">
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" class="form-control" type="text" required/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">品牌：</label>
<div class="col-sm-8">
<input name="brand" class="form-control" type="text" required/>
@ -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,

7
ruoyi-admin/src/main/resources/templates/erp/material/detail.html
View File

@ -51,6 +51,13 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌：</label>
<div class="col-sm-8">

13
ruoyi-admin/src/main/resources/templates/erp/material/edit.html
View File

@ -24,7 +24,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">物料类型：</label>
<div class="col-sm-8">
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required disabled>
<optgroup th:each="child: ${childList}" th:label="${child.name}">
<option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
</optgroup>
@ -35,7 +35,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">加工方式：</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
<select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
@ -49,6 +49,14 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌：</label>
<div class="col-sm-8">
@ -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,

7
ruoyi-admin/src/main/resources/templates/erp/material/material.html
View File

@ -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'},

2
ruoyi-admin/src/main/resources/templates/erp/material/select.html
View File

@ -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',},

6
ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
View File

@ -78,6 +78,12 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌：</label>
<div class="col-sm-8">

6
ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
View File

@ -78,6 +78,12 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">品牌：</label>
<div class="col-sm-8">

14
ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
View File

@ -51,7 +51,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">物料类型：</label>
<div class="col-sm-8">
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
<select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required disabled>
<optgroup>
<option value="">请选择</option>
</optgroup>
@ -65,7 +65,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">加工方式：</label>
<div class="col-sm-8">
<select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
</select>
@ -80,9 +80,15 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌：</label>
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" />
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">品牌：</label>
<div class="col-sm-8">
<input name="brand" th:field="*{brand}" class="form-control" type="text" required />
</div>
</div>
<div class="form-group">

6
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
View File

@ -78,6 +78,12 @@
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">型号：</label>
<div class="col-sm-8">
<input name="materialModel" th:field="*{materialModel}" class="form-control" type="text" readonly/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌：</label>
<div class="col-sm-8">

Write Preview
Loading…
Cancel
Save