change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/java/com/nanometer/smartlab/dao/SysWarehouseContainerDao.xml

@@ -18,20 +18,22 @@
    <result property="characterLeft" column="character_left"></result>
    <result property="characterRight" column="character_right"></result>
    <result property="controllerCode" column="controller_code"></result>
    <result property="controllerName" column="controller_name"></result>
  </resultMap>

  <select id="getSysWarehouseContainerInfoList" parameterType="java.util.Map" resultMap="SysWarehouseContainer">
    select container_code,name,valid_flag,type,character_left,character_right from sys_warehouse_container where update_time >= #{startTime} and #{endTime} > update_time
  </select>

  <select id="getSysWarehouseContainer" parameterType="java.lang.String"  resultMap="SysWarehouseContainer" >
  <select id="getSysWarehouseContainer"   resultMap="SysWarehouseContainer" >
    select su.*,ss.name as warehouseName, ss.type as warehouseType from sys_warehouse_container as su
    left join sys_warehouse as ss on su.warehouse_id = ss.id
    where su.id = #{id} and su.valid_flag = 1
  </select>

  <select id="getSysWarehouseContainerList" parameterType="java.util.Map" resultMap="SysWarehouseContainer">
    select su.*,ss.name as warehouseName, ss.type as warehouseType  from sys_warehouse_container as su
    select su.*,ss.name as warehouseName, ss.type as warehouseType
    from sys_warehouse_container as su
    left join sys_warehouse as ss on su.warehouse_id = ss.id
    where su.valid_flag = 1
    <if test="warehouseType != null and warehouseType != ''">
@@ -43,7 +45,7 @@
    <if test="warehouseId != null and warehouseId != ''">
      and ss.id like #{warehouseId}
    </if>
    order by ss.name ASC
    order by ss.name ASC,su.create_time DESC
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
    </if>
@@ -67,15 +69,16 @@
    </if>
  </select>

  <insert id="insertSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer">
    insert into sys_warehouse_container(id, warehouse_id, type, container_code, info_code, structure, name, valid_flag, character_left, character_right, create_time, update_time, controller_code)
    values (#{id}, #{warehouseId}, #{type}, #{containerCode}, #{infoCode}, #{structure}, #{name}, 1, #{characterLeft}, #{characterRight}, now(), now(), #{controllerCode})
  <insert id="insertSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer" useGeneratedKeys = "true" keyProperty = "id">
    insert into sys_warehouse_container(warehouse_id, type, container_code, info_code, structure, name, valid_flag, character_left, character_right, create_time, update_time, controller_code)
    values ( #{warehouseId}, #{type}, #{containerCode}, #{infoCode}, #{structure}, #{name}, 1, #{characterLeft}, #{characterRight}, now(), now(), #{controllerCode})
  </insert>

  <update id="updateSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer">
    update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode}, 
    update sys_warehouse_container set warehouse_id=#{warehouseId}, type=#{type}, container_code=#{containerCode},
    info_code=#{infoCode}, structure=#{structure}, name=#{name}, character_left=#{characterLeft}, character_right=#{characterRight},
    update_time=now()
    update_time=now(),
    controller_code=#{controllerCode}
    where id=#{id}
  </update>

@@ -87,7 +90,7 @@
    </foreach>
  </update>

  <select id="getSysWarehouseContainerByContainerCode" parameterType="java.lang.String" resultMap="SysWarehouseContainer">
  <select id="getSysWarehouseContainerByContainerCode"  resultMap="SysWarehouseContainer">
    select * from sys_warehouse_container
    where container_code = #{containerCode} and valid_flag = 1
  </select>
@@ -107,13 +110,13 @@
    </foreach>
  </select>

  <update id="updateSysWarehouseContainerClearControllerCode" parameterType="java.lang.String" >
  <update id="updateSysWarehouseContainerClearControllerCode"  >
    update sys_warehouse_container set
    controller_code=null
    where controller_code=#{controllerCode}
  </update>

  <select id="getSysWarehouseContainerByControllerCode" parameterType="java.lang.String" resultMap="SysWarehouseContainer">
  <select id="getSysWarehouseContainerByControllerCode"  resultMap="SysWarehouseContainer">
    select * from sys_warehouse_container
    where controller_code = #{controllerCode}
  </select>