fix:1.仓储物流区分原材料/成品 2.生产订单/报工领料优化

liding

4 天以前 9f1c36a2ba4e13f9592bbf2e49afd95fd77cadfb

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

@@ -4,6 +4,7 @@
    <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        qi.*,
        pm.uid_no,
        <choose>
            <when test="qualityInspect.inspectType == 0">
                pl.purchase_contract_number as purchase_contract_no
@@ -23,6 +24,7 @@
                LEFT JOIN product_work_order pwo ON ppm.work_order_id = pwo.id
            </otherwise>
        </choose>
        LEFT JOIN product_model pm on qi.product_model_id = pm.id
        WHERE
        inspect_type=#{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
@@ -48,8 +50,10 @@

    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT
        *
        FROM quality_inspect
        qi.*,
        pm.uid_no
        FROM quality_inspect qi
        LEFT JOIN product_model pm on qi.product_model_id = pm.id
        where
        inspect_type=#{qualityInspect.inspectType}
        <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
@@ -439,6 +443,55 @@
        ORDER BY rn;

    </select>
    <select id="selectOneData" resultType="com.ruoyi.quality.pojo.QualityInspect">
        select id,
               inspect_type,
               check_time,
               production_date,
               supplier,
               customer,
               process,
               check_name,
               product_id,
               product_name,
               model,
               unit,
               quantity,
               check_company,
               check_result,
               create_time,
               create_user,
               update_time,
               update_user,
               tenant_id,
               inspect_state,
               purchase_ledger_id,
               product_main_id,
               defective_phenomena,
               product_model_id,
               test_standard_id,
               inspected_quantity,

               case
                   when inspect_material_condition = '检验用液剂情况' then
                       '☐'
                   else
                       '☑'
                   end as inspect_material_condition_a,
               case
                   when inspect_material_condition = '检验用粉剂情况' then
                       '☐'
                   else
                       '☑'
                   end as inspect_material_condition_b,

               validity_date,
               manufacturing_team,
               batch_no

        from quality_inspect
        where id = #{id};
    </select>


</mapper>