Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
qiuyt
8 months ago
commit
9df7b4a90a
@ -0,0 +1,21 @@
|
|||||||
|
package com.glxp.api.req.basic;
|
||||||
|
|
||||||
|
import com.glxp.api.util.page.ListPageRequest;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author : zhangsan
|
||||||
|
* @date : 2024/10/30 10:42
|
||||||
|
* @modyified By :
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SysWorkplaceQueueBindRequest{
|
||||||
|
private Long id;
|
||||||
|
private String relId;
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,68 +1,78 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?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">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.glxp.api.dao.collect.RelCodeDetailMapper">
|
<mapper namespace="com.glxp.api.dao.collect.RelCodeDetailMapper">
|
||||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.collect.RelCodeDetail">
|
<resultMap id="BaseResultMap" type="com.glxp.api.entity.collect.RelCodeDetail">
|
||||||
<!--@mbg.generated-->
|
<!--@mbg.generated-->
|
||||||
<!--@Table udi_wms_ywj.rel_code_detail-->
|
<!--@Table udi_wms_ywj.rel_code_detail-->
|
||||||
<id column="id" jdbcType="INTEGER" property="id" />
|
<id column="id" jdbcType="INTEGER" property="id"/>
|
||||||
<result column="curCode" jdbcType="VARCHAR" property="curCode" />
|
<result column="curCode" jdbcType="VARCHAR" property="curCode"/>
|
||||||
<result column="packLayer" jdbcType="TINYINT" property="packLayer" />
|
<result column="packLayer" jdbcType="TINYINT" property="packLayer"/>
|
||||||
<result column="parentCode" jdbcType="VARCHAR" property="parentCode" />
|
<result column="parentCode" jdbcType="VARCHAR" property="parentCode"/>
|
||||||
<result column="flag" jdbcType="TINYINT" property="flag" />
|
<result column="flag" jdbcType="TINYINT" property="flag"/>
|
||||||
<result column="batchIdFk" jdbcType="INTEGER" property="batchIdFk" />
|
<result column="batchIdFk" jdbcType="INTEGER" property="batchIdFk"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
<!--@mbg.generated-->
|
<!--@mbg.generated-->
|
||||||
id, curCode, packLayer, parentCode, flag, batchIdFk
|
id,
|
||||||
</sql>
|
curCode,
|
||||||
|
packLayer,
|
||||||
<select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeDetailRequest" resultType="com.glxp.api.res.collect.RelCodeDetailResponse">
|
parentCode,
|
||||||
select
|
flag,
|
||||||
rcd.id,
|
batchIdFk
|
||||||
rcd.curCode,
|
</sql>
|
||||||
rcd.packLayer,
|
<select id="filterList" parameterType="com.glxp.api.req.collect.RelCodeDetailRequest"
|
||||||
rcd.parentCode,
|
resultType="com.glxp.api.res.collect.RelCodeDetailResponse">
|
||||||
rcd.flag,
|
select rcd.id,
|
||||||
rcd.batchIdFk,
|
rcd.curCode,
|
||||||
rcb.productCode,
|
rcd.packLayer,
|
||||||
rcb.subTypeNo,
|
rcd.parentCode,
|
||||||
rcb.cascadeRatio,
|
rcd.flag,
|
||||||
rcb.packageSpec,
|
rcd.batchIdFk,
|
||||||
rcb.comment,
|
rcb.productCode,
|
||||||
rcb.batchNo,
|
rcb.subTypeNo,
|
||||||
rcb.madeDate,
|
rcb.cascadeRatio,
|
||||||
rcb.validateDate,
|
rcb.packageSpec,
|
||||||
rcb.workShop,
|
rcb.comment,
|
||||||
rcb.lineName,
|
rcb.batchNo,
|
||||||
rcb.lineManager,
|
rcb.madeDate,
|
||||||
rcb.createTime,
|
rcb.validateDate,
|
||||||
rcb.createUser,
|
rcb.workShop,
|
||||||
rcb.updateTime,
|
rcb.lineName,
|
||||||
rcb.updateUser
|
rcb.lineManager,
|
||||||
from rel_code_detail rcd
|
rcb.createTime,
|
||||||
left join rel_code_batch rcb on rcb.id = rcd.batchIdFk
|
rcb.createUser,
|
||||||
<where>
|
rcb.updateTime,
|
||||||
<if test="productCode != '' and productCode != null">
|
rcb.updateUser
|
||||||
AND rcb.productCode LIKE concat('%', #{productCode}, '%')
|
from rel_code_detail rcd
|
||||||
</if>
|
left join rel_code_batch rcb on rcb.id = rcd.batchIdFk
|
||||||
<if test=" batchIdFk != null">
|
<where>
|
||||||
AND rcb.id = #{batchIdFk}
|
<if test="productCode != '' and productCode != null">
|
||||||
</if>
|
AND rcb.productCode LIKE concat('%', #{productCode}, '%')
|
||||||
<if test="batchNo != null and batchNo != ''">
|
</if>
|
||||||
AND rcb.batchNo = #{batchNo}
|
<if test="batchIdFk != null">
|
||||||
</if>
|
AND rcb.id = #{batchIdFk}
|
||||||
<if test="keyWords != '' and keyWords != null">
|
</if>
|
||||||
and (
|
<if test="curCode != null">
|
||||||
rcb.productCode LIKE concat('%', #{keyWords}, '%')
|
AND rcd.curCode = #{curCode}
|
||||||
or rcb.subTypeNo LIKE concat('%', #{keyWords}, '%')
|
</if>
|
||||||
or rcb.packageSpec LIKE concat('%', #{keyWords}, '%'))
|
<if test="parentCode != null">
|
||||||
</if>
|
AND rcd.parentCode = #{parentCode}
|
||||||
<if test="lineName != '' and lineName != null">
|
</if>
|
||||||
AND rcb.lineName LIKE concat('%', #{lineName}, '%')
|
<if test="batchNo != null and batchNo != ''">
|
||||||
</if>
|
AND rcb.batchNo = #{batchNo}
|
||||||
<if test="lineManager != '' and lineManager != null">
|
</if>
|
||||||
AND rcb.lineManager LIKE concat('%', #{lineManager}, '%')
|
<if test="keyWords != '' and keyWords != null">
|
||||||
</if>
|
and (
|
||||||
</where>
|
rcb.productCode LIKE concat('%', #{keyWords}, '%')
|
||||||
</select>
|
or rcb.subTypeNo LIKE concat('%', #{keyWords}, '%')
|
||||||
|
or rcb.packageSpec LIKE concat('%', #{keyWords}, '%'))
|
||||||
|
</if>
|
||||||
|
<if test="lineName != '' and lineName != null">
|
||||||
|
AND rcb.lineName LIKE concat('%', #{lineName}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="lineManager != '' and lineManager != null">
|
||||||
|
AND rcb.lineManager LIKE concat('%', #{lineManager}, '%')
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Loading…
Reference in New Issue