第三方出库明细
							parent
							
								
									1551cd46e2
								
							
						
					
					
						commit
						778258acec
					
				| @ -1,205 +0,0 @@ | |||||||
| package com.glxp.api.entity.thrsys; |  | ||||||
| 
 |  | ||||||
| import com.baomidou.mybatisplus.annotation.IdType; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableField; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableId; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableName; |  | ||||||
| import io.swagger.annotations.ApiModel; |  | ||||||
| import io.swagger.annotations.ApiModelProperty; |  | ||||||
| import java.io.Serializable; |  | ||||||
| import java.math.BigDecimal; |  | ||||||
| import java.util.Date; |  | ||||||
| import lombok.Data; |  | ||||||
| 
 |  | ||||||
| @ApiModel(value="com-glxp-api-entity-thrsys-ThrInvOrderDetail") |  | ||||||
| @Data |  | ||||||
| @TableName(value = "thr_inv_order_detail") |  | ||||||
| public class ThrInvOrderDetailEntity implements Serializable { |  | ||||||
|     @TableId(value = "id", type = IdType.INPUT) |  | ||||||
|     @ApiModelProperty(value="") |  | ||||||
|     private Integer id; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 单据号 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "orderIdFk") |  | ||||||
|     @ApiModelProperty(value="单据号") |  | ||||||
|     private String orderIdFk; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 产品通用名称 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "cpmctymc") |  | ||||||
|     @ApiModelProperty(value="产品通用名称") |  | ||||||
|     private String cpmctymc; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 物资字典主键 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "relId") |  | ||||||
|     @ApiModelProperty(value="物资字典主键") |  | ||||||
|     private Integer relId; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 第三方项目编码/耗材字典 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "thrCode") |  | ||||||
|     @ApiModelProperty(value="第三方项目编码/耗材字典") |  | ||||||
|     private String thrCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * DI |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "nameCode") |  | ||||||
|     @ApiModelProperty(value="DI") |  | ||||||
|     private String nameCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 规格型号 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "ggxh") |  | ||||||
|     @ApiModelProperty(value="规格型号") |  | ||||||
|     private String ggxh; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 批次号 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "batchNo") |  | ||||||
|     @ApiModelProperty(value="批次号") |  | ||||||
|     private Integer batchNo; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 计量单位 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "measname") |  | ||||||
|     @ApiModelProperty(value="计量单位") |  | ||||||
|     private String measname; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 价格 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "price") |  | ||||||
|     @ApiModelProperty(value="价格") |  | ||||||
|     private BigDecimal price; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 生产日期 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "productionDate") |  | ||||||
|     @ApiModelProperty(value="生产日期") |  | ||||||
|     private Date productionDate; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 失效日期 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "expireDate") |  | ||||||
|     @ApiModelProperty(value="失效日期") |  | ||||||
|     private Date expireDate; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 医疗器械注册备案人 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "ylqxzcrbarmc") |  | ||||||
|     @ApiModelProperty(value="医疗器械注册备案人") |  | ||||||
|     private String ylqxzcrbarmc; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 注册/备案号 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "zczbhhzbapzbh") |  | ||||||
|     @ApiModelProperty(value="注册/备案号") |  | ||||||
|     private String zczbhhzbapzbh; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 入库数量 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "inCount") |  | ||||||
|     @ApiModelProperty(value="入库数量") |  | ||||||
|     private String inCount; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 出库数量 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "outCount") |  | ||||||
|     @ApiModelProperty(value="出库数量") |  | ||||||
|     private String outCount; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 供应商 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "supName") |  | ||||||
|     @ApiModelProperty(value="供应商") |  | ||||||
|     private String supName; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 部门 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "deptName") |  | ||||||
|     @ApiModelProperty(value="部门") |  | ||||||
|     private String deptName; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 部门编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "deptCode") |  | ||||||
|     @ApiModelProperty(value="部门编码") |  | ||||||
|     private String deptCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 仓库 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "invName") |  | ||||||
|     @ApiModelProperty(value="仓库") |  | ||||||
|     private String invName; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 仓库编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "invCode") |  | ||||||
|     @ApiModelProperty(value="仓库编码") |  | ||||||
|     private String invCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 货位 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "spaceCode") |  | ||||||
|     @ApiModelProperty(value="货位") |  | ||||||
|     private String spaceCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 货位编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "spaceName") |  | ||||||
|     @ApiModelProperty(value="货位编码") |  | ||||||
|     private String spaceName; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 实际数量 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "reCount") |  | ||||||
|     @ApiModelProperty(value="实际数量") |  | ||||||
|     private String reCount; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 出入库类型 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "mainAction") |  | ||||||
|     @ApiModelProperty(value="出入库类型") |  | ||||||
|     private String mainAction; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 生产企业 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "manufacturer") |  | ||||||
|     @ApiModelProperty(value="生产企业") |  | ||||||
|     private String manufacturer; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 备注 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "remark") |  | ||||||
|     @ApiModelProperty(value="备注") |  | ||||||
|     private String remark; |  | ||||||
| 
 |  | ||||||
