UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

相关bug修改

Browse Source
scpwxyy
yewj 7 months ago
parent e02ad0aa93
commit 85ff833b43
5 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -1439,7 +1439,7 @@ public class CtqyyClient extends CommonHttpClient {
List<String> collect = planInfos.stream().map(VYpzsPlanInfo::getCGDBH).collect(Collectors.toList()); List<String> collect = planInfos.stream().map(VYpzsPlanInfo::getCGDBH).collect(Collectors.toList());
LambdaQueryWrapper<VYpzsPlanInfo> wrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VYpzsPlanInfo> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(VYpzsPlanInfo::getCGDBH,collect); wrapper1.in(VYpzsPlanInfo::getCGDBH, collect);
List<VYpzsPlanInfo> vYpzsPlanInfos = vYpzsPlanInfoMapper.selectList(wrapper1); List<VYpzsPlanInfo> vYpzsPlanInfos = vYpzsPlanInfoMapper.selectList(wrapper1);
Map<String, List<VYpzsPlanInfo>> groupedByBz = vYpzsPlanInfos.stream() Map<String, List<VYpzsPlanInfo>> groupedByBz = vYpzsPlanInfos.stream()
@ -1507,14 +1507,14 @@ public class CtqyyClient extends CommonHttpClient {
.or().like(VYpzsIoInfo::getIO_SORT, keywords)//收货方 .or().like(VYpzsIoInfo::getIO_SORT, keywords)//收货方
); );
Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectGroupedWithPagination( new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest); Page<VYpzsIoInfo> page = vYpzsIoInfoMapper.selectGroupedWithPagination(new Page<VYpzsIoInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
List<VYpzsIoInfo> ioInfos = page.getRecords(); List<VYpzsIoInfo> ioInfos = page.getRecords();
List<IoCollectOrder> ioCollectOrders = new ArrayList<>(); List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
if (CollUtil.isNotEmpty(ioInfos)) { if (CollUtil.isNotEmpty(ioInfos)) {
List<String> collect = ioInfos.stream().map(VYpzsIoInfo::getRECEIPT_NUMBER).collect(Collectors.toList()); List<String> collect = ioInfos.stream().map(VYpzsIoInfo::getRECEIPT_NUMBER).collect(Collectors.toList());
LambdaQueryWrapper<VYpzsIoInfo> vYpzsIoInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<VYpzsIoInfo> vYpzsIoInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER,collect); vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER, collect);
List<VYpzsIoInfo> vYpzsIoInfos = vYpzsIoInfoMapper.selectList(vYpzsIoInfoLambdaQueryWrapper); List<VYpzsIoInfo> vYpzsIoInfos = vYpzsIoInfoMapper.selectList(vYpzsIoInfoLambdaQueryWrapper);
Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = vYpzsIoInfos.stream() Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = vYpzsIoInfos.stream()
@ -1541,7 +1541,7 @@ public class CtqyyClient extends CommonHttpClient {
List<IoCollectOrderBiz> bizList = new ArrayList<>(); List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> { value.forEach(entity -> {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz(); IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE())); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()).last("limit 1"));
if (basicUdirelEntity != null) { if (basicUdirelEntity != null) {
collectOrderBiz.setRelId(basicUdirelEntity.getId()); collectOrderBiz.setRelId(basicUdirelEntity.getId());
} else { } else {

2
src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VInsurNationGoodsReturnMapper.java
Unescape Escape View File

@ -1,9 +1,11 @@
package com.glxp.mipsdl.thirddao.ctqyy; package com.glxp.mipsdl.thirddao.ctqyy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn; import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@DS("ctqyySql")
@Mapper @Mapper
public interface VInsurNationGoodsReturnMapper extends BaseMapper<VInsurNationGoodsReturn> { public interface VInsurNationGoodsReturnMapper extends BaseMapper<VInsurNationGoodsReturn> {
} }

6
src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsIoInfoMapper.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.mipsdl.thirddao.ctqyy; package com.glxp.mipsdl.thirddao.ctqyy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -8,12 +9,11 @@ import com.glxp.mipsdl.req.base.UdiwmsThrOrderRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; @DS("ctqyySql")
@Mapper @Mapper
public interface VYpzsIoInfoMapper extends BaseMapper<VYpzsIoInfo> { public interface VYpzsIoInfoMapper extends BaseMapper<VYpzsIoInfo> {
// 使用基本的 MyBatis 注解或 XML 映射 // 使用基本的 MyBatis 注解或 XML 映射
Page<VYpzsIoInfo> selectGroupedWithPagination(IPage<VYpzsIoInfo> page, @Param("udiwmsThrOrderRequest")UdiwmsThrOrderRequest udiwmsThrOrderRequest); Page<VYpzsIoInfo> selectGroupedWithPagination(IPage<VYpzsIoInfo> page, @Param("udiwmsThrOrderRequest") UdiwmsThrOrderRequest udiwmsThrOrderRequest);
} }

2
src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java
Unescape Escape View File

@ -1,9 +1,11 @@
package com.glxp.mipsdl.thirddao.ctqyy; package com.glxp.mipsdl.thirddao.ctqyy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfoReturn; import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfoReturn;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@DS("ctqyySql")
@Mapper @Mapper
public interface VYpzsPresInfoReturnMapper extends BaseMapper<VYpzsPresInfoReturn> { public interface VYpzsPresInfoReturnMapper extends BaseMapper<VYpzsPresInfoReturn> {
} }

139
src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
Unescape Escape View File

@ -1,77 +1,72 @@
<?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.mipsdl.thirddao.ctqyy.VYpzsIoInfoMapper"> <mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VYpzsIoInfoMapper">
<resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo"> <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table v_ypzs_io_info--> <!--@Table v_ypzs_io_info-->
<result column="RECEIPT_NUMBER" jdbcType="VARCHAR" property="RECEIPT_NUMBER" /> <result column="RECEIPT_NUMBER" jdbcType="VARCHAR" property="RECEIPT_NUMBER"/>
<result column="IO_FLAG" jdbcType="CHAR" property="IO_FLAG" /> <result column="IO_FLAG" jdbcType="CHAR" property="IO_FLAG"/>
<result column="IO_SORT" jdbcType="INTEGER" property="IO_SORT" /> <result column="IO_SORT" jdbcType="INTEGER" property="IO_SORT"/>
<result column="SORT_NAME" jdbcType="VARCHAR" property="SORT_NAME" /> <result column="SORT_NAME" jdbcType="VARCHAR" property="SORT_NAME"/>
<result column="CONSIGNOR" jdbcType="VARCHAR" property="CONSIGNOR" /> <result column="CONSIGNOR" jdbcType="VARCHAR" property="CONSIGNOR"/>
<result column="CONSIGNOR_NAME" jdbcType="VARCHAR" property="CONSIGNOR_NAME" /> <result column="CONSIGNOR_NAME" jdbcType="VARCHAR" property="CONSIGNOR_NAME"/>
<result column="CONSIGNEE" jdbcType="VARCHAR" property="CONSIGNEE" /> <result column="CONSIGNEE" jdbcType="VARCHAR" property="CONSIGNEE"/>
<result column="CONSIGNEE_NAME" jdbcType="VARCHAR" property="CONSIGNEE_NAME" /> <result column="CONSIGNEE_NAME" jdbcType="VARCHAR" property="CONSIGNEE_NAME"/>
<result column="KEEP_BOOK_TIME" jdbcType="TIMESTAMP" property="KEEP_BOOK_TIME" /> <result column="KEEP_BOOK_TIME" jdbcType="TIMESTAMP" property="KEEP_BOOK_TIME"/>
<result column="KEEP_BOOK_OPERATOR" jdbcType="VARCHAR" property="KEEP_BOOK_OPERATOR" /> <result column="KEEP_BOOK_OPERATOR" jdbcType="VARCHAR" property="KEEP_BOOK_OPERATOR"/>
<result column="PHYSIC_CODE" jdbcType="VARCHAR" property="PHYSIC_CODE" /> <result column="PHYSIC_CODE" jdbcType="VARCHAR" property="PHYSIC_CODE"/>
<result column="PHYSIC_NAME" jdbcType="VARCHAR" property="PHYSIC_NAME" /> <result column="PHYSIC_NAME" jdbcType="VARCHAR" property="PHYSIC_NAME"/>
<result column="BATCH_NO" jdbcType="VARCHAR" property="BATCH_NO" /> <result column="BATCH_NO" jdbcType="VARCHAR" property="BATCH_NO"/>
<result column="BATCH_NUMBER" jdbcType="BIGINT" property="BATCH_NUMBER" /> <result column="BATCH_NUMBER" jdbcType="BIGINT" property="BATCH_NUMBER"/>
<result column="QUANTITY" jdbcType="INTEGER" property="QUANTITY" /> <result column="QUANTITY" jdbcType="INTEGER" property="QUANTITY"/>
<result column="PACK_UNIT1" jdbcType="VARCHAR" property="PACK_UNIT1" /> <result column="PACK_UNIT1" jdbcType="VARCHAR" property="PACK_UNIT1"/>
<result column="IMPORT_PRICE" jdbcType="DECIMAL" property="IMPORT_PRICE" /> <result column="IMPORT_PRICE" jdbcType="DECIMAL" property="IMPORT_PRICE"/>
<result column="IMPORT_MONEY" jdbcType="DECIMAL" property="IMPORT_MONEY" /> <result column="IMPORT_MONEY" jdbcType="DECIMAL" property="IMPORT_MONEY"/>
<result column="RETAIL_PRICE" jdbcType="DECIMAL" property="RETAIL_PRICE" /> <result column="RETAIL_PRICE" jdbcType="DECIMAL" property="RETAIL_PRICE"/>
<result column="RETAIL_MONEY" jdbcType="DECIMAL" property="RETAIL_MONEY" /> <result column="RETAIL_MONEY" jdbcType="DECIMAL" property="RETAIL_MONEY"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
RECEIPT_NUMBER, IO_FLAG, IO_SORT, SORT_NAME, CONSIGNOR, CONSIGNOR_NAME, CONSIGNEE, RECEIPT_NUMBER, IO_FLAG, IO_SORT, SORT_NAME, CONSIGNOR, CONSIGNOR_NAME, CONSIGNEE,
CONSIGNEE_NAME, KEEP_BOOK_TIME, KEEP_BOOK_OPERATOR, PHYSIC_CODE, PHYSIC_NAME, BATCH_NO, CONSIGNEE_NAME, KEEP_BOOK_TIME, KEEP_BOOK_OPERATOR, PHYSIC_CODE, PHYSIC_NAME, BATCH_NO,
BATCH_NUMBER, QUANTITY, PACK_UNIT1, IMPORT_PRICE, IMPORT_MONEY, RETAIL_PRICE, RETAIL_MONEY BATCH_NUMBER, QUANTITY, PACK_UNIT1, IMPORT_PRICE, IMPORT_MONEY, RETAIL_PRICE, RETAIL_MONEY
</sql> </sql>
<select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo"> <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsIoInfo">
SELECT SELECT RECEIPT_NUMBER
RECEIPT_NUMBER FROM v_ypzs_io_info
FROM <where>
v_ypzs_io_info <if test="udiwmsThrOrderRequest.startTime != null">
<where> <![CDATA[
<if test="udiwmsThrOrderRequest.startTime != null"> and KEEP_BOOK_TIME >= TO_DATE(#{udiwmsThrOrderRequest.startTime}
<![CDATA[ , 'YYYY-MM-DD HH24:MI:SS')
and KEEP_BOOK_TIME >= DATE_FORMAT(#{udiwmsThrOrderRequest.startTime}, '%Y-%m-%d %H:%i:%S') ]]>
]]> </if>
</if> <if test="udiwmsThrOrderRequest.endTime != null">
<if test="udiwmsThrOrderRequest.endTime != null"> <![CDATA[
<![CDATA[ and KEEP_BOOK_TIME <= TO_DATE(#{udiwmsThrOrderRequest.endTime}
and KEEP_BOOK_TIME <= DATE_FORMAT(#{udiwmsThrOrderRequest.endTime}, '%Y-%m-%d %H:%i:%S') , 'YYYY-MM-DD HH24:MI:SS')
]]> ]]>
</if> </if>
<if test="udiwmsThrOrderRequest.corpName != null and udiwmsThrOrderRequest.corpName != ''"> <if test="udiwmsThrOrderRequest.corpName != null and udiwmsThrOrderRequest.corpName != ''">
and (CONSIGNOR_NAME like concat('%', #{udiwmsThrOrderRequest.corpName}, '%') and (CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%'
or CONSIGNEE_NAME like concat('%', #{udiwmsThrOrderRequest.corpName}, '%') or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.corpName} || '%')
) </if>
</if> <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
<if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''"> and PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.billNo} || '%'
and PHYSIC_CODE like concat('%', #{udiwmsThrOrderRequest.billNo}, '%') </if>
</if> <if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''">
<if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''"> and IO_SORT LIKE '%' || #{udiwmsThrOrderRequest.busType} || '%'
and IO_SORT like concat('%', #{udiwmsThrOrderRequest.busType}, '%') </if>
</if> <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
and (KEEP_BOOK_TIME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
<if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''"> or CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
and (KEEP_BOOK_TIME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') or CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
or CONSIGNOR_NAME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') or PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
or CONSIGNEE_NAME like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') or IO_SORT LIKE '%' || #{udiwmsThrOrderRequest.keyWords} || '%')
or PHYSIC_CODE like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') </if>
or IO_SORT like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%') </where>
) GROUP BY RECEIPT_NUMBER
</if> ORDER BY RECEIPT_NUMBER
</where> </select>
GROUP BY
RECEIPT_NUMBER
ORDER BY
RECEIPT_NUMBER
</select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save