From e273a963deb73e46d5e0daef6d36d1f78892ee2d Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 05 七月 2024 18:09:52 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java | 7 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java | 22 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java | 6 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java | 41 ++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java | 1
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java | 3
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 32 +++++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java | 37 +++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 36 +++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java | 22 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 40 ++++++++
11 files changed, 242 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index 1887920..b6820fa 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -4,15 +4,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkDTO;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkListDTO;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
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 io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -38,4 +38,26 @@
return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO));
}
+ @PostMapping("/addSlVolumeProductionRk")
+ @ApiOperation(value = "添加入库批次管理")
+ public R addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
+ slVolumeProductionRkService.addVolumeProductionRkgl(slVolumeProductionRkListDTO);
+ return R.ok();
+ }
+
+ @PostMapping("/uplSlVolumeProductionRk")
+ @ApiOperation(value = "修改入库批次管理")
+ public R uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
+ slVolumeProductionRkService.uplSlVolumeProductionRk(SlVolumeProductionRkDTO);
+ return R.ok();
+ }
+
+ @ApiOperation("删除入库批次")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Integer id) {
+ slVolumeProductionRkService.removeById(id);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
index 7248ca7..747a325 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -3,7 +3,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlVolumeProductionRkgl;
+import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.service.SlVolumeProductionRkglService;
@@ -50,4 +53,23 @@
return R.ok(slVolumeProductionRkglService.getslVolumeProductionRkglList(getVolumeProductionRkQuery));
}
+
+ @PostMapping("/addVolumeProductionRkgl")
+ @ApiOperation(value = "添加/修改入库管理")
+ public R addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ slVolumeProductionRkglService.addVolumeProductionRkgl(volumeProductionRkglDTO);
+ return R.ok();
+ }
+
+ @ApiOperation("取消入库管理")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ SlVolumeProductionRkgl byId = slVolumeProductionRkglService.getById(id);
+ byId.setPresentState(5);
+ byId.setAuditStatus(7);
+ slVolumeProductionRkglService.updateById(byId);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java
new file mode 100644
index 0000000..ef5eb80
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkDTO.java
@@ -0,0 +1,41 @@
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("入库批次修改数据传输对象")
+public class SlVolumeProductionRkDTO {
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty("入库数量")
+ private Long rkNum;
+
+
+ @ApiModelProperty("入库编号")
+ private String rkNumber;
+
+
+ @ApiModelProperty("入库型号")
+ private String rkModel;
+
+ @ApiModelProperty("入库价格")
+ private BigDecimal rkPice;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("货架id")
+ private Long shelfId;
+
+ @ApiModelProperty("二维码数量")
+ private Integer erwmNum;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
new file mode 100644
index 0000000..71034d1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
@@ -0,0 +1,22 @@
+package com.ruoyi.management.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("入库批次数据传输对象")
+public class SlVolumeProductionRkListDTO {
+
+ @ApiModelProperty("入管理主表id")
+ private Long VolumeProductionRkglId;
+
+ @ApiModelProperty("物资id")
+ private List<Long> materialsId;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+}
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
new file mode 100644
index 0000000..5cb2a2e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionRkglDTO.java
@@ -0,0 +1,37 @@
+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 VolumeProductionRkglDTO {
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty("发起人ID")
+ private Long sysId;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+ @ApiModelProperty("供应商id")
+ private Long supplierId;
+
+ @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/vo/SupplierVolumeProductionRkglVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
index a862d67..89023a9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
@@ -36,5 +36,12 @@
@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，已取消")
+ private Integer auditStatus;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
index 18ff39d..6690ec0 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
@@ -49,4 +49,5 @@
@ApiModelProperty("审批单")
private String authorization;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
index 3ac1354..82427e7 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkDTO;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkListDTO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,4 +23,8 @@
PageDTO<ManagementimgVolumeProductionRkVO> getSlGoodsMaterialsSlVolumeProductionRkList(SlGoodsMaterialsSlVolumeProductionRkQuery SlGoodsMaterialsSlVolumeProductionRkDTO);
+
+ void addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO);
+
+ void uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
index b1b3509..4d75085 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
@@ -4,9 +4,11 @@
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -22,4 +24,5 @@
PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList( getVolumeProductionRkQuery getVolumeProductionRkQuery) ;
+ void addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 13a9db2..a499e14 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -7,6 +7,8 @@
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkDTO;
+import com.ruoyi.management.domain.dto.SlVolumeProductionRkListDTO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.mapper.*;
@@ -94,4 +96,38 @@
}
return SlGoodsShelfDTO;
}
+
+ @Override
+ public void addVolumeProductionRkgl(SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
+ List<Long> materialsId = slVolumeProductionRkListDTO.getMaterialsId();
+ for (Long m:materialsId){
+ SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
+ slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId());
+ slVolumeProductionRk.setMaterialsId(m);
+ slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId());
+ this.save(slVolumeProductionRk);
+ }
+
+ }
+
+ @Override
+ public void uplSlVolumeProductionRk(SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
+ SlVolumeProductionRk byId = this.getById(SlVolumeProductionRkDTO.getId());
+ if (SlVolumeProductionRkDTO.getErwmNum()!=null){
+ byId.setErwmNum(SlVolumeProductionRkDTO.getErwmNum());
+ }if (SlVolumeProductionRkDTO.getRkPice()!=null){
+ byId.setRkPice(SlVolumeProductionRkDTO.getRkPice());
+ }if (SlVolumeProductionRkDTO.getRkNum()!=null){
+ byId.setRkNum(SlVolumeProductionRkDTO.getRkNum());
+ }if (SlVolumeProductionRkDTO.getShelfId()!=null){
+ byId.setShelfId(SlVolumeProductionRkDTO.getShelfId());
+ }if (SlVolumeProductionRkDTO.getRkModel()!=null){
+ byId.setRkModel(SlVolumeProductionRkDTO.getRkModel());
+ }if (SlVolumeProductionRkDTO.getStoreManagementNumber()!=null){
+ byId.setStoreManagementNumber(SlVolumeProductionRkDTO.getStoreManagementNumber());
+ }if (SlVolumeProductionRkDTO.getRkNumber()!=null){
+ byId.setRkNumber(SlVolumeProductionRkDTO.getRkNumber());
+ }
+ 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 b67c136..f36266f 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
@@ -8,6 +8,7 @@
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
+import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
@@ -20,6 +21,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -107,5 +111,41 @@
return SlGoodsShelfDTO;
}
+ @Override
+ public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ if (volumeProductionRkglDTO.getId()!=null){
+ SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
+ slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
+ slVolumeProductionRkgl.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuditStatus(1);
+ slVolumeProductionRkgl.setManagementId(volumeProductionRkglDTO.getManagementId());
+ slVolumeProductionRkgl.setPresentState(1);
+ slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
+ slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
+ slVolumeProductionRkgl.setStartiTime(new Date());
+ slVolumeProductionRkgl.setSysId(volumeProductionRkglDTO.getSysId());
+ slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
+ this.updateById(slVolumeProductionRkgl);
+ }else{
+ SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
+ if (volumeProductionRkglDTO.getSource()!=null){
+ byId.setSource(volumeProductionRkglDTO.getSource());
+ }
+ if (volumeProductionRkglDTO.getRemark()!=null){
+ byId.setRemark(volumeProductionRkglDTO.getRemark());
+ }
+ if (volumeProductionRkglDTO.getSupplierId()!=null){
+ byId.setSupplierId(volumeProductionRkglDTO.getSupplierId());
+ }
+ if (volumeProductionRkglDTO.getAttachmentUrl()!=null){
+ byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
+ }
+ if (volumeProductionRkglDTO.getAuthorization()!=null){
+ byId.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+ }
+ this.updateById(byId);
+ }
+ }
+
}
--
Gitblit v1.7.1