diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index 62b5738ab..e92406a24 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -256,7 +256,7 @@ left join logpm_trunkline_advance_detail ad on ad.order_package_code = pl.order_package_code where 1=1 - and LOCATE(#{param.orderCode}, pl.order_code) + and LOCATE(#{param.orderCode}, pl.order_code) > 0 and ad.waybill_no = #{param.waybill} @@ -268,7 +268,7 @@ and ad.service_num = #{param.serviceNumber} - and LOCATE(#{param.orderPackageCode},ad.order_package_code) + and LOCATE(#{param.orderPackageCode},ad.order_package_code) > 0 group by pl.order_package_code ) tmax on tmax.order_package_code = ldpl.order_package_code and ldpl.update_time = tmax.updateTime @@ -285,7 +285,7 @@ left join logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id where 1=1 - and LOCATE(#{param.orderCode}, ltad.order_code) + and LOCATE(#{param.orderCode}, ltad.order_code) > 0 and ltad.waybill_no = #{param.waybill} @@ -297,7 +297,7 @@ and ltad.service_num = #{param.serviceNumber} - and LOCATE(#{param.orderPackageCode}, ltad.order_package_code) + and LOCATE(#{param.orderPackageCode}, ltad.order_package_code) > 0 and ltad.package_status = #{param.packageStatus} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index a7f98ac9f..c4578be4d 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -597,7 +597,7 @@ ltcls.unload_user_name unloadUserName, IF(ltcls.unload_abnormal = 1,'是','否') unloadAbnormal, IF(ltcls.is_supple = 1,'是','否') isSupple, - ltcls.cars_no carsNo, + ltcls.load_code carsNo, ltcls.scan_code scanCode, ltcls.final_node_name finalNodeName, case ltcls.scan_status