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());
LambdaQueryWrapper<VYpzsPlanInfo> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(VYpzsPlanInfo::getCGDBH,collect);
wrapper1.in(VYpzsPlanInfo::getCGDBH, collect);
List<VYpzsPlanInfo> vYpzsPlanInfos = vYpzsPlanInfoMapper.selectList(wrapper1);
Map<String, List<VYpzsPlanInfo>> groupedByBz = vYpzsPlanInfos.stream()
@ -1507,14 +1507,14 @@ public class CtqyyClient extends CommonHttpClient {
.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<IoCollectOrder> ioCollectOrders = new ArrayList<>();
if (CollUtil.isNotEmpty(ioInfos)) {
List<String> collect = ioInfos.stream().map(VYpzsIoInfo::getRECEIPT_NUMBER).collect(Collectors.toList());
LambdaQueryWrapper<VYpzsIoInfo> vYpzsIoInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER,collect);
vYpzsIoInfoLambdaQueryWrapper.in(VYpzsIoInfo::getRECEIPT_NUMBER, collect);
List<VYpzsIoInfo> vYpzsIoInfos = vYpzsIoInfoMapper.selectList(vYpzsIoInfoLambdaQueryWrapper);
Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = vYpzsIoInfos.stream()
@ -1541,7 +1541,7 @@ public class CtqyyClient extends CommonHttpClient {
List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> {
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) {
collectOrderBiz.setRelId(basicUdirelEntity.getId());
} 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;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn;
import org.apache.ibatis.annotations.Mapper;
@DS("ctqyySql")
@Mapper
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;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.Param;
import java.util.List;
@DS("ctqyySql")
@Mapper
public interface VYpzsIoInfoMapper extends BaseMapper<VYpzsIoInfo> {
// 使用基本的 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;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfoReturn;
import org.apache.ibatis.annotations.Mapper;
@DS("ctqyySql")
@Mapper
public interface VYpzsPresInfoReturnMapper extends BaseMapper<VYpzsPresInfoReturn> {
}

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

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