|     private static final long serialVersionUID = 1L; |  | ||||||
| } |  | ||||||
| @ -1,132 +0,0 @@ | |||||||
| package com.glxp.api.entity.thrsys; |  | ||||||
| 
 |  | ||||||
| import com.baomidou.mybatisplus.annotation.IdType; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableField; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableId; |  | ||||||
| import com.baomidou.mybatisplus.annotation.TableName; |  | ||||||
| import io.swagger.annotations.ApiModel; |  | ||||||
| import io.swagger.annotations.ApiModelProperty; |  | ||||||
| 
 |  | ||||||
| import java.io.Serializable; |  | ||||||
| import java.util.Date; |  | ||||||
| 
 |  | ||||||
| import lombok.Data; |  | ||||||
| 
 |  | ||||||
| /** |  | ||||||
|  * 库存出入库明细 |  | ||||||
|  */ |  | ||||||
| @ApiModel(value = "com-glxp-api-entity-thrsys-ThrInvOrder") |  | ||||||
| @Data |  | ||||||
| @TableName(value = "thr_inv_order") |  | ||||||
| public class ThrInvOrderEntity implements Serializable { |  | ||||||
|     @TableId(value = "id", type = IdType.INPUT) |  | ||||||
|     @ApiModelProperty(value = "") |  | ||||||
|     private Integer id; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 单据号 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "billNo") |  | ||||||
|     @ApiModelProperty(value = "单据号") |  | ||||||
|     private String billNo; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 单据时间 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "billDate") |  | ||||||
|     @ApiModelProperty(value = "单据时间") |  | ||||||
|     private Date billDate; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 库存开始时间 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "startDate") |  | ||||||
|     @ApiModelProperty(value = "库存开始时间") |  | ||||||
|     private Date startDate; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 库存结束时间 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "endDate") |  | ||||||
|     @ApiModelProperty(value = "库存结束时间") |  | ||||||
|     private Date endDate; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 出入库类型 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "mainAction") |  | ||||||
|     @ApiModelProperty(value = "出入库类型") |  | ||||||
|     private String mainAction; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 第三方单据类型 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "billType") |  | ||||||
|     @ApiModelProperty(value = "第三方单据类型") |  | ||||||
|     private String billType; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 部门编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "deptCode") |  | ||||||
|     @ApiModelProperty(value = "部门编码") |  | ||||||
|     private String deptCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 仓库编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "invCode") |  | ||||||
|     @ApiModelProperty(value = "仓库编码") |  | ||||||
|     private String invCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 货位编码 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "spaceCode") |  | ||||||
|     @ApiModelProperty(value = "货位编码") |  | ||||||
|     private String spaceCode; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 单据状态 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "`status`") |  | ||||||
|     @ApiModelProperty(value = "单据状态") |  | ||||||
|     private Byte status; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 创建时间 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "createTime") |  | ||||||
|     @ApiModelProperty(value = "创建时间") |  | ||||||
|     private Date createTime; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 创建人 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "`createUser`") |  | ||||||
|     @ApiModelProperty(value = "创建人") |  | ||||||
|     private String createUser; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 更新时间 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "updateTime") |  | ||||||
|     @ApiModelProperty(value = "更新时间") |  | ||||||
|     private Date updateTime; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 更新人 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "updateUser") |  | ||||||
|     @ApiModelProperty(value = "更新人") |  | ||||||
|     private String updateUser; |  | ||||||
| 
 |  | ||||||
|     /** |  | ||||||
|      * 备注 |  | ||||||
|      */ |  | ||||||
|     @TableField(value = "remark") |  | ||||||
|     @ApiModelProperty(value = "备注") |  | ||||||
|     private String remark; |  | ||||||
| 
 |  | ||||||
