bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-11-18 18:27:05 +08:00
parent 5e49360f85 353cf73e79
commit 5d0dfc02fa
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java
View File

@ -2,6 +2,8 @@ package com.bonus.material.back.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.back.domain.vo.BackApplyRequestVo;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
@ -90,7 +92,7 @@ public class BackApplyInfoController extends BaseController {
@RequiresPermissions("back:info:add")
@SysLog(title = "退料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增退料任务")
@PostMapping
public AjaxResult add(@RequestBody BackApplyRequestVo dto) {
public AjaxResult add(@Valid @RequestBody BackApplyRequestVo dto) {
try {
return backApplyInfoService.insertBackApplyInfo(dto);
} catch (Exception e) {
@ -106,7 +108,7 @@ public class BackApplyInfoController extends BaseController {
@RequiresPermissions("back:info:edit")
@SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改退料任务")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody BackApplyRequestVo dto) {
public AjaxResult edit(@Valid @RequestBody BackApplyRequestVo dto) {
try {
return backApplyInfoService.updateBackApplyInfo(dto);
} catch (Exception e) {

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyInfo.java
View File

@ -6,7 +6,8 @@ import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity;
import javax.validation.constraints.Size;
/**
* 退料任务对象 back_apply_info
@ -65,6 +66,7 @@ public class BackApplyInfo {
/** 退料人 */
@Excel(name = "退料人")
@ApiModelProperty(value = "退料人")
@Size(max = 20, message = "退料人长度不能超过20个字符")
private String backPerson;
/**
@ -124,6 +126,7 @@ public class BackApplyInfo {
private String printStatus;
@Excel(name = "备注")
@Size(max = 500, message = "备注长度不能超过500个字符")
private String remark;
@ApiModelProperty(value = "机具id")

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyRequestVo.java
View File

@ -4,6 +4,7 @@ import com.bonus.material.back.domain.BackApplyDetails;
import com.bonus.material.back.domain.BackApplyInfo;
import lombok.Data;
import javax.validation.Valid;
import java.util.List;
/**
@ -19,6 +20,7 @@ public class BackApplyRequestVo {
/**
* 退料申请信息
*/
@Valid
private BackApplyInfo backApplyInfo;
/**

2
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseStorageMapper.xml
View File

@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="maCode != null">ma_code,</if>
ma_status,
<if test="qrCode != null">qr_code,</if>
<if test="productDate != null">out_fac_time,</if>
<if test="outFacCode != null">out_fac_code,</if>
create_time
</trim>
@ -19,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="maCode != null">#{maCode},</if>
1,
<if test="qrCode != null">#{qrCode},</if>
<if test="productDate != null">#{productDate},</if>
<if test="outFacCode != null">#{outFacCode},</if>
now()
</trim>