货主不为空取消
This commit is contained in:
+5
-4
@@ -3,18 +3,19 @@ package com.linke.transport.application.service.warehouse.material.command;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import java.math.BigDecimal;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.validation.constraints.DecimalMin;
|
import javax.validation.constraints.DecimalMin;
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@ApiModel(description = "创建物料")
|
@ApiModel(description = "创建物料")
|
||||||
public class CreateMaterialCommand {
|
public class CreateMaterialCommand {
|
||||||
|
|
||||||
@ApiModelProperty("货主Id")
|
@ApiModelProperty("货主Id")
|
||||||
@NotNull(message = "货主Id不可以为空")
|
//@NotNull(message = "货主Id不可以为空")
|
||||||
private Long ownerId;
|
private Long ownerId;
|
||||||
|
|
||||||
@ApiModelProperty("分类")
|
@ApiModelProperty("分类")
|
||||||
@@ -58,4 +59,4 @@ public class CreateMaterialCommand {
|
|||||||
private String topOrganizationId;
|
private String topOrganizationId;
|
||||||
/**组织相关*/
|
/**组织相关*/
|
||||||
private String organizationId;
|
private String organizationId;
|
||||||
}
|
}
|
||||||
+5
-2
@@ -26,7 +26,10 @@ public class MaterialCommandService {
|
|||||||
* 创建物料
|
* 创建物料
|
||||||
*/
|
*/
|
||||||
public Long handle(CreateMaterialCommand command) {
|
public Long handle(CreateMaterialCommand command) {
|
||||||
String shipper = userServiceFeignService.findUserNameByUserId(command.getOwnerId(),"物料模块-调用RPC错误");
|
String shipper = null;
|
||||||
|
if (command.getOwnerId() != null) {
|
||||||
|
shipper = userServiceFeignService.findUserNameByUserId(command.getOwnerId(),"物料模块-调用RPC错误");
|
||||||
|
}
|
||||||
Material material = Material.create(
|
Material material = Material.create(
|
||||||
command.getOwnerId(), shipper,
|
command.getOwnerId(), shipper,
|
||||||
command.getCategory(),
|
command.getCategory(),
|
||||||
@@ -84,4 +87,4 @@ public class MaterialCommandService {
|
|||||||
public int updateOwnerNameByOwnerId(Long ownerId, String ownerName) {
|
public int updateOwnerNameByOwnerId(Long ownerId, String ownerName) {
|
||||||
return materialRepository.updateOwnerNameByOwnerId(ownerId, ownerName);
|
return materialRepository.updateOwnerNameByOwnerId(ownerId, ownerName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user