diff --git a/mhd-common/mhd-common-core/pom.xml b/mhd-common/mhd-common-core/pom.xml
index 20fd35e39..bc525d13e 100644
--- a/mhd-common/mhd-common-core/pom.xml
+++ b/mhd-common/mhd-common-core/pom.xml
@@ -156,7 +156,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.22
diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java
index b741fabcc..638bcf9ec 100644
--- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java
+++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserDriverListPo.java
@@ -301,4 +301,7 @@ public class UserDriverListPo {
@ApiModelProperty(value = "是否允许竞价(0-不允许竞价,1-允许参与竞价，2-允许查看竞价)")
private Integer isDriverBidding;
+ @ApiModelProperty(value = "用户身份")
+ private Integer userIdentity;
+
}
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java
index bca216a2b..4f6970ad3 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserDriverEntity.java
@@ -127,4 +127,7 @@ public class UserDriverEntity extends BaseVOEntity {
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
+
+ @ApiModelProperty(name = "用户身份")
+ private Integer userIdentity;
}
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java
index 42e57bfcc..e2ea6d6d5 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserDriverPo.java
@@ -228,4 +228,7 @@ public class UserDriverPo extends BaseVOEntity {
@ApiModelProperty(name = "tms推送状态: 1-未推送 2- 已推送")
private Integer tmsPushStatus;
+
+ @ApiModelProperty(name = "用户身份")
+ private Integer userIdentity;
}
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java
index d2459735f..c8f32f36e 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDriverDO.java
@@ -283,4 +283,7 @@ public class UserDriverDO extends UserDO {
@ApiModelProperty(name = "车队名称")
private String motorcadeName;
+ @ApiModelProperty(name = "用户身份")
+ private Integer userIdentity;
+
}
diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java
index 9c7e3e55c..3db40186d 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDriverDTO.java
@@ -308,4 +308,7 @@ public class UserDriverDTO extends UserDTO {
@ApiModelProperty(name = "部门id")
private String departmentId;
+
+ @ApiModelProperty(name = "用户身份")
+ private Integer userIdentity;
}
diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
index db7a63911..cc39e3bf2 100644
--- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
@@ -120,6 +120,7 @@
a.driver_work_license_front_url,
a.work_certificate_back_img_url,
b.create_time,
+ a.user_identity,
b.create_by,
b.create_by_name,
b.update_time,
@@ -262,6 +263,7 @@
a.driver_fill_auth_id,
a.driver_fill_auth_name,
a.driver_fill_auth_remark,
+ a.user_identity,
b.user_id,
b.top_organization_id,
b.organization_id,
diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml
index b9135a0cc..ffb4ff80c 100644
--- a/mhd_finance/pom.xml
+++ b/mhd_finance/pom.xml
@@ -87,7 +87,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.22
provided
diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml
index f2ad08751..8829a0a37 100644
--- a/mhd_finance/src/main/resources/bootstrap.yml
+++ b/mhd_finance/src/main/resources/bootstrap.yml
@@ -30,3 +30,11 @@ spring:
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+redisson:
+ config:
+ singleServerConfig:
+ address: redis://116.204.89.187:4399
+ connectTimeout: 10000 # 连接超时时间
+ timeout: 10000 # 命令执行超时时间
+ retryAttempts: 3 # 重试次数
+ retryInterval: 1500 # 重试间隔
diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml
index 1ef00f678..9b0b07915 100644
--- a/mhd_product/pom.xml
+++ b/mhd_product/pom.xml
@@ -88,7 +88,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.22
provided
diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml
index ed64ff6c6..d4751f850 100644
--- a/mhd_thrid_party/pom.xml
+++ b/mhd_thrid_party/pom.xml
@@ -94,7 +94,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.22
provided
diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml
index 3bbe00014..325a1dce5 100644
--- a/mhd_transport/pom.xml
+++ b/mhd_transport/pom.xml
@@ -88,7 +88,7 @@
org.projectlombok
lombok
- 1.18.4
+ 1.18.22
provided
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java
index 6f0c0f1ae..e2804fbfb 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java
@@ -2920,4 +2920,32 @@ public class VehicleApplicationService {
public void addVehicle(VehicleDto vehicleDto) {
}
+
+ /**
+ *
+ * @param vehicleDto
+ * @return
+ */
+ public Integer updatePilotDriver(VehicleDto vehicleDto) {
+ if (vehicleDto.getVehicleId() == null) {
+ throw new IllegalArgumentException("车辆ID不能为空");
+ }
+
+ boolean hasPilot1 = StringUtils.hasText(vehicleDto.getPilot1());
+ boolean hasPilot2 = StringUtils.hasText(vehicleDto.getPilot2());
+
+ // 两个都传了
+ if (hasPilot1 && hasPilot2) {
+ throw new IllegalArgumentException("不可同时传入");
+ }
+ // 两个都没传
+ if (!hasPilot1 && !hasPilot2) {
+ throw new IllegalArgumentException("请选择副驾");
+ }
+
+
+ // 更新
+ return vehicleMapper.updatePilotDriver(vehicleDto);
+
+ }
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
index a62fbdef3..b2d17df81 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
@@ -45,4 +45,10 @@ public class CreateMaterialCommand {
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "物料体积")
+ private BigDecimal materialVolume;
+
+ @ApiModelProperty(value = "物料内容")
+ private String materialContent;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java
index ac2e81a09..1e74a0d94 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/MaterialCommandService.java
@@ -36,6 +36,8 @@ public class MaterialCommandService {
command.getValue(),
command.getCodeManaged(),
command.getWeight(),
+ command.getMaterialVolume(),
+ command.getMaterialContent(),
command.getRemark(),
codeGenerator
);
@@ -57,6 +59,8 @@ public class MaterialCommandService {
command.getValue(),
command.getCodeManaged(),
command.getWeight(),
+ command.getMaterialVolume(),
+ command.getMaterialContent(),
command.getRemark()
);
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java
index 6100b5e86..d393e4118 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java
@@ -38,4 +38,11 @@ public class UpdateMaterialCommand {
private Boolean codeManaged;
@ApiModelProperty(value = "备注")
private String remark;
+
+
+ @ApiModelProperty(value = "物料体积")
+ private BigDecimal materialVolume;
+
+ @ApiModelProperty(value = "物料内容")
+ private String materialContent;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java
index 6d5bfb356..d1d28e9e5 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
@Data
@ApiModel("查询参数")
@@ -27,4 +28,8 @@ public class MaterialQueryCommand {
private Long pageNo = 1L;
@ApiModelProperty(name = "每页条数")
private Long pageSize = 10L;
+ @ApiModelProperty(value = "物料体积")
+ private BigDecimal materialVolume;
+ @ApiModelProperty(value = "物料内容")
+ private String materialContent;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java
index cd6dd8705..094cc328d 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryService.java
@@ -28,6 +28,7 @@ public class MaterialQueryService {
param.getMaterialCode(),
param.getCodeManaged(),
param.getRemark(),
+ param.getMaterialContent(),
param.getPageNo(),
param.getPageSize()
).convert(MaterialConverter :: convertToVO);
diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java
index 528a9129e..c77c8d87b 100644
--- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java
+++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java
@@ -36,6 +36,12 @@ public class MaterialVO{
@ApiModelProperty("备注")
private String remark;
+ @ApiModelProperty(value = "物料体积")
+ private BigDecimal materialVolume;
+
+ @ApiModelProperty(value = "物料内容")
+ private String materialContent;
+
@ApiModelProperty("创建时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java
index 12d8fc9d9..a28a1ff20 100644
--- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java
+++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/entity/Vehicle.java
@@ -322,5 +322,29 @@ public class Vehicle extends BaseVOEntity implements Serializable
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date insuranceValidityPeriod;
+ @ApiModelProperty(value = "副驾1")
+ private String pilot1;
+
+ @ApiModelProperty(value = "副驾1的Id")
+ private String pilot1Id;
+
+ @ApiModelProperty(value = "副驾2")
+ private String pilot2;
+
+ @ApiModelProperty(value = "副驾2的Id")
+ private String pilot2Id;
+
+ @ApiModelProperty(value = "跨境车牌")
+ private String crossPlate;
+
+ @ApiModelProperty(value = "保险")
+ private String insurance;
+
+ @ApiModelProperty(value = "签证本")
+ private String visa;
+
+ @ApiModelProperty(value = "车辆主体")
+ private Integer vehicleBody;
+
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java
index 1baf1ecbb..67b09d066 100644
--- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java
+++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/mapper/VehicleMapper.java
@@ -122,4 +122,6 @@ public interface VehicleMapper extends BaseMapper
* APP绑定车辆我的车辆列表查询
*/
List driverBindMyCarList(@Param("driverVehicleBindDto") DriverVehicleBindDto driverVehicleBindDto);
+
+ Integer updatePilotDriver(VehicleDto vehicleDto);
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java
index 286444a39..43b627ef7 100644
--- a/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java
+++ b/mhd_transport/src/main/java/com/linke/transport/domain/vehicle/repository/po/VehiclePo.java
@@ -425,4 +425,28 @@ public class VehiclePo extends BaseVOEntity implements Serializable
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date insuranceValidityPeriod;
+
+ @ApiModelProperty(value = "副驾1")
+ private String pilot1;
+
+ @ApiModelProperty(value = "副驾1的Id")
+ private String pilot1Id;
+
+ @ApiModelProperty(value = "副驾2")
+ private String pilot2;
+
+ @ApiModelProperty(value = "副驾2的Id")
+ private String pilot2Id;
+
+ @ApiModelProperty(value = "跨境车牌")
+ private String crossPlate;
+
+ @ApiModelProperty(value = "保险")
+ private String insurance;
+
+ @ApiModelProperty(value = "签证本")
+ private String visa;
+
+ @ApiModelProperty(value = "车辆主体")
+ private Integer vehicleBody;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java
index 33397422d..151deb94f 100644
--- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java
+++ b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java
@@ -26,9 +26,12 @@ public class Material {
private boolean codeManaged;
private String remark;
private BigDecimal weight;
+ private BigDecimal materialVolume;
+ private String materialContent;
private LocalDateTime createTime;
private LocalDateTime updateTime;
+
// 私有构造方法
private Material(Long ownerId,
String shipper,
@@ -39,6 +42,8 @@ public class Material {
BigDecimal value,
boolean codeManaged,
BigDecimal weight,
+ BigDecimal materialVolume,
+ String materialContent,
String remark) {
validateRequiredFields( category, name, unit);
this.ownerId = ownerId;
@@ -51,6 +56,8 @@ public class Material {
this.codeManaged = codeManaged;
this.remark = remark;
this.weight = weight;
+ this.materialVolume = materialVolume;
+ this.materialContent = materialContent;
this.createTime = LocalDateTime.now();
this.updateTime = LocalDateTime.now();
}
@@ -66,10 +73,12 @@ public class Material {
BigDecimal value,
boolean codeManaged,
BigDecimal weight,
+ BigDecimal materialVolume,
+ String materialContent,
String remark,
MaterialCodeGenerator codeGenerator) {
Material material = new Material(ownerId, shipper, category, name, model,
- unit, value, codeManaged, weight,remark
+ unit, value, codeManaged, weight, materialVolume, materialContent, remark
);
material.materialCode = codeGenerator.generate();
return material;
@@ -83,6 +92,8 @@ public class Material {
BigDecimal value,
boolean codeManaged,
BigDecimal weight,
+ BigDecimal materialVolume,
+ String materialContent,
String remark) {
this.ownerId = ownerId;
this.shipper = shipper;
@@ -91,6 +102,8 @@ public class Material {
this.model = model;
this.unit = unit;
this.weight = weight;
+ this.materialVolume = materialVolume;
+ this.materialContent = materialContent;
this.value = validateValue(value);
this.codeManaged = codeManaged;
this.remark = remark;
diff --git a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java
index bb0799a0b..8ab55359d 100644
--- a/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java
+++ b/mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/repository/MaterialRepository.java
@@ -56,7 +56,7 @@ public interface MaterialRepository {
* @param size 每页大小
* @return 分页的物料数据
*/
- IPage search(String shipper, String category, String name,String model,String materialCode,Boolean codeManaged,String remark,
+ IPage search(String shipper, String category, String name,String model,String materialCode,Boolean codeManaged,String remark,String materialContent,
Long current, Long size);
/**
diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java
index ae350ed08..7e999f70e 100644
--- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java
+++ b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java
@@ -32,4 +32,6 @@ public class MaterialDO {
@TableLogic
@TableField("is_deleted")
private Boolean deleted;
+ private BigDecimal materialVolume;
+ private String materialContent;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java
index eb4053c48..f7a21ece1 100644
--- a/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java
+++ b/mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/repository/MaterialRepositoryImpl.java
@@ -58,7 +58,7 @@ public class MaterialRepositoryImpl implements MaterialRepository {
}
@Override
- public IPage search(String shipper, String category, String name, String model,String materialCode,Boolean codeManaged,String remark,
+ public IPage search(String shipper, String category, String name, String model,String materialCode,Boolean codeManaged,String remark,String materialContent,
Long current, Long size) {
LambdaQueryWrapper wrapper = Wrappers.lambdaQuery()
.eq(StringUtils.isNotBlank(shipper), MaterialDO :: getShipper, shipper)
@@ -68,6 +68,7 @@ public class MaterialRepositoryImpl implements MaterialRepository {
.like(StringUtils.isNotBlank(materialCode), MaterialDO :: getMaterialCode, materialCode)
.eq(null!=codeManaged, MaterialDO :: getCodeManaged, codeManaged)
.like(StringUtils.isNotBlank(remark), MaterialDO :: getRemark, remark)
+ .like(StringUtils.isNotBlank(materialContent), MaterialDO :: getMaterialContent, materialContent)
.orderByDesc(MaterialDO :: getCreateTime);
return materialMapper.selectPage(new Page<>(current, size), wrapper)
diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java
index 5ffc6b528..fb308686f 100644
--- a/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java
+++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/dto/vehicle/VehicleDto.java
@@ -413,4 +413,28 @@ public class VehicleDto extends BaseVOEntity implements Serializable
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date insuranceValidityPeriod;
+
+ @ApiModelProperty(value = "副驾1")
+ private String pilot1;
+
+ @ApiModelProperty(value = "副驾1的Id")
+ private String pilot1Id;
+
+ @ApiModelProperty(value = "副驾2")
+ private String pilot2;
+
+ @ApiModelProperty(value = "副驾2的Id")
+ private String pilot2Id;
+
+ @ApiModelProperty(value = "跨境车牌")
+ private String crossPlate;
+
+ @ApiModelProperty(value = "保险")
+ private String insurance;
+
+ @ApiModelProperty(value = "签证本")
+ private String visa;
+
+ @ApiModelProperty(value = "车辆主体")
+ private Integer vehicleBody;
}
diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java
index a78106b4f..47692c3c7 100644
--- a/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java
+++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/facade/vehicle/VehicleApi.java
@@ -65,6 +65,15 @@ public class VehicleApi extends BaseController
return getDataTable(list);
}
+ /**
+ * 车辆绑定副驾
+ */
+ @Log(title = "车辆管理-车辆绑定副驾", description = "车辆绑定副驾", businessType = BusinessType.UPDATE)
+ @PostMapping("/bindVehicle")
+ public R bindVehicle(@RequestBody VehicleDto vehicleDto){
+ return R.ok(vehicleApplicationService.updatePilotDriver(vehicleDto));
+ }
+
/**
* 查询未绑定车辆列表
*/
diff --git a/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java b/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java
index fd1ccf5ab..d629c421a 100644
--- a/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java
+++ b/mhd_transport/src/main/java/com/linke/transport/interfaces/facadeApi/warehouse/MaterialApi.java
@@ -102,4 +102,16 @@ public class MaterialApi {
public R getMaterial(@PathVariable Long id) {
return R.ok(queryService.getMaterialDetail(id));
}
+
+ /**
+ * 获取订单选择货物详情(包含体积和物料内容)
+ *
+ * @param id 物料ID
+ * @return 物料详情,包含体积和物料内容字段
+ */
+ @GetMapping("/forOrderSelection")
+ @Log(title = "物料管理(PC)", description = "TMS-订单选择货物详情", businessType = BusinessType.OTHER)
+ public R getMaterialsForOrderSelection(@RequestParam(name = "id") Long id) {
+ return R.ok(queryService.getMaterialDetail(id));
+ }
}
diff --git a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml
index f028755ee..fb19f15c6 100644
--- a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml
+++ b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml
@@ -113,9 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
- *
+ *
FROM
vehicle
+