From 7975fc7628b8e25d9f3fa96d8d37d350d55e2ee7 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 19 Sep 2024 09:09:07 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2table=E6=96=B0=E5=A2=9E=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=90=8E=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=B3=E8=81=94=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/erp/ErpDevelopModifyorderMapper.xml     | 1 +
 .../templates/erp/developModifyOrder/developModifyOrder.html | 5 +++++
 2 files changed, 6 insertions(+)

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