bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改提交

This commit is contained in:
liang.chao 2024-04-30 16:43:40 +08:00
parent 18168f0c46
commit bc8420e094
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -189,7 +189,7 @@ public class BackReceiveController extends BaseController {
} }
} }
@Log(title = "退料接收-结束任务", businessType = BusinessType.INSERT) @Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL)
@PostMapping("endBack") @PostMapping("endBack")
public AjaxResult endBack(@RequestBody BackApplyInfo record) { public AjaxResult endBack(@RequestBody BackApplyInfo record) {
try { try {

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java
View File

@ -128,7 +128,7 @@ public class LeaseOutDetailsController extends BaseController {
* *
* @param record 出库内容 * @param record 出库内容
*/ */
@Log(title = "领料出库", businessType = BusinessType.UPDATE) @Log(title = "领料出库", businessType = BusinessType.MATERIAL)
@PostMapping("/submitOut") @PostMapping("/submitOut")
public AjaxResult submitOut(@RequestBody LeaseOutDetails record) { public AjaxResult submitOut(@RequestBody LeaseOutDetails record) {
return leaseOutDetailsService.submitOut(record); return leaseOutDetailsService.submitOut(record);
@ -138,7 +138,7 @@ public class LeaseOutDetailsController extends BaseController {
* @param recordList * @param recordList
* @return * @return
*/ */
@Log(title = "领料出库", businessType = BusinessType.UPDATE) @Log(title = "领料出库", businessType = BusinessType.MATERIAL)
@PostMapping("/submitOutRfid") @PostMapping("/submitOutRfid")
public AjaxResult submitOutRfid(@RequestBody List<LeaseOutDetails> recordList) { public AjaxResult submitOutRfid(@RequestBody List<LeaseOutDetails> recordList) {
if (CollUtil.isEmpty(recordList)){ if (CollUtil.isEmpty(recordList)){

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -265,6 +265,6 @@ public class TmTask implements Serializable {
private Date estimateLeaseTime; private Date estimateLeaseTime;
private Integer souceByRefuse; private Integer souceByRefuse;
private Integer souceBy; private int souceBy;
} }

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTaskDto.java
View File

@ -103,9 +103,6 @@ public class TmTaskDto implements Serializable {
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "申请时间", sort = 5)
private Date createTime; private Date createTime;
/** /**
@ -209,6 +206,9 @@ public class TmTaskDto implements Serializable {
private String examineStatus; private String examineStatus;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "申请时间", sort = 5)
private String createTimes; private String createTimes;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
View File

@ -3,6 +3,8 @@ package com.bonus.sgzb.material.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.material.domain.LeaseApplyInfo; import com.bonus.sgzb.material.domain.LeaseApplyInfo;
import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.domain.MaInputRecord;
import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
@ -119,6 +121,7 @@ public class PurchaseMacodeInfoController extends BaseController {
* 通过/不通过 * 通过/不通过
*/ */
@ApiOperation(value = "新购入库审核") @ApiOperation(value = "新购入库审核")
@Log(title = "新购验收任务", businessType = BusinessType.MATERIAL)
@PutMapping("/manageStatus") @PutMapping("/manageStatus")
public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception {
return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO)); return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO));

4
sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
View File

@ -65,11 +65,11 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.system.api.domain.BmNumLogs" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.system.api.domain.BmNumLogs" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into bm_num_logs (model_title, `method`, task, insert into bm_num_logs (model_title, `method`, task,
type_id, num, description, json_result, type_id, description, json_result,
`time`, creator, remark `time`, creator, remark
) )
values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{task,jdbcType=VARCHAR}, values (#{modelTitle,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{task,jdbcType=VARCHAR},
#{typeId,jdbcType=INTEGER}, #{num,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{jsonResult,jdbcType=VARCHAR},
#{time,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR} #{time,jdbcType=TIMESTAMP}, #{creator,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}
) )
</insert> </insert>