Browse Source

[update]物料信息添加工程员,在审核页面上面添加审核节点相关信息

dev
zhangsiqi 7 months ago
parent
commit
4b49e67f70
  1. 26
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
  2. 16
      ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
  3. 27
      ruoyi-admin/src/main/resources/templates/erp/material/add.html
  4. 64
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html
  5. 148
      ruoyi-admin/src/main/resources/templates/erp/material/material.html
  6. 3
      ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
  7. 3
      ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
  8. 3
      ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
  9. 3
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

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

@ -75,6 +75,8 @@ public class ErpMaterial extends BaseEntity
/** 入库部门 */
@Excel(name = "入库部门",sort = 9,dictType = "warehouseDept")
private String warehouseDept;
/*工程员*/
private String businessMembers;
/** 流程实例ID */
private String instanceId;
@ -247,6 +249,30 @@ public class ErpMaterial extends BaseEntity
return photoAttachId;
}
public int getItemCtc() {
return itemCtc;
}
public void setItemCtc(int itemCtc) {
this.itemCtc = itemCtc;
}
public String getItemPR() {
return itemPR;
}
public void setItemPR(String itemPR) {
this.itemPR = itemPR;
}
public String getBusinessMembers() {
return businessMembers;
}
public void setBusinessMembers(String businessMembers) {
this.businessMembers = businessMembers;
}
public void setPhotoAttachId(Long photoAttachId) {
this.photoAttachId = photoAttachId;
}

16
ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml

