purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从源更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-06-06 18:13:41 +08:00
parent d4f3f6b663 4b782faba8
commit 9c07f55e57
40 changed files with 106 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -60,12 +60,6 @@
<bind name="number" value="'%' + _parameter.number + '%'"/>
and dh.Number like #{number}
</if>
<if test="dhIds != null and dhIds != ''">
and dh.Id in
<foreach item="dhId" index="index" collection="dhIds.split(',')" open="(" separator="," close=")">
#{dhId}
</foreach>
</if>
<if test="beginTime != null and beginTime != ''">
and dh.OperTime >= #{beginTime}
</if>
@@ -93,19 +87,19 @@
<bind name="number" value="'%' + _parameter.number + '%'"/>
and Number like #{number}
</if>
<if test="dhIds != null and dhIds != ''">
and Id in
<foreach item="dhId" index="index" collection="dhIds.split(',')" open="(" separator="," close=")">
#{dhId}
</foreach>
</if>
<if test="beginTime != null and beginTime != ''">
and OperTime >= #{beginTime}
</if>
<if test="endTime != null and endTime != ''">
and OperTime &lt;= #{endTime}
</if>
and ifnull(delete_Flag,'0') !='1'
<if test="materialParam != null">
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
</if>
<if test="depotIds != null">
and di.DepotId in (${depotIds})
</if>
and ifnull(jsh_depothead.delete_Flag,'0') !='1'
</select>

7
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -2,16 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapperEx">
<resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
</resultMap>
<resultMap id="DetailByTypeAndMIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4DetailByTypeAndMId">
<result column="Number" jdbcType="VARCHAR" property="number" />
<result column="newType" jdbcType="VARCHAR" property="newtype" />
<result column="b_num" jdbcType="BIGINT" property="bnum" />
<result column="oTime" jdbcType="TIMESTAMP" property="otime" />
</resultMap>
<resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
<result column="HeaderId" jdbcType="BIGINT" property="headerid" />
</resultMap>
<resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultAndMaterialMap" type="com.jsh.erp.datasource.entities.DepotItemVo4Material">
<result column="mName" jdbcType="VARCHAR" property="mname" />