Merge remote-tracking branch 'origin/master'

cuilei

3 天以前 86565eefc5c2fa9be6a00db58d1079c6d0d908ac

 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml

@@ -7,11 +7,20 @@
            t1.id,
            t1.order_id orderId,
            t1.cutting_id cuttingId,
            t2.cutting_code cuttingCode,
            t2.cutting_name cuttingName
            t1.inventory_id inventoryId,
            -- t1.workpiece_material workpieceMaterial,
            -- t1.used_life usedLife,
            t2.cutting_barcode cuttingBarcode,
            t2.inventory_status inventoryStatus,
            t2.current_life currentLife,
            t2.id,
            t3.id,
            t3.cutting_code cuttingCode,
            t3.cutting_name cuttingName
        FROM
            cms_cutting_scrap_detail t1
                LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id
                LEFT JOIN cms_cutting_inventory t2 ON t1.inventory_id = t2.id
                LEFT JOIN cms_cutting_tool t3 ON t1.cutting_id = t3.id
        WHERE t1.order_id = #{orderId}
    </select>
</mapper>