Browse Source

[feat] 工程管理

开发修改单列表页面table新增关联生产单号字段,前端查询新增关联生产单号查询条件
修改开发修改单后端分页查询接口,新增关联生产单号查询条件
dev
liuxiaoxu 2 months ago
parent
commit
7975fc7628
  1. 1
      ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
  2. 5
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

1
ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml

@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectErpDevelopModifyorderVo"/>
<where>
<if test="developOrderCode != null and developOrderCode != ''"> and develop_order_code like concat('%', #{developOrderCode}, '%')</if>
<if test="makeNo != null and makeNo != ''"> and make_no like concat('%', #{makeNo}, '%')</if>
<if test="materialNo != null and materialNo != ''"> and material_no like concat('%', #{materialNo}, '%')</if>
<if test="userName != null and userName != ''"> and user_name = #{userName}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>

5
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@ -14,6 +14,10 @@
<label>开发修改单号:</label>
<input type="text" name="developOrderCode"/>
</li>
<li>
<label>关联生产单号:</label>
<input type="text" name="makeNo"/>
</li>
<li>
<label>料号:</label>
<input type="text" name="materialNo"/>
@ -174,6 +178,7 @@
return '<span class="badge badge-primary">' + value + '</span>';}
},
{title: '开发修改单号',field: 'developOrderCode',},
{title: '关联生产单号',field: 'makeNo',},
{title: '料号',field: 'materialNo',},
{title: '图片',field: 'materialPhotoUrl',},
{title: '物料名称',field: 'materialName',},

Loading…
Cancel
Save