Browse Source

1.;干线bug修复

fix-sign
zhenghaoyu 3 months ago
parent
commit
5e8c1035c7
  1. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  2. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  3. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@ -272,6 +272,9 @@
LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldpl.id = ldbls.parcel_list_id
where 1=1
and ltad.is_deleted = 0
<if test="param.orderCode != null and param.orderCode != '' ">
and ltad.order_code like concat(#{param.orderCode},'%')
</if>
<if test="param.orderCodes != null and param.orderCodes.size() > 0 ">
and ltad.order_code in
<foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java

@ -221,6 +221,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
if (deptIds.contains(",")) {
String[] split = deptIds.split(",");
deptId = Long.parseLong(split[split.length - 1]);
}else{
deptId = Long.parseLong(deptIds);
}

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@ -320,10 +320,13 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
}
if(StringUtil.isNotBlank(orderCode)){
if(orderCode.contains(",")){
String[] orderCodeArray = orderCode.split(",");
//把orderCodeArray转化为List
List<String> orderCodeList = Arrays.asList(orderCodeArray);
orderDetailsDTO.setOrderCodes(orderCodeList);
orderDetailsDTO.setOrderCode(null);
}
}
IPage<Object> page = new Page<>();

Loading…
Cancel
Save