diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
index 4bf259ce..7b7c6d37 100644
--- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml
@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and develop_order_code like concat('%', #{developOrderCode}, '%')
+ and make_no like concat('%', #{makeNo}, '%')
and material_no like concat('%', #{materialNo}, '%')
and user_name = #{userName}
and audit_status = #{auditStatus}
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
index 7f3719a6..402da15c 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
@@ -14,6 +14,10 @@
+
+
+
+
@@ -174,6 +178,7 @@
return '' + value + '';}
},
{title: '开发修改单号',field: 'developOrderCode',},
+ {title: '关联生产单号',field: 'makeNo',},
{title: '料号',field: 'materialNo',},
{title: '图片',field: 'materialPhotoUrl',},
{title: '物料名称',field: 'materialName',},