|     private static final long serialVersionUID = 1L; |  | ||||||
| } |  | ||||||
| @ -1,302 +1,290 @@ | |||||||
| <?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.thrsys.ThrInvOrderMapper"> | <mapper namespace="com.glxp.api.dao.thrsys.ThrInvOrderMapper"> | ||||||
|   <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrInvOrder"> |     <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrInvOrder"> | ||||||
|     <!--@mbg.generated--> |         <!--@mbg.generated--> | ||||||
|     <!--@Table thr_inv_order--> |         <!--@Table thr_inv_order--> | ||||||
|     <id column="id" jdbcType="INTEGER" property="id" /> |         <id column="id" jdbcType="INTEGER" property="id"/> | ||||||
|     <result column="billNo" jdbcType="VARCHAR" property="billNo" /> |         <result column="billNo" jdbcType="VARCHAR" property="billNo"/> | ||||||
|     <result column="billDate" jdbcType="TIMESTAMP" property="billDate" /> |         <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/> | ||||||
|     <result column="startDate" jdbcType="TIMESTAMP" property="startDate" /> |         <result column="startDate" jdbcType="TIMESTAMP" property="startDate"/> | ||||||
|     <result column="endDate" jdbcType="TIMESTAMP" property="endDate" /> |         <result column="endDate" jdbcType="TIMESTAMP" property="endDate"/> | ||||||
|     <result column="mainAction" jdbcType="VARCHAR" property="mainAction" /> |         <result column="mainAction" jdbcType="VARCHAR" property="mainAction"/> | ||||||
|     <result column="billType" jdbcType="VARCHAR" property="billType" /> |         <result column="billType" jdbcType="VARCHAR" property="billType"/> | ||||||
|     <result column="thirdSysFk" jdbcType="VARCHAR" property="thirdSysFk" /> |         <result column="thirdSysFk" jdbcType="VARCHAR" property="thirdSysFk"/> | ||||||
|     <result column="deptCode" jdbcType="VARCHAR" property="deptCode" /> |         <result column="deptCode" jdbcType="VARCHAR" property="deptCode"/> | ||||||
|     <result column="invCode" jdbcType="VARCHAR" property="invCode" /> |         <result column="invCode" jdbcType="VARCHAR" property="invCode"/> | ||||||
|     <result column="spaceCode" jdbcType="VARCHAR" property="spaceCode" /> |         <result column="spaceCode" jdbcType="VARCHAR" property="spaceCode"/> | ||||||
|     <result column="status" jdbcType="TINYINT" property="status" /> |         <result column="status" jdbcType="TINYINT" property="status"/> | ||||||
|     <result column="createTime" jdbcType="TIMESTAMP" property="createTime" /> |         <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/> | ||||||
|     <result column="createUser" jdbcType="VARCHAR" property="createUser" /> |         <result column="createUser" jdbcType="VARCHAR" property="createUser"/> | ||||||
|     <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" /> |         <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/> | ||||||
|     <result column="updateUser" jdbcType="VARCHAR" property="updateUser" /> |         <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/> | ||||||
|     <result column="remark" jdbcType="VARCHAR" property="remark" /> |         <result column="remark" jdbcType="VARCHAR" property="remark"/> | ||||||
|     <result column="sourceType" jdbcType="INTEGER" property="sourceType" /> |         <result column="sourceType" jdbcType="INTEGER" property="sourceType"/> | ||||||
|     <result column="exMsg" jdbcType="VARCHAR" property="exMsg" /> |         <result column="exMsg" jdbcType="VARCHAR" property="exMsg"/> | ||||||
|     <result column="skProject" jdbcType="INTEGER" property="skProject" /> |         <result column="skProject" jdbcType="INTEGER" property="skProject"/> | ||||||
|   </resultMap> |     </resultMap> | ||||||
|   <sql id="Base_Column_List"> |     <sql id="Base_Column_List"> | ||||||
|     <!--@mbg.generated--> |         <!--@mbg.generated--> | ||||||
|     id, billNo, billDate, startDate, endDate, mainAction, billType,thirdSysFk, deptCode, invCode, |         id, billNo, billDate, startDate, endDate, mainAction, billType,thirdSysFk, deptCode, invCode, | ||||||
|     spaceCode, `status`, createTime, `createUser`, updateTime, updateUser, remark,sourceType,exMsg,skProject |         spaceCode, `status`, createTime, `createUser`, updateTime, updateUser, remark,sourceType,exMsg,skProject | ||||||
|   </sql> |     </sql> | ||||||
|   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> |     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> | ||||||
|     <!--@mbg.generated--> |         <!--@mbg.generated--> | ||||||
|     select |         select | ||||||
|     <include refid="Base_Column_List" /> |         <include refid="Base_Column_List"/> | ||||||
|     from thr_inv_order |         from thr_inv_order | ||||||
|     where id = #{id,jdbcType=INTEGER} |         where id = #{id,jdbcType=INTEGER} | ||||||
|   </select> |     </select> | ||||||
|   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> |     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> | ||||||
|     <!--@mbg.generated--> |         <!--@mbg.generated--> | ||||||
|     delete from thr_inv_order |         delete | ||||||
|     where id = #{id,jdbcType=INTEGER} |         from thr_inv_order | ||||||
|   </delete> |         where id = #{id,jdbcType=INTEGER} | ||||||
|   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder" useGeneratedKeys="true"> |     </delete> | ||||||
|     <!--@mbg.generated--> |     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder" | ||||||
|     insert into thr_inv_order (billNo, billDate, startDate, |             useGeneratedKeys="true"> | ||||||
|       endDate, mainAction, billType,thirdSysFk, |         <!--@mbg.generated--> | ||||||
|       deptCode, invCode, spaceCode, |         insert into thr_inv_order | ||||||
|       `status`, createTime, `createUser`, |         <trim prefix="(" suffix=")" suffixOverrides=","> | ||||||
|       updateTime, updateUser, remark,sourceType,exMsg,skProject |             <if test="billNo != null"> | ||||||
|       ) |                 billNo, | ||||||
|     values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{startDate,jdbcType=TIMESTAMP}, |             </if> | ||||||
|       #{endDate,jdbcType=TIMESTAMP}, #{mainAction,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},#{thirdSysFk,jdbcType=VARCHAR}, |             <if test="billDate != null"> | ||||||
|       #{deptCode,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR}, |                 billDate, | ||||||
|       #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=VARCHAR}, |             </if> | ||||||
|       #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{sourceType,jdbcType=INTEGER} |             <if test="startDate != null"> | ||||||
|     , #{exMsg,jdbcType=VARCHAR}, #{skProject,jdbcType=INTEGER} |                 startDate, | ||||||
|       ) |             </if> | ||||||
|   </insert> |             <if test="endDate != null"> | ||||||
|   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder" useGeneratedKeys="true"> |                 endDate, | ||||||
|     <!--@mbg.generated--> |             </if> | ||||||
|     insert into thr_inv_order |             <if test="mainAction != null"> | ||||||
|     <trim prefix="(" suffix=")" suffixOverrides=","> |                 mainAction, | ||||||
|       <if test="billNo != null"> |             </if> | ||||||
|         billNo, |             <if test="billType != null"> | ||||||
|       </if> |                 billType, | ||||||
|       <if test="billDate != null"> |             </if> | ||||||
|         billDate, |             <if test="thirdSysFk != null"> | ||||||
|       </if> |                 thirdSysFk, | ||||||
|       <if test="startDate != null"> |             </if> | ||||||
|         startDate, |             <if test="deptCode != null"> | ||||||
|       </if> |                 deptCode, | ||||||
|       <if test="endDate != null"> |             </if> | ||||||
|         endDate, |             <if test="invCode != null"> | ||||||
|       </if> |                 invCode, | ||||||
|       <if test="mainAction != null"> |             </if> | ||||||
|         mainAction, |             <if test="spaceCode != null"> | ||||||
|       </if> |                 spaceCode, | ||||||
|       <if test="billType != null"> |             </if> | ||||||
|         billType, |             <if test="status != null"> | ||||||
|       </if> |                 `status`, | ||||||
|       <if test="thirdSysFk != null"> |             </if> | ||||||
|         thirdSysFk, |             <if test="createTime != null"> | ||||||
|       </if> |                 createTime, | ||||||
|       <if test="deptCode != null"> |             </if> | ||||||
|         deptCode, |             <if test="createUser != null"> | ||||||
|       </if> |                 `createUser`, | ||||||
|       <if test="invCode != null"> |             </if> | ||||||
|         invCode, |             <if test="updateTime != null"> | ||||||
|       </if> |                 updateTime, | ||||||
|       <if test="spaceCode != null"> |             </if> | ||||||
|         spaceCode, |             <if test="updateUser != null"> | ||||||
|       </if> |                 updateUser, | ||||||
|       <if test="status != null"> |             </if> | ||||||
|         `status`, |             <if test="remark != null"> | ||||||
|       </if> |                 remark, | ||||||
|       <if test="createTime != null"> |             </if> | ||||||
|         createTime, |             <if test="sourceType != null"> | ||||||
|       </if> |                 sourceType, | ||||||
|       <if test="createUser != null"> |             </if> | ||||||
|         `createUser`, |             <if test="exMsg != null"> | ||||||
|       </if> |                 exMsg, | ||||||
|       <if test="updateTime != null"> |             </if> | ||||||
|         updateTime, |             <if test="skProject != null"> | ||||||
|       </if> |                 skProject, | ||||||
|       <if test="updateUser != null"> |             </if> | ||||||
|         updateUser, |         </trim> | ||||||
|       </if> |         <trim prefix="values (" suffix=")" suffixOverrides=","> | ||||||
|       <if test="remark != null"> |             <if test="billNo != null"> | ||||||
|         remark, |                 #{billNo,jdbcType=VARCHAR}, | ||||||
|       </if> |             </if> | ||||||
|       <if test="sourceType != null"> |             <if test="billDate != null"> | ||||||
|         sourceType, |                 #{billDate,jdbcType=TIMESTAMP}, | ||||||
|       </if> |             </if> | ||||||
|       <if test="exMsg != null"> |             <if test="startDate != null"> | ||||||
|         exMsg, |                 #{startDate,jdbcType=TIMESTAMP}, | ||||||
|       </if> |             </if> | ||||||
|       <if test="skProject != null"> |             <if test="endDate != null"> | ||||||
|         skProject, |                 #{endDate,jdbcType=TIMESTAMP}, | ||||||
|       </if> |             </if> | ||||||
|     </trim> |             <if test="mainAction != null"> | ||||||
|     <trim prefix="values (" suffix=")" suffixOverrides=","> |                 #{mainAction,jdbcType=VARCHAR}, | ||||||
|       <if test="billNo != null"> |             </if> | ||||||
|         #{billNo,jdbcType=VARCHAR}, |             <if test="billType != null"> | ||||||
|       </if> |                 #{billType,jdbcType=VARCHAR}, | ||||||
|       <if test="billDate != null"> |             </if> | ||||||
|         #{billDate,jdbcType=TIMESTAMP}, |             <if test="thirdSysFk != null"> | ||||||
|       </if> |                 #{thirdSysFk,jdbcType=VARCHAR}, | ||||||
|       <if test="startDate != null"> |             </if> | ||||||
|         #{startDate,jdbcType=TIMESTAMP}, |             <if test="deptCode != null"> | ||||||
|       </if> |                 #{deptCode,jdbcType=VARCHAR}, | ||||||
|       <if test="endDate != null"> |             </if> | ||||||
|         #{endDate,jdbcType=TIMESTAMP}, |             <if test="invCode != null"> | ||||||
|       </if> |                 #{invCode,jdbcType=VARCHAR}, | ||||||
|       <if test="mainAction != null"> |             </if> | ||||||
|         #{mainAction,jdbcType=VARCHAR}, |             <if test="spaceCode != null"> | ||||||
|       </if> |                 #{spaceCode,jdbcType=VARCHAR}, | ||||||
|       <if test="billType != null"> |             </if> | ||||||
|         #{billType,jdbcType=VARCHAR}, |             <if test="status != null"> | ||||||
|       </if> |                 #{status,jdbcType=TINYINT}, | ||||||
|       <if test="thirdSysFk != null"> |             </if> | ||||||
|         #{thirdSysFk,jdbcType=VARCHAR}, |             <if test="createTime != null"> | ||||||
|       </if> |                 #{createTime,jdbcType=TIMESTAMP}, | ||||||
|       <if test="deptCode != null"> |             </if> | ||||||
|         #{deptCode,jdbcType=VARCHAR}, |             <if test="createUser != null"> | ||||||
|       </if> |                 #{createUser,jdbcType=VARCHAR}, | ||||||
|       <if test="invCode != null"> |             </if> | ||||||
|         #{invCode,jdbcType=VARCHAR}, |             <if test="updateTime != null"> | ||||||
|       </if> |                 #{updateTime,jdbcType=TIMESTAMP}, | ||||||
|       <if test="spaceCode != null"> |             </if> | ||||||
|         #{spaceCode,jdbcType=VARCHAR}, |             <if test="updateUser != null"> | ||||||
|       </if> |                 #{updateUser,jdbcType=VARCHAR}, | ||||||
|       <if test="status != null"> |             </if> | ||||||
|         #{status,jdbcType=TINYINT}, |             <if test="remark != null"> | ||||||
|       </if> |                 #{remark,jdbcType=VARCHAR}, | ||||||
|       <if test="createTime != null"> |             </if> | ||||||
|         #{createTime,jdbcType=TIMESTAMP}, |             <if test="sourceType != null"> | ||||||
|       </if> |                 #{sourceType,jdbcType=INTEGER}, | ||||||
|       <if test="createUser != null"> |             </if> | ||||||
|         #{createUser,jdbcType=VARCHAR}, |             <if test="exMsg != null"> | ||||||
|       </if> |                 #{exMsg,jdbcType=VARCHAR}, | ||||||
|       <if test="updateTime != null"> |             </if> | ||||||
|         #{updateTime,jdbcType=TIMESTAMP}, |             <if test="skProject != null"> | ||||||
|       </if> |                 #{skProject,jdbcType=INTEGER}, | ||||||
|       <if test="updateUser != null"> |             </if> | ||||||
|         #{updateUser,jdbcType=VARCHAR}, |         </trim> | ||||||
|       </if> |     </insert> | ||||||
|       <if test="remark != null"> |     <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder"> | ||||||
|         #{remark,jdbcType=VARCHAR}, |         <!--@mbg.generated--> | ||||||
|       </if> |         update thr_inv_order | ||||||
|       <if test="sourceType != null"> |         <set> | ||||||
|         #{sourceType,jdbcType=INTEGER}, |             <if test="billNo != null"> | ||||||
|       </if> |                 billNo = #{billNo,jdbcType=VARCHAR}, | ||||||
|       <if test="exMsg != null"> |             </if> | ||||||
|         #{exMsg,jdbcType=VARCHAR}, |             <if test="billDate != null"> | ||||||
|       </if> |                 billDate = #{billDate,jdbcType=TIMESTAMP}, | ||||||
|       <if test="skProject != null"> |             </if> | ||||||
|         #{skProject,jdbcType=INTEGER}, |             <if test="startDate != null"> | ||||||
|       </if> |                 startDate = #{startDate,jdbcType=TIMESTAMP}, | ||||||
|     </trim> |             </if> | ||||||
|   </insert> |             <if test="endDate != null"> | ||||||
|   <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder"> |                 endDate = #{endDate,jdbcType=TIMESTAMP}, | ||||||
|     <!--@mbg.generated--> |             </if> | ||||||
|     update thr_inv_order |             <if test="mainAction != null"> | ||||||
|     <set> |                 mainAction = #{mainAction,jdbcType=VARCHAR}, | ||||||
|       <if test="billNo != null"> |             </if> | ||||||
|         billNo = #{billNo,jdbcType=VARCHAR}, |             <if test="billType != null"> | ||||||
|       </if> |                 billType = #{billType,jdbcType=VARCHAR}, | ||||||
|       <if test="billDate != null"> |             </if> | ||||||
|         billDate = #{billDate,jdbcType=TIMESTAMP}, |             <if test="thirdSysFk != null"> | ||||||
|       </if> |                 thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, | ||||||
|       <if test="startDate != null"> |             </if> | ||||||
|         startDate = #{startDate,jdbcType=TIMESTAMP}, |             <if test="deptCode != null"> | ||||||
|       </if> |                 deptCode = #{deptCode,jdbcType=VARCHAR}, | ||||||
|       <if test="endDate != null"> |             </if> | ||||||
|         endDate = #{endDate,jdbcType=TIMESTAMP}, |             <if test="invCode != null"> | ||||||
|       </if> |                 invCode = #{invCode,jdbcType=VARCHAR}, | ||||||
|       <if test="mainAction != null"> |             </if> | ||||||
|         mainAction = #{mainAction,jdbcType=VARCHAR}, |             <if test="spaceCode != null"> | ||||||
|       </if> |                 spaceCode = #{spaceCode,jdbcType=VARCHAR}, | ||||||
|       <if test="billType != null"> |             </if> | ||||||
|         billType = #{billType,jdbcType=VARCHAR}, |             <if test="status != null"> | ||||||
|       </if> |                 `status` = #{status,jdbcType=TINYINT}, | ||||||
|       <if test="thirdSysFk != null"> |             </if> | ||||||
|         thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, |             <if test="createTime != null"> | ||||||
|       </if> |                 createTime = #{createTime,jdbcType=TIMESTAMP}, | ||||||
|       <if test="deptCode != null"> |             </if> | ||||||
|         deptCode = #{deptCode,jdbcType=VARCHAR}, |             <if test="createUser != null"> | ||||||
|       </if> |                 `createUser` = #{createUser,jdbcType=VARCHAR}, | ||||||
|       <if test="invCode != null"> |             </if> | ||||||
|         invCode = #{invCode,jdbcType=VARCHAR}, |             <if test="updateTime != null"> | ||||||
|       </if> |                 updateTime = #{updateTime,jdbcType=TIMESTAMP}, | ||||||
|       <if test="spaceCode != null"> |             </if> | ||||||
|         spaceCode = #{spaceCode,jdbcType=VARCHAR}, |             <if test="updateUser != null"> | ||||||
|       </if> |                 updateUser = #{updateUser,jdbcType=VARCHAR}, | ||||||
|       <if test="status != null"> |             </if> | ||||||
|         `status` = #{status,jdbcType=TINYINT}, |             <if test="remark != null"> | ||||||
|       </if> |                 remark = #{remark,jdbcType=VARCHAR}, | ||||||
|       <if test="createTime != null"> |             </if> | ||||||
|         createTime = #{createTime,jdbcType=TIMESTAMP}, |             <if test="sourceType != null"> | ||||||
|       </if> |                 sourceType = #{sourceType,jdbcType=INTEGER}, | ||||||
|       <if test="createUser != null"> |             </if> | ||||||
|         `createUser` = #{createUser,jdbcType=VARCHAR}, |             <if test="exMsg != null"> | ||||||
|       </if> |                 exMsg = #{exMsg,jdbcType=VARCHAR}, | ||||||
|       <if test="updateTime != null"> |             </if> | ||||||
|         updateTime = #{updateTime,jdbcType=TIMESTAMP}, |             <if test="skProject != null"> | ||||||
|       </if> |                 skProject = #{skProject,jdbcType=INTEGER}, | ||||||
|       <if test="updateUser != null"> |             </if> | ||||||
|         updateUser = #{updateUser,jdbcType=VARCHAR}, |         </set> | ||||||
|       </if> |         where id = #{id,jdbcType=INTEGER} | ||||||
|       <if test="remark != null"> |     </update> | ||||||
|         remark = #{remark,jdbcType=VARCHAR}, |     <update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder"> | ||||||
|       </if> |         <!--@mbg.generated--> | ||||||
|       <if test="sourceType != null"> |         update thr_inv_order | ||||||
|         sourceType = #{sourceType,jdbcType=INTEGER}, |         set billNo       = #{billNo,jdbcType=VARCHAR}, | ||||||
|       </if> |             billDate     = #{billDate,jdbcType=TIMESTAMP}, | ||||||
|       <if test="exMsg != null"> |             startDate    = #{startDate,jdbcType=TIMESTAMP}, | ||||||
|         exMsg = #{exMsg,jdbcType=VARCHAR}, |             endDate      = #{endDate,jdbcType=TIMESTAMP}, | ||||||
|       </if> |             mainAction   = #{mainAction,jdbcType=VARCHAR}, | ||||||
|       <if test="skProject != null"> |             billType     = #{billType,jdbcType=VARCHAR}, | ||||||
|         skProject = #{skProject,jdbcType=INTEGER}, |             thirdSysFk   = #{thirdSysFk,jdbcType=VARCHAR}, | ||||||
|       </if> |             deptCode     = #{deptCode,jdbcType=VARCHAR}, | ||||||
|     </set> |             invCode      = #{invCode,jdbcType=VARCHAR}, | ||||||
|     where id = #{id,jdbcType=INTEGER} |             spaceCode    = #{spaceCode,jdbcType=VARCHAR}, | ||||||
|   </update> |             `status`     = #{status,jdbcType=TINYINT}, | ||||||
|   <update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder"> |             createTime   = #{createTime,jdbcType=TIMESTAMP}, | ||||||
|     <!--@mbg.generated--> |             `createUser` = #{createUser,jdbcType=VARCHAR}, | ||||||
|     update thr_inv_order |             updateTime   = #{updateTime,jdbcType=TIMESTAMP}, | ||||||
|     set billNo = #{billNo,jdbcType=VARCHAR}, |             updateUser   = #{updateUser,jdbcType=VARCHAR}, | ||||||
|       billDate = #{billDate,jdbcType=TIMESTAMP}, |             remark       = #{remark,jdbcType=VARCHAR}, | ||||||
|       startDate = #{startDate,jdbcType=TIMESTAMP}, |             sourceType   = #{sourceType,jdbcType=INTEGER}, | ||||||
|       endDate = #{endDate,jdbcType=TIMESTAMP}, |             exMsg        = #{exMsg,jdbcType=VARCHAR}, | ||||||
|       mainAction = #{mainAction,jdbcType=VARCHAR}, |             skProject    = #{skProject,jdbcType=INTEGER} | ||||||
|       billType = #{billType,jdbcType=VARCHAR}, |         where id = #{id,jdbcType=INTEGER} | ||||||
|     thirdSysFk = #{thirdSysFk,jdbcType=VARCHAR}, |     </update> | ||||||
|       deptCode = #{deptCode,jdbcType=VARCHAR}, |  | ||||||
|       invCode = #{invCode,jdbcType=VARCHAR}, |  | ||||||
|       spaceCode = #{spaceCode,jdbcType=VARCHAR}, |  | ||||||
|       `status` = #{status,jdbcType=TINYINT}, |  | ||||||
|       createTime = #{createTime,jdbcType=TIMESTAMP}, |  | ||||||
|       `createUser` = #{createUser,jdbcType=VARCHAR}, |  | ||||||
|       updateTime = #{updateTime,jdbcType=TIMESTAMP}, |  | ||||||
|       updateUser = #{updateUser,jdbcType=VARCHAR}, |  | ||||||
|       remark = #{remark,jdbcType=VARCHAR}, |  | ||||||
|     sourceType = #{sourceType,jdbcType=INTEGER}, |  | ||||||
|     exMsg = #{exMsg,jdbcType=VARCHAR}, |  | ||||||
|     skProject = #{skProject,jdbcType=INTEGER} |  | ||||||
|     where id = #{id,jdbcType=INTEGER} |  | ||||||
|   </update> |  | ||||||
| 
 | 
 | ||||||
