1.干线-bug修复

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
             <if test="param.orderCode != null and param.orderCode != '' ">
-                and LOCATE(#{param.orderCode}, pl.order_code)
+                and LOCATE(#{param.orderCode}, pl.order_code) > 0
             </if>
             <if test="param.waybillNo != null and param.waybillNo != '' ">
                 and ad.waybill_no = #{param.waybill}
@@ -268,7 +268,7 @@
                 and ad.service_num = #{param.serviceNumber}
             </if>
             <if test="param.orderPackageCode != null and param.orderPackageCode != '' ">
-                and LOCATE(#{param.orderPackageCode},ad.order_package_code)
+                and LOCATE(#{param.orderPackageCode},ad.order_package_code) > 0
             </if>
             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
         <if test="param.orderCode != null and param.orderCode != '' ">
-            and LOCATE(#{param.orderCode}, ltad.order_code)
+            and LOCATE(#{param.orderCode}, ltad.order_code) > 0
         </if>
         <if test="param.waybillNo != null and param.waybillNo != '' ">
             and ltad.waybill_no = #{param.waybill}
@@ -297,7 +297,7 @@
             and ltad.service_num = #{param.serviceNumber}
         </if>
         <if test="param.orderPackageCode != null and param.orderPackageCode != '' ">
-            and LOCATE(#{param.orderPackageCode}, ltad.order_package_code)
+            and LOCATE(#{param.orderPackageCode}, ltad.order_package_code) > 0
         </if>
         <if test="param.packageStatus != null ">
             and ltad.package_status = #{param.packageStatus}

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