Merge remote-tracking branch 'origin/master'

cuilei

2025-06-13 19f324552d79aed6ec9bbc58c2f0fb9502648194

Merge remote-tracking branch 'origin/master'

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/ToolsStocktakingBoundDetail.java

@@ -131,6 +131,11 @@
    @TableField(exist = false)
    private String classifyId;

    @Dict(dicCode = "application_type")
    @TableField(exist = false)
    private String applicationType;






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

@@ -366,20 +366,22 @@
    <select id="pageWithLedgerAndConfig" resultType="org.jeecg.modules.tms.entity.vo.StocktakingPoundVo">
        SELECT
        t.id,
        t.tool_id  AS toolId,
        t1.classify_id AS classifyId,
        t.create_time AS createTime,
        t.tool_code AS toolCode,
        t2.tool_model AS toolModel,
        t2.parama_table_name AS paramaTableName,
        t1.total_count AS totalCount,
        t1.available_count AS availableCount,
        t.tool_id AS toolId,
        t3.position_code AS positionCode,
        t3.application_type AS applicationType,
        t2.chinese_name AS chineseName,
        t3.chinese_name AS chineseName,
        t3.supplier_id AS supplierId,
        t3.storage_location AS storageLocation,
        t3.main_unit AS mainUnit,

        t1.available_count AS availableCount,
        t1.total_count AS totalCount,
        t3.warehouse_id AS warehouseId,
        t4.classify_id AS classifyId,
        t3.province_city AS provinceCity,
        <!-- 动态字段选择，使用表别名（需确保表已关联） -->
        <choose>
            <when test="ew.paramNameValuePairs.paramaTableName == '1'">

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

@@ -17,12 +17,12 @@
    <select id="selectByMainId" resultType="org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail">
        SELECT
        t.*,
        t2.tool_code AS toolCode,  <!-- 修正：将t1改为t2 -->
        t2.parama_table_name paramaTableName,
        t2.classify_id AS classifyId,
        t4.classify_id AS classifyId,
        t3.storage_location AS storageLocation,
        t3.chinese_name AS chineseName,
        t2.tool_model AS toolModel,
        t3.application_type AS applicationType,
        t3.supplier_id AS supplierId,

        <choose>
@@ -56,9 +56,14 @@
                c.part_material AS partMaterial
            </otherwise>
        </choose>

        FROM tms_stocktaking_bound_detail t
        LEFT JOIN tms_base_tools t2 on t.tool_id = t2.id
        LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
        left join tms_tool_ledger t1 ON  t1.tool_id= t.tool_Code
        left join tms_tool_ledger_detail t5 ON  t5.tool_Code= t.tool_id
        left join tms_tools_classify t4 on t4.id = t1.classify_id
        left join tms_base_tools t2 on t2.id = t.tool_code
        left join tms_tools_config_property t3 on t3.tool_code = t.tool_code


        <choose>
            <when test="ew.paramNameValuePairs.paramaTableName == '1'">