huminmin
2026-03-19 7b53707f0a9a195d56f8010e5b377eacba55609b
Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
已修改2个文件
6 ■■■■ 文件已修改
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/static/work-order-template.docx 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -30,14 +30,14 @@
        LEFT JOIN product_model pm ON qu.model = pm.id
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
            AND inspect_type = #{qualityUnqualified.inspectType}
        <if test="qualityUnqualified.checkType != null ">
            AND check_type = #{qualityUnqualified.checkType}
        </if>
        <if test="qualityUnqualified.inspectState != null ">
            AND inspect_state = #{qualityUnqualified.inspectState}
        </if>
        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
            AND product_name = #{qualityUnqualified.productName}
            AND product_name like concat('%',#{qualityUnqualified.productName},'%')
        </if>
        <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
            AND check_time &gt;= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
src/main/resources/static/work-order-template.docx
Binary files differ