接口优化
This commit is contained in:
parent
65c7979cea
commit
353cf73e79
|
|
@ -2,6 +2,8 @@ package com.bonus.material.back.controller;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
import com.bonus.common.log.enums.OperaType;
|
import com.bonus.common.log.enums.OperaType;
|
||||||
import com.bonus.material.back.domain.vo.BackApplyRequestVo;
|
import com.bonus.material.back.domain.vo.BackApplyRequestVo;
|
||||||
import com.bonus.material.common.annotation.PreventRepeatSubmit;
|
import com.bonus.material.common.annotation.PreventRepeatSubmit;
|
||||||
|
|
@ -90,7 +92,7 @@ public class BackApplyInfoController extends BaseController {
|
||||||
@RequiresPermissions("back:info:add")
|
@RequiresPermissions("back:info:add")
|
||||||
@SysLog(title = "退料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务")
|
@SysLog(title = "退料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务")
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody BackApplyRequestVo dto) {
|
public AjaxResult add(@Valid @RequestBody BackApplyRequestVo dto) {
|
||||||
try {
|
try {
|
||||||
return backApplyInfoService.insertBackApplyInfo(dto);
|
return backApplyInfoService.insertBackApplyInfo(dto);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
@ -106,7 +108,7 @@ public class BackApplyInfoController extends BaseController {
|
||||||
@RequiresPermissions("back:info:edit")
|
@RequiresPermissions("back:info:edit")
|
||||||
@SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务")
|
@SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务")
|
||||||
@PostMapping("/edit")
|
@PostMapping("/edit")
|
||||||
public AjaxResult edit(@RequestBody BackApplyRequestVo dto) {
|
public AjaxResult edit(@Valid @RequestBody BackApplyRequestVo dto) {
|
||||||
try {
|
try {
|
||||||
return backApplyInfoService.updateBackApplyInfo(dto);
|
return backApplyInfoService.updateBackApplyInfo(dto);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,8 @@ import com.bonus.common.core.annotation.Excel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
import com.bonus.common.core.web.domain.BaseEntity;
|
|
||||||
|
import javax.validation.constraints.Size;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 退料任务对象 back_apply_info
|
* 退料任务对象 back_apply_info
|
||||||
|
|
@ -65,6 +66,7 @@ public class BackApplyInfo {
|
||||||
/** 退料人 */
|
/** 退料人 */
|
||||||
@Excel(name = "退料人")
|
@Excel(name = "退料人")
|
||||||
@ApiModelProperty(value = "退料人")
|
@ApiModelProperty(value = "退料人")
|
||||||
|
@Size(max = 20, message = "退料人长度不能超过20个字符")
|
||||||
private String backPerson;
|
private String backPerson;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -124,6 +126,7 @@ public class BackApplyInfo {
|
||||||
private String printStatus;
|
private String printStatus;
|
||||||
|
|
||||||
@Excel(name = "备注")
|
@Excel(name = "备注")
|
||||||
|
@Size(max = 500, message = "备注长度不能超过500个字符")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@ApiModelProperty(value = "机具id")
|
@ApiModelProperty(value = "机具id")
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.bonus.material.back.domain.BackApplyDetails;
|
||||||
import com.bonus.material.back.domain.BackApplyInfo;
|
import com.bonus.material.back.domain.BackApplyInfo;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -19,6 +20,7 @@ public class BackApplyRequestVo {
|
||||||
/**
|
/**
|
||||||
* 退料申请信息
|
* 退料申请信息
|
||||||
*/
|
*/
|
||||||
|
@Valid
|
||||||
private BackApplyInfo backApplyInfo;
|
private BackApplyInfo backApplyInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="maCode != null">ma_code,</if>
|
<if test="maCode != null">ma_code,</if>
|
||||||
ma_status,
|
ma_status,
|
||||||
<if test="qrCode != null">qr_code,</if>
|
<if test="qrCode != null">qr_code,</if>
|
||||||
|
<if test="productDate != null">out_fac_time,</if>
|
||||||
<if test="outFacCode != null">out_fac_code,</if>
|
<if test="outFacCode != null">out_fac_code,</if>
|
||||||
create_time
|
create_time
|
||||||
</trim>
|
</trim>
|
||||||
|
|
@ -19,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="maCode != null">#{maCode},</if>
|
<if test="maCode != null">#{maCode},</if>
|
||||||
1,
|
1,
|
||||||
<if test="qrCode != null">#{qrCode},</if>
|
<if test="qrCode != null">#{qrCode},</if>
|
||||||
|
<if test="productDate != null">#{productDate},</if>
|
||||||
<if test="outFacCode != null">#{outFacCode},</if>
|
<if test="outFacCode != null">#{outFacCode},</if>
|
||||||
now()
|
now()
|
||||||
</trim>
|
</trim>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue