入库申请sql调整

cuijian

2025-05-28 f6fe0d19ee37b337c5dcd464e234996f382ecdba

入库申请sql调整

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml

@@ -5,6 +5,9 @@
    <select id="findPageList" resultType="map" parameterType="String">
        select
            t1.id,
            t1.create_by createBy,
            t1.create_time createTime,
            t2.inbound_num inboundNum,
            t3.id toolCodeId,
            t1.in_storage_quantity inStorageQuantity,
            t1.in_actual_count inActualCount,
@@ -12,13 +15,15 @@
            t3.chinese_name chineseName,
            t3.tool_model toolModel,
            t5.item_text applicationType,
            t6.classify_id classifyNum
            from tms_inbound_detail t1
            left join tms_inbound_order t2 on t1.in_storehouse_id = t2.id
            left join tms_base_tools t3 on t3.id = t1.tool_code
            left join tms_tools_config_property t4 on t4.tool_code = t1.tool_code
            left join (select * from v_sys_dict where dict_code = 'application_type') t5 on t5.item_value = t4.application_type
            left join tms_tools_classify t6 on t6.id = t3.classify_id
            t6.classify_id classifyNum,
            t8.item_text inStorehouseType
        from tms_inbound_detail t1
                 left join tms_inbound_order t2 on t1.in_storehouse_id = t2.id
                 left join tms_base_tools t3 on t3.id = t1.tool_code
                 left join tms_tools_config_property t4 on t4.tool_code = t1.tool_code
                 left join (select * from v_sys_dict where dict_code = 'application_type') t5 on t5.item_value = t4.application_type
                 left join tms_tools_classify t6 on t6.id = t3.classify_id
                 LEFT JOIN (select * from v_sys_dict where dict_code='in_storehouse_type') t8 on t8.item_value = t2.in_storehouse_type
            ${ew.customSqlSegment}
    </select>
</mapper>

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InboundDetailServiceImpl.java

@@ -40,6 +40,11 @@
            if (StringUtils.isNotBlank(inboundOrderId)) {
                queryWrapper.eq("t1.in_storehouse_id", inboundOrderId);
            }
            String classifyId = query.get("classifyId");
            if (StringUtils.isNotBlank(classifyId)) {
                queryWrapper.eq("t6.id", classifyId);
            }
            queryWrapper.eq("t2.order_status", "3");
            // 排序写法
            List<OrderItem> orderItems = new ArrayList<>();
            orderItems.add(OrderItem.desc("t1.create_time"));