1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -982,7 +982,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                         .eq("contract_no",contractManagementInfo.getContractNo())
                         .eq("fleet_flag","1").eq("tran_type","4").eq("three_tran_type","汽运")
-                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList1)){
                     contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
                 }
@@ -1013,8 +1013,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
                 }
                 List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("fleet_flag","0").eq("tran_type","1")
-                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("fleet_flag","1").eq("tran_type","1")
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList1)){
                     contractManagementInfo1.setTranCarInfoList1(tranCarInfoList1);
                 }
@@ -1041,8 +1041,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
                 List<TranCarInfo> tranCarInfoList1=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag","0").eq("tran_type","1")
-                        .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag","1").eq("tran_type","1")
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList1)){
                     contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
                 }