|   <select id="filterThrInvOrder" parameterType="com.glxp.api.req.thrsys.FilterThrInvOrderRequest" |     <select id="filterThrInvOrder" parameterType="com.glxp.api.req.thrsys.FilterThrInvOrderRequest" | ||||||
|           resultType="com.glxp.api.entity.thrsys.ThrInvOrder"> |             resultType="com.glxp.api.res.thrsys.ThrInvOrderResponse"> | ||||||
|     SELECT thr_inv_order.* |         SELECT tio.*, bbt.name billTypeName, aw.name invName | ||||||
|     FROM thr_inv_order |         FROM thr_inv_order tio | ||||||
|     <where> |                      left join basic_bussiness_type bbt on tio.billType = bbt.action | ||||||
|       <if test="billNo != '' and billNo != null"> |                      left join auth_warehouse aw on tio.invCode = aw.code | ||||||
|         AND billNo like concat('%', #{billNo}, '%') |         <where> | ||||||
|       </if> |             <if test="billNo != '' and billNo != null"> | ||||||
|       <if test="billType != '' and billType != null"> |                 AND billNo like concat('%', #{billNo}, '%') | ||||||
|         AND billType = #{billType} |             </if> | ||||||
|       </if> |             <if test="billType != '' and billType != null"> | ||||||
|       <if test="thirdSysFk != '' and thirdSysFk != null"> |                 AND billType = #{billType} | ||||||
|         AND thirdSysFk = #{thirdSysFk} |             </if> | ||||||
|       </if> |             <if test="thirdSysFk != '' and thirdSysFk != null"> | ||||||
|       <if test="startDate != null and startDate != ''"> |                 AND tio.thirdSysFk = #{thirdSysFk} | ||||||
|         <![CDATA[ |             </if> | ||||||
|  |             <if test="startDate != null and startDate != ''"> | ||||||
|  |                 <![CDATA[ | ||||||
|                 and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d') |                 and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d') | ||||||
|                 ]]> |                 ]]> | ||||||
|       </if> |             </if> | ||||||
|       <if test="endDate != null and endDate != ''"> |             <if test="endDate != null and endDate != ''"> | ||||||
|         <![CDATA[ |                 <![CDATA[ | ||||||
|                 and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') |                 and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') | ||||||
|                 ]]> |                 ]]> | ||||||
|       </if> |             </if> | ||||||
|       <if test="sourceType != '' and sourceType != null"> |             <if test="sourceType != '' and sourceType != null"> | ||||||
|         AND sourceType = #{sourceType} |                 AND sourceType = #{sourceType} | ||||||
|       </if> |             </if> | ||||||
|     </where> |         </where> | ||||||
|     ORDER BY thr_inv_order.billdate DESC |         ORDER BY tio.billdate DESC | ||||||
|   </select> |     </select> | ||||||
| </mapper> | </mapper> | ||||||
|  | |||||||
					Loading…
					
					
				
		Reference in New Issue