fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化

liding

4 天以前 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0

 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml

@@ -16,6 +16,8 @@
        qu.deal_result,
        qu.deal_name,
        qu.deal_time,
        qu.production_date,
        pm.uid_no,
        CASE
        WHEN qu.model = pm.id THEN pm.model
        ELSE qu.model
@@ -25,7 +27,7 @@
        ELSE false
        END AS method
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.id
        LEFT JOIN product_model pm ON qu.model = pm.model
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
@@ -46,8 +48,10 @@
    </select>
    <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT
        *
        FROM quality_unqualified
        qu.*,
        pm.uid_no
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.model
        where
        1=1
        <if test="qualityUnqualified.inspectType != null">
@@ -75,6 +79,8 @@
            qu.deal_result,
            qu.deal_name,
            qu.deal_time,
            qu.production_date,
            qu.batch_no,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model