提交 a6f95e09 作者: zhangqiliang

辅材和墙盒的查询信息中完善物流信息;退货审核报错的问题

父级 4e054913
......@@ -176,9 +176,9 @@ public class RejectController {
@ApiOperation("审批退货单")
@ParamsValidate
public BaseResponse<Boolean> check(@RequestBody @Validated DeliveryUpdateDTO deliveryUpdateDTO,BindingResult bindingResult){
var status=TauxiliarymaterialStatusEnum.getEnumByName(0,deliveryUpdateDTO.getLogisticStatus());
var status=TauxiliarymaterialStatusEnum.getEnumByName(3,deliveryUpdateDTO.getLogisticStatus());
if(status==null){
throw new ServiceException(400,"status必须是枚举:"+TauxiliarymaterialStatusEnum.getStatusTypeEnums(0).stream().map(e->e.name()).reduce("",(a,b)->a+","+b));
throw new ServiceException(400,"status必须是枚举:"+TauxiliarymaterialStatusEnum.getStatusTypeEnums(3).stream().map(e->e.name()).reduce("",(a,b)->a+","+b));
}
SessionInfo sessionInfo = tokenService.getUser();
//var data=RejectConvert.INSTANCE.convertCheckVo(rejectCheckVo);
......
......@@ -342,6 +342,13 @@ public class Tauxiliarymaterials extends PageVo implements Serializable{
*/
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
/**
* 收货人电话
*
* @mbg.generated
*/
@ApiModelProperty(value = "收货人电话")
private String receiverPhone;
}
\ No newline at end of file
......@@ -644,7 +644,7 @@
t.receive_address, t.receive_phone, t.apply_time, t.check_user, t.check_user_name, t.check_time, t.check_suggestion,
t.CREATED_BY, t.CREATED_TIME, t.UPDATED_BY, t.UPDATED_TIME, t.install_order, t.specification, t.logistic_order,t.area_name,
t.apply_inventory, t.apply_order,ts.id supplierId,td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender,
td.sender_phone senderPhone
td.sender_phone senderPhone,td.receiver_phone receiverPhone
from t_auxiliary_materials t
left join t_delivery td on td.install_order = t.apply_order
left join t_supplier ts on ts.name = t.team
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论