From 5ad53b7193a30e8c395c81d46032b50410540e1d Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 09 七月 2024 17:49:28 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordDTO.java | 30 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java | 20 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java | 3
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditRecordService.java | 9 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java | 18 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java | 8
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java | 87 +++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionCkglDTO.java | 29 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglVO.java | 47 +++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/getslVolumeProductionCkglQuery.java | 22 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java | 7
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java | 164 ++++++++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java | 10 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordQuery.java | 14 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 8
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java | 21 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java | 29 +++
18 files changed, 514 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java
index f3499df..3031a04 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java
@@ -3,7 +3,11 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlAuditRecord;
+import com.ruoyi.management.domain.dto.AuditRecordDTO;
+import com.ruoyi.management.domain.dto.AuditRecordQuery;
import com.ruoyi.management.domain.dto.InventoriesSuppliesInfoQuery;
+import com.ruoyi.management.domain.dto.SlAuditDTO;
import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.service.SlAuditRecordService;
import io.swagger.annotations.Api;
@@ -15,6 +19,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -30,7 +35,23 @@
public class SlAuditRecordController {
+ @Resource
+ private SlAuditRecordService slAuditRecordService;
+ @PostMapping("/getSlAuditRecord")
+ @ApiOperation(value = "获取审核详情记录")
+ public R<List<SlAuditRecord>> getSlAuditRecord(@RequestBody AuditRecordQuery auditRecordQuery) {
+ return R.ok(slAuditRecordService.getSlAuditRecord(auditRecordQuery));
+ }
+
+
+ @PostMapping("/updSlAuditRecord")
+ @ApiOperation(value = "审核状态填写")
+ public R updSlAuditRecord(@RequestBody AuditRecordDTO auditRecordDTO) {
+ slAuditRecordService.updSlAuditRecord(auditRecordDTO);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
index 00e4121..6a784fd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -1,10 +1,24 @@
package com.ruoyi.management.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
+import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
+import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
+import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
+import com.ruoyi.management.service.SlVolumeProductionCkglService;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -18,5 +32,20 @@
@RequestMapping("/sl-volume-production-ckgl")
@Api(value = "仓库出库管理接口", tags = "仓库出库管理接口", description = "仓库出库管理接口")
public class SlVolumeProductionCkglController {
+ @Resource
+ private SlVolumeProductionCkglService slVolumeProductionCkglService;
+
+ @PostMapping("/getslVolumeProductionCkglList")
+ @ApiOperation(value = "分页获取出库管理")
+ public R<PageDTO<VolumeProductionCkglVO>> getslVolumeProductionCkglList(@RequestBody getslVolumeProductionCkglQuery VolumeProductionCkglQuery) {
+ return R.ok(slVolumeProductionCkglService.getslVolumeProductionCkglList(VolumeProductionCkglQuery));
+ }
+
+ @PostMapping("/addslVolumeProductionCkgl")
+ @ApiOperation(value = "添加/修改出库管理")
+ public R addslVolumeProductionCkgl(@RequestBody VolumeProductionCkglDTO volumeProductionCkglDTO) {
+ slVolumeProductionCkglService.addslVolumeProductionCkgl(volumeProductionCkglDTO);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java
index 5ea5fec..0c93153 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java
@@ -61,7 +61,7 @@
@ApiModelProperty("拒绝原因")
@TableField("cause")
- private Integer cause;
+ private String cause;
@ApiModelProperty("审核人id")
@TableField("shenh_id")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java
index 3ed21ec..a6705ff 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java
@@ -27,7 +27,7 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
- @ApiModelProperty("审核记录的")
+ @ApiModelProperty("审核管理id")
@TableField("audit_id")
private Long auditId;
@@ -63,5 +63,13 @@
@TableField("update_time")
private Date updateTime;
+ @ApiModelProperty("审核时间")
+ @TableField("shenh_time")
+ private Date shenhTime;
+
+ @ApiModelProperty("审核人名称")
+ @TableField("shenh_name")
+ private String shenhName;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
index 92b9bad..6ea8afc 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
@@ -63,13 +63,29 @@
@TableField("update_time")
private Date updateTime;
- @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过")
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
@TableField("present_state")
private Integer presentState;
- @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝")
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
@TableField("audit_status")
private Integer auditStatus;
+ @ApiModelProperty("拒绝理由")
+ @TableField("reasons_refusal")
+ private String reasonsRefusal;
+
+ @ApiModelProperty("来源")
+ @TableField("source")
+ private String source;
+
+ @ApiModelProperty("附件")
+ @TableField("attachment")
+ private String attachmentUrl;
+
+ @ApiModelProperty("审批单")
+ @TableField("authorization")
+ private String authorization;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
index 307a356..d592f69 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
@@ -63,14 +63,18 @@
@TableField("update_time")
private Date updateTime;
- @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过")
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
@TableField("present_state")
private Integer presentState;
- @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝")
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
@TableField("audit_status")
private Integer auditStatus;
+ @ApiModelProperty("拒绝理由")
+ @TableField("reasons_refusal")
+ private String reasonsRefusal;
+
@ApiModelProperty("被转移仓库ID")
@TableField("bmanagement_id")
private Long bmanagementId;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordDTO.java
new file mode 100644
index 0000000..84b43e7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordDTO.java
@@ -0,0 +1,30 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("审核详情记录数据传输对象")
+public class AuditRecordDTO {
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty("1 是管理员审核，2 主管审核，3 是主任审核")
+ @TableField("type")
+ private Integer type;
+
+ @ApiModelProperty("1 待审核，2 是通过，3 是拒绝")
+ @TableField("state")
+ private Integer state;
+
+ @ApiModelProperty("拒绝原因")
+ @TableField("cause")
+ private String cause;
+
+ @ApiModelProperty("审核管理id")
+ private Long auditId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordQuery.java
new file mode 100644
index 0000000..1f796da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordQuery.java
@@ -0,0 +1,14 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("审核详情记录查询传输对象")
+public class AuditRecordQuery {
+
+ @ApiModelProperty("审核管理的id")
+ private Long auditId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionCkglDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionCkglDTO.java
new file mode 100644
index 0000000..1a092d7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionCkglDTO.java
@@ -0,0 +1,29 @@
+package com.ruoyi.management.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("出库管理数据传输对象")
+public class VolumeProductionCkglDTO {
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+ @ApiModelProperty("附件")
+ private String attachmentUrl;
+
+ @ApiModelProperty("用途")
+ private String source;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+ @ApiModelProperty("审批单")
+ private String authorization;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java
index 5cb2a2e..3775dcb 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java
@@ -14,9 +14,6 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
- @ApiModelProperty("发起人ID")
- private Long sysId;
-
@ApiModelProperty("仓库ID")
private Long managementId;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/getslVolumeProductionCkglQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/getslVolumeProductionCkglQuery.java
new file mode 100644
index 0000000..e960e58
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/getslVolumeProductionCkglQuery.java
@@ -0,0 +1,22 @@
+package com.ruoyi.management.domain.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("出库库查询传输对象")
+public class getslVolumeProductionCkglQuery extends BasePage {
+ @ApiModelProperty("供应商名称")
+ private String supplierName;
+
+ @ApiModelProperty("供应商电话")
+ private String supplierPhone;
+
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
+ private Integer presentState;
+
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已出库， 7，已取消 ，8 已完成")
+ private Integer auditStatus;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglVO.java
new file mode 100644
index 0000000..b49022b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglVO.java
@@ -0,0 +1,47 @@
+package com.ruoyi.management.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "出库管理", description = "出库管理")
+public class VolumeProductionCkglVO {
+
+ @ApiModelProperty("用户名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String nickName;
+
+ @ApiModelProperty(name = "手机号码")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String phonenumber;
+
+ private Integer id;
+
+ @ApiModelProperty("仓库名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String storeManagementName;
+
+ @ApiModelProperty("发起时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Date startiTime;
+
+ @ApiModelProperty("供应商id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long supplierId;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+ @ApiModelProperty("结束时间")
+ private Date endTime;
+
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
+ private Integer presentState;
+
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已出库， 7，已取消 ，8 已完成")
+ private Integer auditStatus;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditRecordService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditRecordService.java
index 38f9be3..5f7d68e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditRecordService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditRecordService.java
@@ -2,6 +2,11 @@
import com.ruoyi.management.domain.SlAuditRecord;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.AuditRecordDTO;
+import com.ruoyi.management.domain.dto.AuditRecordQuery;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +18,8 @@
*/
public interface SlAuditRecordService extends IService<SlAuditRecord> {
+ List<SlAuditRecord>getSlAuditRecord(AuditRecordQuery auditRecordQuery);
+
+ void updSlAuditRecord(AuditRecordDTO auditRecordDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
index 65eb2ab..9f42bc6 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
@@ -1,7 +1,12 @@
package com.ruoyi.management.service;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCkgl;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
+import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
+import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -12,5 +17,7 @@
* @since 2024-06-25
*/
public interface SlVolumeProductionCkglService extends IService<SlVolumeProductionCkgl> {
+ PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery);
+ void addslVolumeProductionCkgl(VolumeProductionCkglDTO volumeProductionCkglDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
index 1cdf376..6a31892 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java
@@ -1,11 +1,22 @@
package com.ruoyi.management.service.impl;
-import com.ruoyi.management.domain.SlAuditRecord;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.management.domain.*;
-import com.ruoyi.management.mapper.SlAuditRecordMapper;
+import com.ruoyi.management.domain.dto.AuditRecordDTO;
+import com.ruoyi.management.domain.dto.AuditRecordQuery;
+import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlAuditRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -18,4 +29,153 @@
@Service
public class SlAuditRecordServiceImpl extends ServiceImpl<SlAuditRecordMapper, SlAuditRecord> implements SlAuditRecordService {
+ @Resource
+ private SlAuditMapper slAuditMapper;
+
+ @Resource
+ private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper;
+
+ @Resource
+ private SlVolumeProductionCkglMapper slVolumeProductionCKglMapper;
+
+ @Resource
+ private SlVolumeProductionZyglMapper slVolumeProductionZyglMapper;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Override
+ public List<SlAuditRecord> getSlAuditRecord(AuditRecordQuery auditRecordQuery) {
+ LambdaQueryWrapper<SlAuditRecord> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAuditRecord::getAuditId,auditRecordQuery.getAuditId());
+ wrapper.eq( SlAuditRecord::getDelFlag,0);
+ wrapper.orderByAsc(SlAuditRecord::getType);
+ List<SlAuditRecord> page1 = this.list(wrapper);
+ return page1;
+ }
+
+ @Override
+ public void updSlAuditRecord(AuditRecordDTO auditRecordDTO) {
+ SlAudit slAudit = slAuditMapper.selectById(auditRecordDTO.getAuditId());
+ SlAuditRecord byId = this.getById(auditRecordDTO.getId());
+ if (auditRecordDTO.getState()==2){
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
+ byId.setShenhName(data.getNickName());
+ byId.setShenhTime(new Date());
+ this.updateById(byId);
+ if (slAudit.getState()==1){
+ slAudit.setState(2);
+ LambdaQueryWrapper<SlAuditRecord> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAuditRecord::getAuditId,auditRecordDTO.getAuditId());
+ wrapper.eq(SlAuditRecord::getType,2);
+ wrapper.eq( SlAuditRecord::getDelFlag,0);
+ SlAuditRecord one = this.getOne(wrapper);
+ slAudit.setShenhId(one.getShenhId());
+ slAuditMapper.updateById(slAudit);
+ if (slAudit.getType()==1){
+ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionRkgl.setAuditStatus(2);
+ slVolumeProductionRkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl);
+ }
+ if (slAudit.getType()==2){
+ SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionCkgl.setAuditStatus(2);
+ slVolumeProductionCkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl);
+ }
+ if (slAudit.getType()==3){
+ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionZygl.setAuditStatus(2);
+ slVolumeProductionZygl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
+ }
+
+ } if (slAudit.getState()==2){
+ slAudit.setState(3);
+ LambdaQueryWrapper<SlAuditRecord> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAuditRecord::getAuditId,auditRecordDTO.getAuditId());
+ wrapper.eq(SlAuditRecord::getType,3);
+ wrapper.eq( SlAuditRecord::getDelFlag,0);
+ SlAuditRecord one = this.getOne(wrapper);
+ slAudit.setShenhId(one.getShenhId());
+ slAuditMapper.updateById(slAudit);
+ if (slAudit.getType()==1){
+ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionRkgl.setAuditStatus(3);
+ slVolumeProductionRkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl);
+ }
+ if (slAudit.getType()==2){
+ SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionCkgl.setAuditStatus(3);
+ slVolumeProductionCkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl);
+ }
+ if (slAudit.getType()==3){
+ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionZygl.setAuditStatus(3);
+ slVolumeProductionZygl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
+ }
+
+ }if (slAudit.getState()==3){
+ slAudit.setState(4);
+ slAuditMapper.updateById(slAudit);
+ if (slAudit.getType()==1){
+ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionRkgl.setAuditStatus(4);
+ slVolumeProductionRkgl.setPresentState(3);
+ slVolumeProductionRkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl);
+ }
+ if (slAudit.getType()==2){
+ SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionCkgl.setAuditStatus(4);
+ slVolumeProductionCkgl.setPresentState(3);
+ slVolumeProductionCkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl);
+ }
+ if (slAudit.getType()==3){
+ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionZygl.setAuditStatus(4);
+ slVolumeProductionZygl.setPresentState(3);
+ slVolumeProductionZygl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
+ }
+
+ }
+
+ }
+ if (auditRecordDTO.getState()==3){
+ slAudit.setCause(auditRecordDTO.getCause());
+ slAudit.setState(5);
+ slAuditMapper.updateById(slAudit);
+
+ if (slAudit.getType()==1){
+ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionRkgl.setAuditStatus(5);
+ slVolumeProductionRkgl.setPresentState(2);
+ slVolumeProductionRkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl);
+ }
+ if (slAudit.getType()==2){
+ SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionCkgl.setAuditStatus(5);
+ slVolumeProductionCkgl.setPresentState(2);
+ slVolumeProductionCkgl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl);
+ }
+ if (slAudit.getType()==3){
+ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAudit.getRkId());
+ slVolumeProductionZygl.setAuditStatus(5);
+ slVolumeProductionZygl.setPresentState(2);
+ slVolumeProductionZygl.setReasonsRefusal(auditRecordDTO.getCause());
+ slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
+ }
+
+ }
+
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
index db9b99c..804be13 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
@@ -103,6 +103,24 @@
@Override
public void addslAudit(SlAuditDTO slAuditDTO) {
+
+ LambdaQueryWrapper< SlAudit> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlAudit::getRkId,slAuditDTO.getRkId());
+ wrapper.eq(SlAudit::getType,slAuditDTO.getType());
+ wrapper.eq( SlAudit::getDelFlag,0);
+ wrapper.orderByDesc(SlAudit::getCreateTime);
+ SlAudit page1 = this.getOne(wrapper);
+ if (page1!=null){
+ LambdaQueryWrapper<SlAuditRecord> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlAuditRecord::getAuditId,page1.getId());
+ List<SlAuditRecord> slAuditRecords = slAuditRecordMapper.selectList(wrapper1);
+ for (SlAuditRecord lAuditRecord:slAuditRecords){
+ slAuditRecordMapper.deleteById(lAuditRecord);
+ }
+ this.removeById(page1);
+ }
+
+
SlAudit slAudit=new SlAudit();
slAudit.setType(slAuditDTO.getType());
slAudit.setState(1);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
index eece32f..04bb997 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -1,10 +1,31 @@
package com.ruoyi.management.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionCkgl;
+import com.ruoyi.management.domain.SlVolumeProductionRkgl;
+import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
+import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
+import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
+import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
+import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionCkglMapper;
import com.ruoyi.management.service.SlVolumeProductionCkglService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -16,5 +37,71 @@
*/
@Service
public class SlVolumeProductionCkglServiceImpl extends ServiceImpl<SlVolumeProductionCkglMapper, SlVolumeProductionCkgl> implements SlVolumeProductionCkglService {
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private SlStoreManagementMapper slStoreManagementMapper;
+ @Override
+ public PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery) {
+
+ Page<SlVolumeProductionCkgl> page = new Page<>(VolumeProductionCkglQuery.getPageCurr(), VolumeProductionCkglQuery.getPageSize());
+ getVolumeProductionRkQuery getVolume=new getVolumeProductionRkQuery();
+ getVolume.setSupplierPhone(VolumeProductionCkglQuery.getSupplierPhone());
+ getVolume.setSupplierName(VolumeProductionCkglQuery.getSupplierName());
+ List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolume).getData();
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = data1.stream().map(SysUser::getUserId)
+ .collect(Collectors.toSet());
+
+ LambdaQueryWrapper< SlVolumeProductionCkgl> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionCkgl::getPresentState,VolumeProductionCkglQuery.getPresentState());
+ wrapper1.eq(SlVolumeProductionCkgl::getAuditStatus,VolumeProductionCkglQuery.getAuditStatus());
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(SlVolumeProductionCkgl::getSysId,goodsSkuIdList);
+ }
+ wrapper1.eq( SlVolumeProductionCkgl::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionCkgl::getCreateTime);
+ Page<SlVolumeProductionCkgl> page2 = this.page(page, wrapper1);
+
+ PageDTO<VolumeProductionCkglVO> SlGoodsShelfDTO = PageDTO.of(page2, VolumeProductionCkglVO .class);
+ List<VolumeProductionCkglVO> list2 = SlGoodsShelfDTO.getList();
+ for(VolumeProductionCkglVO list:list2){
+ SysUser data = sysUserClient.getSysUser(list.getSupplierId()).getData();
+ list.setNickName(data.getNickName());
+ list.setPhonenumber(data.getPhonenumber());
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
+ list.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ }
+ return SlGoodsShelfDTO;
+ }
+
+ @Override
+ public void addslVolumeProductionCkgl(VolumeProductionCkglDTO volumeProductionCkglDTO) {
+ Long userid = SecurityUtils.getUserId();
+ if (volumeProductionCkglDTO.getId()!=null){
+ SlVolumeProductionCkgl slVolumeProductionRkgl=new SlVolumeProductionCkgl();
+ slVolumeProductionRkgl.setAttachmentUrl(volumeProductionCkglDTO.getAttachmentUrl());
+ slVolumeProductionRkgl.setAuthorization(volumeProductionCkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuditStatus(1);
+ slVolumeProductionRkgl.setManagementId(volumeProductionCkglDTO.getManagementId());
+ slVolumeProductionRkgl.setPresentState(1);
+ slVolumeProductionRkgl.setSource(volumeProductionCkglDTO.getSource());
+ slVolumeProductionRkgl.setStartiTime(new Date());
+ slVolumeProductionRkgl.setSysId(userid);
+ this.save(slVolumeProductionRkgl);
+ }else{
+ SlVolumeProductionCkgl byId = this.getById(volumeProductionCkglDTO.getId());
+ if (volumeProductionCkglDTO.getSource()!=null){
+ byId.setSource(volumeProductionCkglDTO.getSource());
+ }
+ if (volumeProductionCkglDTO.getAttachmentUrl()!=null){
+ byId.setAttachmentUrl(volumeProductionCkglDTO.getAttachmentUrl());
+ }
+ if (volumeProductionCkglDTO.getAuthorization()!=null){
+ byId.setAuthorization(volumeProductionCkglDTO.getAuthorization());
+ }
+ this.updateById(byId);
+ }
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index 32e7e05..f4812c1 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
@@ -103,7 +104,7 @@
wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
if (goodsSkuIdList.size()>0){
- wrapper1.in(SlVolumeProductionRkgl::getSupplierId,goodsSkuIdList);
+ wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
}
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
@@ -123,6 +124,7 @@
@Override
public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ Long userid = SecurityUtils.getUserId();
if (volumeProductionRkglDTO.getId()!=null){
SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
@@ -133,9 +135,9 @@
slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
slVolumeProductionRkgl.setStartiTime(new Date());
- slVolumeProductionRkgl.setSysId(volumeProductionRkglDTO.getSysId());
+ slVolumeProductionRkgl.setSysId(userid);
slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
- this.updateById(slVolumeProductionRkgl);
+ this.save(slVolumeProductionRkgl);
}else{
SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
if (volumeProductionRkglDTO.getSource()!=null){
--
Gitblit v1.7.1