Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -1122,8 +1122,8 @@ public class AcceptCarriageOrderService {
             }
             Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
             for (DriverListVo driverListVo : list) {
-                if (driverListVo.getCirculateId().isEmpty()){
-                    driverListVo.setStatus(1);
+                if (!driverListVo.getCirculateId().isEmpty()){
+//                    driverListVo.setStatus(1);
                     driverListVo.setStatusLabel(CarWaybillEnum.PENDING_ORDER.getDestination());
                 }
                 if (!ObjectUtils.isEmpty(truck)) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ConsignOrderService.java

@@ -559,8 +559,8 @@ public class ConsignOrderService {
             }
         }
         for (DriverListVo driverListVo : list) {
-            if (driverListVo.getCirculateId().isEmpty()) {
-                driverListVo.setStatus(1);
+            if (!driverListVo.getCirculateId().isEmpty()) {
+//                driverListVo.setStatus(1);
                 driverListVo.setStatusLabel(CarWaybillEnum.PENDING_ORDER.getDestination());
             }
             List<String> objects = new ArrayList<>();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -147,7 +147,7 @@ public class WaybillManagementService {
             if (info.getUnit() != null) {
                 Map<String, SysDictResDto> unitType = remoteSystemService.queryDictMapByType(DictTypeEnum.UNIT_TYPE.getType());
                 SysDictResDto sysDict = unitType.get(info.getUnit());
-                wayBillDetailDTO.setUnitLabel(sysDict.getLabel());
+                wayBillDetailDTO.setUnitLabel(sysDict == null ? null : sysDict.getLabel());
             }
             // 派车人信息
             UserCacheResDto createUser = remoteSystemService.queryUserCacheById(info.getCreateBy());