@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="brand" column="brand" />
<result property="describe" column="describe" />
<result property="warehouseDept" column="warehouse_dept" />
<result property="businessMembers" column="business_members" />
<result property="photoAttachId" column="photo_attach_id" />
<result property="photoUrl" column="photo_url" />
<result property="instanceId" column="instance_id" />
@ -45,14 +46,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,
hava_product_tem,product_item,itemName, material_type, process_method,
unit, brand, `describe`, warehouse_dept,instance_id,instance_type,submit_instance_id,
unit, 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.unit, 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
@ -111,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyTime != null "> and erp.apply_time = #{applyTime}</if>
<if test="keyword != null and keyword != ''"> and (erp.material_no like concat('%',#{keyword},'%') or erp.material_name like concat('%',#{keyword},'%'))</if>
<if test="supplierId != null and supplierId != ''"> and erp.supplier_id = #{supplierId}</if>
<if test="businessMembers != null and businessMembers != ''"> and erp.business_members = #{businessMembers}</if>
</where>
order by erp.update_time desc
</select>
@ -118,7 +120,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.process_method, erp.unit, 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
@ -133,7 +135,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.process_method, erp.unit, 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
@ -168,6 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="brand != null">brand,</if>
<if test="describe != null">`describe`,</if>
<if test="warehouseDept != null">warehouse_dept,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="businessMembers != null">business_members,</if>
<if test="auditStatus != null">audit_status,</if>
<if test="useStatus != null">use_status,</if>
<if test="instanceId != null">instance_id,</if>
@ -199,6 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="brand != null">#{brand},</if>
<if test="describe != null">#{describe},</if>
<if test="warehouseDept != null">#{warehouseDept},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="businessMembers != null">#{businessMembers},</if>
<if test="auditStatus != null">#{auditStatus},</if>
<if test="useStatus != null">#{useStatus},</if>
<if test="instanceId != null">#{instanceId},</if>
@ -238,6 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="brand != null">brand = #{brand},</if>
<if test="describe != null">`describe` = #{describe},</if>
<if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
<if test="supplierId != null">supplier_id = #{supplierId},</if>
<if test="businessMembers != null">business_members = #{businessMembers},</if>
<if test="instanceId != null">instance_id = #{instanceId},</if>
<if test="instanceType != null">instance_type = #{instanceType},</if>
<if test="submitInstanceId != null">submit_instance_id = #{submitInstanceId},</if>

27
ruoyi-admin/src/main/resources/templates/erp/material/add.html

@ -20,23 +20,6 @@
<input name="materialName" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<select name="haveProductTem" class="form-control m-b" th:with="type=${@dict.getType('havaProductTem')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产团队名称:</label>
<div class="col-sm-8">
<select name="productItem" class="form-control m-b" th:with="productList=${@productItems.selectSysProductItemLists()}">
<option value="">请选择</option>
<option th:each="product:${productList}" th:value="${product.id}" th:text="${product.productItem}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">物料类型:</label>
<div class="col-sm-8">
@ -55,6 +38,7 @@
<label class="col-sm-3 control-label is-required">加工方式:</label>
<div class="col-sm-8">
<select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
<option value=""></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<div id="weiwai" hidden>
@ -99,10 +83,18 @@
<label class="col-sm-3 control-label is-required">入库部门:</label>
<div class="col-sm-8">
<select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
<option value=""></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工程员:</label>
<div class="col-sm-8">
<select name="businessMembers" id="businessMembers_add" class="form-control m-b" required >
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">照片:</label>
<div class="col-sm-10">
@ -111,6 +103,7 @@
:on-success="uploadSuccess"
:on-remove="uploadRemove"
:file-list="fileList"
:limit="5"
list-type="picture"
accept=".jpg,.png"
multiple>

64
ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@ -39,12 +39,6 @@
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否有生产团队:</label>
<div class="col-sm-8">
<input readonly name="havaProductTem" th:field="*{havaProductTem}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
@ -96,7 +90,14 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">照片:</label>
<label class="col-sm-3 control-label">工程员:</label>
<div class="col-sm-8">
<select name="businessMembers" id="businessMembers_add" class="form-control m-b" required >
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >照片:</label>
<div class="col-sm-8">
<el-upload
:action="fileUploadUrl"
@ -106,7 +107,7 @@
list-type="picture"
accept=".jpg,.png"
multiple>
<el-button size="small" type="primary">点击上传</el-button>
<el-button size="small" type="primary" disabled>点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件,第一张图片为主图</div>
</el-upload>
</div>
@ -542,54 +543,15 @@
},
visible: false
},
{
field: 'auditName',
title: '结案人',
visible: false
},
{
field: 'auditTime',
title: '结案时间',
visible: false
},
{
field: 'auditRemarks',
title: '结案备注',
visible: false
},
{
field: 'nationalTaxBill',
title: '是否开国税发票',
visible: false
},
{
field: 'finishProductCode',
title: '成品代码'
},
{
field: 'finishProductName',
title: '成品名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'customerNumber',
title: '客户料号'
},
{
field: 'typeMachine',
title: '机种'
},
{
field: 'inventoryUnit',
title: '单位'
},
{
field: 'stockUnitWeight',
title: '重量'
},
{
field: 'commonCurrency',
title: '币别',
@ -613,14 +575,6 @@
field: 'deliveryTime',
title: '交期'
},
{
field: 'line',
title: 'Line#'
},
{
field: 'versionNumber',
title: '版本号'
},
{
field: 'salesExplain',
title: '说明'

148
ruoyi-admin/src/main/resources/templates/erp/material/material.html

@ -35,8 +35,7 @@
</li>
<li>
<label>工程员:</label>
<select id="createBySel" name="createBy">
<select id="createBySel" name="businessMembers">
</select>
</li>
<li>
@ -118,147 +117,6 @@
</div>
</div>
</div>
<!--详情信息模态框-->
<div class="modal inmodal" id="detailsModal" tabindex="-1"
role="dilog" aria-hidden="true">
<div class="modal-dialog" style="width: 1400px;max-height: 800px; background-color: #FFFFFF">
<div class="modal-content" style="background-color: #FFFFFF">
<div class="details-title">物料详情</div>
<div class="modal-body details-body">
<div class="row">
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input id="detail_materialNo" name="materialNo" 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">
<input id="detail_materialName" name="materialName" 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">
<input readonly id="detail_haveProductTem" name="havaProductTem" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<div class="col-sm-8">
<select readonly id="selectMaterialTypes" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}">
<optgroup hidden="hidden">
<option value="">请选择</option>
</optgroup>
<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>
</select>
</div>
<input type="text" id="materialType" name="materialType" hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">加工方式:</label>
<div class="col-sm-8">
<select readonly id="detail_processMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<select readonly id="detail_unit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<div class="col-sm-8">
<input readonly id="detail_brand" name="brand" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<div class="col-sm-8">
<textarea readonly id="detail_describe" name="describe" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员:</label>
<div class="col-sm-8">
<input readonly id="detail_createBy" name="createBy" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">入库部门:</label>
<div class="col-sm-8">
<select readonly id="detail_warehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">照片:</label>
<div class="col-sm-8">
<el-upload
:action="fileUploadUrl"
:on-success="uploadSuccess"
:on-remove="uploadRemove"
:file-list="fileList"
list-type="picture"
accept=".jpg,.png"
multiple>
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传jpg/png文件,第一张图片为主图</div>
</el-upload>
</div>
<input id="photoAttachId" name = "photoAttachId" hidden >
<input id="fileIdStr" type="text" name="fileIdStr" hidden>
<input id="removeFileIdStr" type="text" name="removeFileIdStr" hidden>
</div>
</form>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">技术团队人员信息</div>
<table id="item-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">销售价历史</div>
<table id="xioashou-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">采购价历史</div>
<table id="purser-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">操作历史</div>
<table id="oper-table"></table>
</div>
</div>
</div>
</div>
<div class="modal-footer" style=" border-top: none;background-color: #a7b1c2">
<button type="button" class="btn btn-default" data-dismiss="modal" onclick="close()">关闭</button>
<button type="button" class="btn btn-danger" data-dismiss="model" onclick="showAudit()">审核拒绝</button>
<button type="button" class="btn btn-success" data-dismiss="model"onclick="AuditConfirmSubmit(1)">审核通过</button>
</div>
</div>
</div>
</div>
<!-- 技术团队配置 -->
<div class="modal fade" id="productItemModel">
<div class="modal-dialog">
@ -590,8 +448,8 @@
}
},
{
field: 'createBy',
title: '工程员ID',
field: 'businessMembers',
title: '工程员',
visible: false
},
{

3
ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-gcjl-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label">申请人:</label>

3
ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label">申请人:</label>

3
ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<!--驳回调整允许更新内容-->
<input type="hidden" name="saveEntity" value="true" />
<div class="form-group">

3
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

@ -10,6 +10,9 @@
<form class="form-horizontal m" id="form-edit" th:object="${formData}">
<input name="id" th:field="*{id}" type="hidden">
<input name="taskId" th:field="*{taskId}" type="hidden">
<input name="taskName" th:field="*{taskName}" type="hidden">
<input name="instanceId" th:field="*{instanceId}" type="hidden">
<input name="instanceType" th:field="*{instanceType}" type="hidden">
<input type="hidden" name="p_COM_comment" />
<div class="form-group">
<label class="col-sm-3 control-label">申请人:</label>

Loading…
Cancel
Save