Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 23855599412c4d61b38d78f0f3abd3430a48b5b1

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

对比新文件
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.OutboundDetailMapper">

   <delete id="deleteByMainId" parameterType="java.lang.String">
      DELETE 
      FROM  tms_outbound_detail 
      WHERE
          out_storehouse_id = #{mainId} 
   </delete>
	
   <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.tms.entity.OutboundDetail">
      SELECT * 
      FROM  tms_outbound_detail
      WHERE
          out_storehouse_id = #{mainId} 
   </select>
    <select id="queryPageList" resultType="org.jeecg.modules.tms.entity.vo.OutboundDetailVo">
      SELECT
         t1.id,
         t1.out_storehouse_id outStorehouseId,
         t1.tool_code toolCode,
         t1.tool_id toolId,
         t2.tool_code toolNum,
         t2.accuracy_class accuracyClass,
         t1.outbound_quantity outboundQuantity,
         t1.out_actual_count outActualCount,
         t1.outbound_time outboundTime,
         t1.storage_location storageLocation,
         t1.outbound_location outboundLocation,
         t1.status,
         t1.create_by createBy,
         t1.create_time createTime,
         t2.chinese_name chineseName,
         t2.tool_model toolModel,
         t2.parama_table_name paramaTableName,
         t3.application_type applicationType,
         t3.supplier_id supplierId,
         t11.id toolLedgerDetailId,
         t11.quantity,
         t13.id toolSharpeningId,
         ISNULL(t12.warehouse_id, '') + '/' + ISNULL(t12.warehouse_name, '') warehouseName,
         <choose>
            <when test="ew.paramNameValuePairs.paramaTableName == '1'">
               t4.tool_material toolMaterial,
               t4.part_material partMaterial
            </when>
            <when test="ew.paramNameValuePairs.paramaTableName == '2'">
               t5.tool_material toolMaterial,
               t5.part_material partMaterial
            </when>
            <when test="ew.paramNameValuePairs.paramaTableName == '3'">
               t6.tool_material toolMaterial,
               t6.part_material partMaterial
            </when>
            <when test="ew.paramNameValuePairs.paramaTableName == '4'">
               t7.tool_material toolMaterial,
               t7.part_material partMaterial
            </when>
            <when test="ew.paramNameValuePairs.paramaTableName == '5'">
               t8.tool_material toolMaterial,
               t8.part_material partMaterial
            </when>
            <when test="ew.paramNameValuePairs.paramaTableName == '6'">
               t9.tool_material toolMaterial,
               t9.part_material partMaterial
            </when>
            <otherwise>
               t10.tool_material toolMaterial,
               t10.part_material partMaterial
            </otherwise>
         </choose>
      FROM tms_outbound_detail t1
      LEFT JOIN tms_base_tools t2 on t1.tool_code = t2.id
      LEFT JOIN tms_tools_config_property t3 on t3.tool_code = t2.id
      LEFT JOIN tms_tool_ledger_detail t11 on t1.tool_code = t11.tool_code and t1.tool_id = t11.tool_id
      LEFT JOIN tms_tool_sharpening t13 on t1.tool_code = t13.tool_code and t1.tool_id = t13.tool_id
      LEFT JOIN tms_warehouse t12 on t1.storage_location = t12.id
      <choose>
         <when test="ew.paramNameValuePairs.paramaTableName == '1'">
            LEFT JOIN tms_para_common_tool t4 on t4.tool_code = t2.id
         </when>
         <when test="ew.paramNameValuePairs.paramaTableName == '2'">
            LEFT JOIN tms_para_hole_tools t5 on t5.tool_code = t2.id
         </when>
         <when test="ew.paramNameValuePairs.paramaTableName == '3'">
            LEFT JOIN tms_para_threading_tool t6 on t6.tool_code = t2.id
         </when>
         <when test="ew.paramNameValuePairs.paramaTableName == '4'">
            LEFT JOIN tms_para_mill_tool t7 on t7.tool_code = t2.id
         </when>
         <when test="ew.paramNameValuePairs.paramaTableName == '5'">
            LEFT JOIN tms_para_turning_tools t8 on t8.tool_code = t2.id
         </when>
         <when test="ew.paramNameValuePairs.paramaTableName == '6'">
            LEFT JOIN tms_para_blade t9 on t9.tool_code = t2.id
         </when>
         <otherwise>
            LEFT JOIN tms_para_common_tool t10 on t10.tool_code = t2.id
         </otherwise>
      </choose>
      ${ew.customSqlSegment}
   </select>
</mapper>