仓库货柜修改

gdg

2021-02-07 61b0fb5802f31e2f7673ddbf30e6d21220b6c7da

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

@@ -18,6 +18,7 @@
    <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">
@@ -31,9 +32,14 @@
  </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
    ,
    sc.controller_name
    from sys_warehouse_container as su
    left join sys_warehouse as ss on su.warehouse_id = ss.id
    left join sys_controller sc on sc.controller_code = su.controller_code
    where su.valid_flag = 1
    and sc.valid_flag = 1
    <if test="warehouseType != null and warehouseType != ''">
      and ss.type = #{warehouseType}
    </if>
@@ -75,7 +81,8 @@
  <update id="updateSysWarehouseContainer" parameterType="com.nanometer.smartlab.entity.SysWarehouseContainer">
    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>