From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 18 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java | 9 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java | 5
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java | 9
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 24 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditRecordServiceImpl.java | 30 ++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/NumberAndShelfVO.java | 17 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java | 6
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 9
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java | 3
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java | 66 ++++++
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 3
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GetMaterialsByManagementIdQuery.java | 17 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java | 1
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java | 36 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 123 +++++++++----
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java | 6
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QueryDTO.java | 18 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 10
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java | 11
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java | 3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 20 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/QRCodeVO.java | 39 ++++
32 files changed, 409 insertions(+), 101 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 427ef85..aace777 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -106,6 +106,9 @@
recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
throw new ServiceException("对不起，您的账号：" + username + " 已停用");
}
+ if (user.getUserType().equals("02")){
+ throw new ServiceException("登录失败，登录账号权限不足");
+ }
if (user.getUserType().equals("03")){
SeBei se=new SeBei();
se.setUserId(user.getUserId());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java
index f980ebe..54a57cf 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java
@@ -9,6 +9,7 @@
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;
@@ -46,13 +47,13 @@
@PostMapping("/getcountyRegione")
@ApiOperation(value = "获取县")
- public R<List<SlRegion>> getcountyRegione(RegionQuery regionQuery) {
+ public R<List<SlRegion>> getcountyRegione(@RequestBody RegionQuery regionQuery) {
return R.ok(regionService.getcountyRegione(regionQuery));
}
@PostMapping("/gettownRegione")
@ApiOperation(value = "获取乡")
- public R<List<SlRegion>> gettownRegione(RegionQuery regionQuery) {
+ public R<List<SlRegion>> gettownRegione(@RequestBody RegionQuery regionQuery) {
return R.ok(regionService.gettownRegione(regionQuery));
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
index 27b89f7..cda697e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
@@ -33,7 +34,11 @@
@Resource
private SlVolumeProductionCkService slVolumeProductionCkService;
-
+ @PostMapping("/getMaterialByManagementIdList")
+ @ApiOperation(value = "发起出库 根据仓库Id 选择物资")
+ public R<PageDTO<InventoriesSuppliesInfoVO>> getMaterialByManagementIdList(@RequestBody GetMaterialsByManagementIdQuery query) {
+ return R.ok(slVolumeProductionCkService.getMaterialByManagementIdList(query));
+ }
@PostMapping("/getManagementimgSlVolumeProductionCkList")
@ApiOperation(value = "分页获取通过物资来获取当前批次出库的物资")
public R<PageDTO<ManagementimgSlVolumeProductionCkVO>> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
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 c4e1f6f..130e02d 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
@@ -5,10 +5,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.*;
-import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
-import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO;
-import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
-import com.ruoyi.management.domain.vo.gethuojRkVO;
+import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -83,8 +80,9 @@
@PostMapping("/codeInfo/{id}")
@ApiOperation(value = "获取二维码样式")
- public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id){
- return R.ok(slVolumeProductionRkService.codeInfo(id));
+ public R<List<QRCodeVO>> codeInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id){
+ slVolumeProductionRkService.codeInfo(id);
+ return R.ok();
}
@PostMapping("/getSlvolumeVolumeProductionRkList")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
index 66d6296..ad47960 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
@@ -5,10 +5,8 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.ruoyi.management.domain.dto.*;
-import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
-import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
-import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
-import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO;
+import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO;
+import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.service.SlVolumeProductionZyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,6 +32,11 @@
@Resource
private SlVolumeProductionZyService slVolumeProductionZyService;
+ @PostMapping("/getNumberAndShelfByManagementId")
+ @ApiOperation(value = "根据仓库id 查询楼层和货架")
+ public R<NumberAndShelfVO> getNumberAndShelfByManagementId(@RequestBody QueryDTO dto) {
+ return R.ok(slVolumeProductionZyService.getNumberAndShelfByManagementId(dto));
+ }
@PostMapping("/getVolumeProductionzyCode")
@ApiOperation(value = "获取转移管理二维码")
public R<PageDTO<getVolumeProductionzyCodeVO>> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) {
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 a6705ff..ed616a8 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GetMaterialsByManagementIdQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GetMaterialsByManagementIdQuery.java
new file mode 100644
index 0000000..5249647
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GetMaterialsByManagementIdQuery.java
@@ -0,0 +1,17 @@
+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("出库-通过仓库Id查询对应物资")
+public class GetMaterialsByManagementIdQuery extends BasePage {
+ @ApiModelProperty("仓库id")
+ private Long managementId;
+ @ApiModelProperty("物资名称")
+ private String materialsName;
+ @ApiModelProperty("物资类型 1消耗 2非消耗")
+ private Integer isConsume;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QueryDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QueryDTO.java
new file mode 100644
index 0000000..7103ae8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/QueryDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.management.domain.dto;
+
+import com.ruoyi.management.domain.SlGoodsShelf;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("查询仓库楼层数量和货架数量")
+public class QueryDTO {
+ @ApiModelProperty("所在楼层")
+ private Integer managementNumber;
+ @ApiModelProperty("仓库id")
+ private Long managementId;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
index e798f34..de599b9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
@@ -60,6 +60,10 @@
@ApiModelProperty("判断是不是新增的数据")
private String newAddTime;
+ @ApiModelProperty("二维码数量")
+ private String erwmNum;
+ @ApiModelProperty("已扫描二维码数量")
+ private String smerwmNum;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/NumberAndShelfVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/NumberAndShelfVO.java
new file mode 100644
index 0000000..6d2cac8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/NumberAndShelfVO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.management.domain.vo;
+
+import com.ruoyi.management.domain.SlGoodsShelf;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "根据仓库id 获取对应货架和楼层VO", description = "根据仓库id 获取对应货架和楼层VO")
+public class NumberAndShelfVO {
+ @ApiModelProperty("楼层 1=一层 2=二层。。。")
+ private List<String> number;
+ @ApiModelProperty("货架列表")
+ private List<SlGoodsShelf> goodsShelfList;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/QRCodeVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/QRCodeVO.java
new file mode 100644
index 0000000..8e63fca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/QRCodeVO.java
@@ -0,0 +1,39 @@
+package com.ruoyi.management.domain.vo;
+
+import com.ruoyi.management.domain.SlGoodsShelf;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel(value = "生成二维码VO", description = "生成二维码VO")
+public class QRCodeVO {
+
+ private Long id;
+ @ApiModelProperty("二维码")
+ private String qrCode;
+ @ApiModelProperty("物资名称")
+ private String goodsMaterialsName;
+ @ApiModelProperty("供应商名称")
+ private String supplierName;
+ @ApiModelProperty("物资批次（物资缩写+时间202401010000）")
+ private String materials;
+ @ApiModelProperty("物资数量")
+ private Long materialsNum;
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+ @ApiModelProperty("入管理主表id")
+ private Long VolumeProductionRkglId;
+ @ApiModelProperty("物资id")
+ private Long materialsId;
+ @ApiModelProperty("货架id")
+ private Long shelfId;
+ @ApiModelProperty("仓库id")
+ private Long storeManagementId;
+ @ApiModelProperty("分类")
+ private String category;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
index d1e7b99..8a55819 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
@@ -2,9 +2,12 @@
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
@ApiModel(value = "审核管理视图对象", description = "审核管理视图对象")
@@ -18,7 +21,8 @@
private String sysPhone;
@ApiModelProperty("发起时间")
- private DateTime createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
@ApiModelProperty("入库管理id")
private Long rkId;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java
index ffafb81..32be1ce 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.management.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,6 +31,7 @@
private String BstoreManagementName;
@ApiModelProperty("发起时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date startiTime;
@ApiModelProperty("结束时间")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
index 0d8cd56..80ed462 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
@@ -3,10 +3,8 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.management.domain.dto.AddSlVolumeProductionCkDTO;
-import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionCkQuery;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
+import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -32,4 +30,7 @@
PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
List<ManagementimgVolumeProductionCkVO> SlVolumeProductionCkList( ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
+
+ PageDTO<InventoriesSuppliesInfoVO> getMaterialByManagementIdList(GetMaterialsByManagementIdQuery query);
+
}
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 bd5f5fd..bf608f8 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,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
+import com.ruoyi.management.domain.vo.QRCodeVO;
import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
import com.ruoyi.management.domain.vo.gethuojRkVO;
import io.swagger.annotations.ApiParam;
@@ -32,7 +33,7 @@
void uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO);
PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery);
- ManagementimgVolumeProductionRkVO codeInfo(Long id);
+ List<QRCodeVO> codeInfo(Long id);
PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java
index f5a8d2c..d2d43a2 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java
@@ -4,6 +4,7 @@
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.NumberAndShelfVO;
import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,4 +26,6 @@
void updSlVolumeProductionZy(List<UpdaddSlVolumeProductionZyDTO> updaddSlVolumeProductionZyDTO);
PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList( ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery);
+
+ NumberAndShelfVO getNumberAndShelfByManagementId(QueryDTO dto);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
index a3ae1be..a133ae4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
@@ -14,10 +14,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ListResourceBundle;
-import java.util.Set;
+import java.util.*;
/**
* <p>
@@ -77,6 +74,7 @@
InventoriesSuppliesInfo inventoriesSuppliesInf=new InventoriesSuppliesInfo();
inventoriesSuppliesInf.setSuppliesId(m.getSuppliesId());
inventoriesSuppliesInf.setRkId(m.getRkId());
+ inventoriesSuppliesInf.setCreateTime(new Date());
SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m.getRkId());
inventoriesSuppliesInf.setZkNum(slVolumeProductionRk.getRepertoryZhai());
inventoriesSuppliesInf.setSuppliesNum(m.getSuppliesNum());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
index 29911c5..84d4bc4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
@@ -114,6 +114,7 @@
InventoriesSupplies inventoriesSupplies=new InventoriesSupplies();
inventoriesSupplies.setMaterialsId(inventoriesSuppDTO.getMaterialsId());
inventoriesSupplies.setPdTime(new Date());
+ inventoriesSupplies.setCreateTime(new Date());
inventoriesSupplies.setPdrId(inventoriesSuppDTO.getPdrId());
R<SysUser> sysUser = sysUserClient.getSysUser(inventoriesSuppDTO.getPdrId());
inventoriesSupplies.setPdrName(sysUser.getData().getNickName());
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 6a31892..3dbba56 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,6 +1,7 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
@@ -57,12 +58,15 @@
@Override
public void updSlAuditRecord(AuditRecordDTO auditRecordDTO) {
SlAudit slAudit = slAuditMapper.selectById(auditRecordDTO.getAuditId());
- SlAuditRecord byId = this.getById(auditRecordDTO.getId());
+ SlAuditRecord byId = this.getOne(new QueryWrapper<SlAuditRecord>()
+ .eq("type", auditRecordDTO.getType())
+ .eq("audit_id", auditRecordDTO.getAuditId()));
+ Long userid = SecurityUtils.getUserId();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
if (auditRecordDTO.getState()==2){
- Long userid = SecurityUtils.getUserId();
- SysUser data = sysUserClient.getSysUser(userid).getData();
byId.setShenhName(data.getNickName());
byId.setShenhTime(new Date());
+ byId.setState(auditRecordDTO.getState());
this.updateById(byId);
if (slAudit.getState()==1){
slAudit.setState(2);
@@ -92,12 +96,12 @@
slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
}
- } if (slAudit.getState()==2){
+ } else 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);
+ wrapper.eq(SlAuditRecord::getDelFlag,0);
SlAuditRecord one = this.getOne(wrapper);
slAudit.setShenhId(one.getShenhId());
slAuditMapper.updateById(slAudit);
@@ -120,7 +124,7 @@
slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl);
}
- }if (slAudit.getState()==3){
+ }else if (slAudit.getState()==3){
slAudit.setState(4);
slAuditMapper.updateById(slAudit);
if (slAudit.getType()==1){
@@ -147,12 +151,20 @@
}
- }
- if (auditRecordDTO.getState()==3){
+ }else if (auditRecordDTO.getState()==3){
+ byId.setShenhName(data.getNickName());
+ byId.setShenhTime(new Date());
+ byId.setState(auditRecordDTO.getState());
+ this.updateById(byId);
+ 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());
slAudit.setCause(auditRecordDTO.getCause());
slAudit.setState(5);
slAuditMapper.updateById(slAudit);
-
if (slAudit.getType()==1){
SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAudit.getRkId());
slVolumeProductionRkgl.setAuditStatus(5);
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 4e872f8..1ddad21 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
@@ -133,6 +133,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -140,6 +141,7 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
+ slAuditRecord1.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
@@ -147,6 +149,7 @@
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
+ slAuditRecord2.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==2){
@@ -162,6 +165,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -169,6 +173,7 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
+ slAuditRecord1.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
@@ -176,6 +181,7 @@
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
+ slAuditRecord2.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==3){
@@ -191,6 +197,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -198,6 +205,7 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
+ slAuditRecord1.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
@@ -205,6 +213,7 @@
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
+ slAuditRecord2.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord2);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index 69c1e1a..9fbdf4c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -124,24 +124,21 @@
List<Long> arr=new ArrayList<>();
wrapper.eq(SlStoreManagement::getDelFlag,0);
- wrapper.like(SlStoreManagement::getAdministratorId,seBei.getUserId());
+ wrapper.eq(SlStoreManagement::getAdministratorId,seBei.getUserId());
List<SlStoreManagement> page = slStoreManagementMapper.selectList(wrapper);
for (SlStoreManagement a:page){
arr.add(a.getId());
}
-
LambdaQueryWrapper< SlStoreManagement> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlStoreManagement::getDelFlag,0);
- wrapper1.like(SlStoreManagement::getCompetentId,seBei.getUserId());
+ wrapper1.eq(SlStoreManagement::getCompetentId,seBei.getUserId());
List<SlStoreManagement> page1 = slStoreManagementMapper.selectList(wrapper1);
-
for (SlStoreManagement a1:page1){
arr.add(a1.getId());
}
-
LambdaQueryWrapper< SlStoreManagement> wrapper2= Wrappers.lambdaQuery();
wrapper2.eq(SlStoreManagement::getDelFlag,0);
- wrapper2.like(SlStoreManagement::getDirectorId,seBei.getUserId());
+ wrapper2.eq(SlStoreManagement::getDirectorId,seBei.getUserId());
List<SlStoreManagement> page2 = slStoreManagementMapper.selectList(wrapper2);
for (SlStoreManagement a2:page2){
arr.add(a2.getId());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index 8777369..acce94f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
@@ -121,17 +121,18 @@
SlGoodsMaterialsList = list1.stream().map(SlGoodsMaterials::getId)
.collect(Collectors.toSet());
-
Page<ManagementGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- if (!slVolumeProductionIdList.isEmpty()){
- wrapper.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
- }
+// if (!slVolumeProductionIdList.isEmpty()){
+// wrapper.in(ManagementGoodsMaterials::getId,slVolumeProductionIdList);
+// }
+
if (!SlGoodsMaterialsList.isEmpty()){
wrapper.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
}
wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper.eq(ManagementGoodsMaterials::getManagementId,storeManagementGoodSmaterialsQuery.getStoreManagementId());
wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
Page<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.page(page, wrapper);
PageDTO<StoreManagementGoodSmaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, StoreManagementGoodSmaterialsVO.class);
@@ -143,24 +144,19 @@
li.setIsConsume(byId.getIsConsume());
li.setAveragePrice(storeManagementGoodSmaterialsOne);
}
-
-
return storeManagementGoodSmaterialsVOPageDTO;
}
@Override
public StoreManagementGoodSmaterialsVO getSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
-
-
wrapper.eq(ManagementGoodsMaterials::getGoodsMaterialsId,storeManagementGoodSmaterialsQuery.getGoodsMaterialsId());
-
wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
ManagementGoodsMaterials page1 = managementGoodsMaterialsService.getOne(wrapper);
StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO = BeanUtils.copyBean(page1, StoreManagementGoodSmaterialsVO.class);
- Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
- SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
+ Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
+ SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());
storeManagementGoodSmaterialsVO.setAveragePrice(storeManagementGoodSmaterialsOne);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index 7c45a7e..68239e3 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -70,7 +70,7 @@
if (StringUtils.hasLength(slGoodsShelfQuery.getGoodsShelfName())){
wrapper1.like(SlGoodsShelf::getGoodsShelfName,slGoodsShelfQuery.getGoodsShelfName());
}
- if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
+ if (slGoodsShelfQuery.getStoreManagementNumber()!=null && slGoodsShelfQuery.getStoreManagementNumber()!=0){
wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
}
if(slGoodsShelfQuery.getStoreManagementName()!=null&&slGoodsShelfQuery.getStoreManagementName()!="") {
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
index e44695a..8cd8cc4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -1,14 +1,13 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.management.domain.*;
-import com.ruoyi.management.domain.dto.AddSlVolumeProductionCkDTO;
-import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionCkQuery;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
+import com.ruoyi.management.domain.dto.*;
+import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
@@ -16,15 +15,20 @@
import com.ruoyi.management.mapper.SlGoodsShelfMapper;
import com.ruoyi.management.mapper.SlVolumeProductionCkMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
+import com.ruoyi.management.service.ManagementGoodsMaterialsService;
import com.ruoyi.management.service.SlVolumeProductionCkService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.management.service.SlVolumeProductionRkService;
import com.ruoyi.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,6 +49,8 @@
@Resource
private SlGoodsShelfMapper slGoodsShelfMapper;
+ @Autowired
+ private ManagementGoodsMaterialsService managementGoodsMaterialsService;
@Override
public PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
@@ -146,4 +152,56 @@
}
return SlGoodsShelfDTO;
}
+
+ @Autowired
+ private SlVolumeProductionRkService slVolumeProductionRkService;
+ @Override
+ public PageDTO<InventoriesSuppliesInfoVO> getMaterialByManagementIdList(GetMaterialsByManagementIdQuery query) {
+ List<InventoriesSuppliesInfoVO> res = new ArrayList<>();
+
+ Page<SlVolumeProductionRk> page = new Page<>(query.getPageCurr(), query.getPageSize());
+ QueryWrapper<ManagementGoodsMaterials> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("del_flag","0");
+ wrapper1.eq("management_id",query.getManagementId());
+ // 获取对应仓库下所有入库的物资ids
+ List<Long> collect = managementGoodsMaterialsService.list(wrapper1).stream().map(ManagementGoodsMaterials::getGoodsMaterialsId).collect(Collectors.toList());
+ QueryWrapper<SlGoodsMaterials> wrapper2 = new QueryWrapper<>();
+ if (StringUtils.hasLength(query.getMaterialsName())){
+ wrapper2.like("goods_materials_name",query.getMaterialsName());
+ }
+ if (query.getIsConsume()!=null){
+ wrapper2.eq("is_consume",query.getIsConsume());
+ }
+ wrapper2.eq("del_flag","0");
+ wrapper2.in("id",collect);
+ List<Long> collect1 = slGoodsMaterialsMapper.selectList(wrapper2).stream().map(SlGoodsMaterials::getId).collect(Collectors.toList());
+ QueryWrapper<SlVolumeProductionRk> wrapper = new QueryWrapper<>();
+ wrapper.in("materials_id",collect1);
+ wrapper.eq("del_flag","0");
+
+ Page<SlVolumeProductionRk> page2 = slVolumeProductionRkService.page(page, wrapper);
+ List<SlVolumeProductionRk> list = page2.getRecords();
+
+ PageDTO<InventoriesSuppliesInfoVO> slGoodsMaterialsVO = PageDTO.of(page2, InventoriesSuppliesInfoVO.class);
+ for (SlVolumeProductionRk slVolumeProductionRk : list) {
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
+ if (slGoodsMaterials == null || slGoodsShelf == null){
+ continue;
+ }
+ InventoriesSuppliesInfoVO inventoriesSuppliesInfoVO = new InventoriesSuppliesInfoVO();
+ inventoriesSuppliesInfoVO.setId(slVolumeProductionRk.getId());
+ inventoriesSuppliesInfoVO.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ inventoriesSuppliesInfoVO.setIsConsume(slGoodsMaterials.getIsConsume());
+ inventoriesSuppliesInfoVO.setRkNumber(slVolumeProductionRk.getRkNumber());
+ inventoriesSuppliesInfoVO.setRkModel(slVolumeProductionRk.getRkModel());
+ inventoriesSuppliesInfoVO.setRkId(slVolumeProductionRk.getId());
+ inventoriesSuppliesInfoVO.setZkNum(slVolumeProductionRk.getRepertoryZhai());
+ inventoriesSuppliesInfoVO.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ inventoriesSuppliesInfoVO.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
+ res.add(inventoriesSuppliesInfoVO);
+ }
+ slGoodsMaterialsVO.setList(res);
+ return slGoodsMaterialsVO;
+ }
}
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 e9480d5..2894d97 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
@@ -6,10 +6,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.*;
-import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
-import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
-import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
-import com.ruoyi.management.domain.vo.gethuojRkVO;
+import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlStoreManagementService;
import com.ruoyi.management.service.SlVolumeProductionRkService;
@@ -21,10 +18,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.sql.Array;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -41,6 +37,8 @@
private SlGoodsMaterialsMapper slGoodsMaterialsMapper;
@Resource
private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper;
+ @Resource
+ private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
@Resource
private SlGoodsShelfMapper slGoodsShelfMapper;
@@ -105,14 +103,22 @@
for(ManagementimgVolumeProductionRkVO list:list2) {{
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+ if (slGoodsMaterials!=null){
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ }
SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ if (byId!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ list.setSupplierName(data.getNickName());
+ }
- list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- list.setIsConsume(slGoodsMaterials.getIsConsume());
- list.setSupplierName(data.getNickName());
+
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
- list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ if (slGoodsShelf!=null){
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+
+ }
}
}
return SlGoodsShelfDTO;
@@ -120,13 +126,13 @@
@Override
public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) {
-
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){
SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId());
slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
slVolumeProductionRk.setManagementId(m.getManagementId());
- slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ slVolumeProductionRk.setRkNumber("CD-"+simpleDateFormat.format(new Date()));
slVolumeProductionRk.setNewAddTime(m.getNewAddTime());
if ( m.getErwmNum()!=null){
slVolumeProductionRk.setErwmNum( m.getErwmNum());
@@ -143,7 +149,8 @@
}if ( m.getRkNumber()!=null){
slVolumeProductionRk.setRkNumber( m.getRkNumber());
}
-
+ slVolumeProductionRk.setCreateTime(new Date());
+ slVolumeProductionRk.setRepertoryZhai(m.getRkNum());
this.save(slVolumeProductionRk);
}
@@ -193,22 +200,55 @@
}
@Override
- public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
- SlVolumeProductionRk byId = this.getById(id);
- ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
- SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
- vo.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- vo.setIsConsume(slGoodsMaterials.getIsConsume());
- SlVolumeProductionRkgl byId1 = slVolumeProductionRkglMapper.selectById(byId.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId1.getSupplierId()).getData();
- vo.setSupplierName(data.getNickName());
- SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
- vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
- vo.setRkNum(byId.getRkNum());
- vo.setRkNumber(byId.getRkNumber());
- return vo;
+ public List<QRCodeVO> codeInfo(Long id) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ List<QRCodeVO> res = new ArrayList<>();
+ LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(SlVolumeProductionRk::getVolumeProductionRkglId,id);
+ wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+ List<SlVolumeProductionRk> list = this.list(wrapper1);
+ for (SlVolumeProductionRk byId : list) {
+ // 根据生成二维码数量 复制
+ for (int i = 0; i < byId.getErwmNum(); i++) {
+ QRCodeVO vo=new QRCodeVO();
+ String letter = getLetter(i);
+ vo.setCategory(letter);
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
+ vo.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ SlVolumeProductionRkgl byId1 = slVolumeProductionRkglMapper.selectById(byId.getVolumeProductionRkglId());
+ SysUser data = sysUserClient.getSysUser(byId1.getSupplierId()).getData();
+ vo.setSupplierName(data.getNickName());
+ vo.setMaterialsNum(byId.getRkNum());
+ Long materialsId = byId.getMaterialsId();
+ // 查询物资缩写
+ vo.setMaterials(byId.getRkNumber());
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
+ vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ res.add(vo);
+ }
+
+ }
+
+
+ return res;
}
+ // 根据传入数字是几 返回对应的字母
+ public static String getLetter(int num) {
+ String[] str = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
+ // 如果num大于26 那么往后叠加对应的字母
+ if (num > 26) {
+ int a = num / 26;
+ int b = num % 26;
+ if (b == 0) {
+ a = a - 1;
+ b = 26;
+ }
+ return getLetter(a) + getLetter(b);
+ }
+ return str[num - 1];
+ }
@Override
public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
@@ -292,7 +332,6 @@
List<gethuojRkVO> list2 = SlGoodsShelfDTO.getList();
for(gethuojRkVO list:list2) {
-
LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId());
wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
@@ -300,19 +339,29 @@
ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
if (managementGoodsMaterials != null){
list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(managementGoodsMaterials.getRepertorySum())));
+ list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
}else{
list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(1)));
+ list.setRepertorySum(0L);
}
- list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
+
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ if (byId!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ list.setSupplierName(data.getNickName());
+ }
- list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- list.setIsConsume(slGoodsMaterials.getIsConsume());
- list.setSupplierName(data.getNickName());
+ if (slGoodsMaterials!=null){
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ }
+
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
- list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ if (slGoodsShelf!=null){
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+
+ }
}
return SlGoodsShelfDTO;
}
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 b16390c..b8448b4 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
@@ -95,6 +95,7 @@
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
v.setSysName(data1.getNickName());
v.setSysPhone(data1.getPhonenumber());
+ v.setAuthorization(byId.getAuthorizationUrl());
return v;
}
@@ -282,7 +283,8 @@
managementGoodsMaterials1.setGoodsMaterialsId(list.getMaterialsId());
managementGoodsMaterials1.setRepertoryZhai(list.getRkNum());
managementGoodsMaterials1.setRepertorySum(list.getRkNum());
- managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
+ managementGoodsMaterials1.setCreateTime(new Date());
+ managementGoodsMaterials1.setRepertory(slGoodsMaterials.getRepertory());
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java
index f3f4fa9..2c87721 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -9,14 +10,17 @@
import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
+import com.ruoyi.management.service.SlStoreManagementService;
import com.ruoyi.management.service.SlVolumeProductionZyService;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -41,6 +45,8 @@
private SlVolumeProductionZyglMapper slVolumeProductionZyglMapper;
@Resource
private SlGoodsShelfMapper slGoodsShelfMapper;
+ @Autowired
+ private SlStoreManagementService service;
@Override
public PageDTO<getVolumeProductionzyCodeVO> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) {
@@ -107,9 +113,7 @@
@Override
public PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList(ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {
-
SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(managementimgVolumeProductionZyQuery.getVolumeProductionzyglId());
-
LambdaQueryWrapper<SlVolumeProductionRk> wrapper2= Wrappers.lambdaQuery();
wrapper2.eq(SlVolumeProductionRk::getManagementId,slVolumeProductionZygl.getBmanagementId());
wrapper2.eq(SlVolumeProductionRk::getStoreManagementNumber,managementimgVolumeProductionZyQuery.getStoreManagementNumber());
@@ -152,4 +156,32 @@
}
return SlGoodsShelfDTO;
}
+
+ @Override
+ public NumberAndShelfVO getNumberAndShelfByManagementId(QueryDTO dto) {
+ NumberAndShelfVO numberAndShelfVO = new NumberAndShelfVO();
+ SlStoreManagement byId = service.getById(dto.getManagementId());
+ List<String> number = new ArrayList<>();
+ for (Integer i = 1; i <= byId.getStoreManagementNumber(); i++) {
+ switch (i){
+ case 1:
+ number.add("一层");
+ break;
+ case 2:
+ number.add("二层");
+ break;
+ case 3:
+ number.add("三层");
+ break;
+ }
+ }
+ numberAndShelfVO.setNumber(number);
+ QueryWrapper<SlGoodsShelf> eq = new QueryWrapper<SlGoodsShelf>()
+ .eq("del_flag", "0")
+ .eq("store_management_id", dto.getManagementId())
+ .eq("store_management_number",dto.getManagementNumber());
+ List<SlGoodsShelf> slGoodsShelves = slGoodsShelfMapper.selectList(eq);
+ numberAndShelfVO.setGoodsShelfList(slGoodsShelves);
+ return numberAndShelfVO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
index 9e7a0c7..b27f77c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -226,6 +226,7 @@
slVolumeProductionRk.setRkNum(Long.valueOf(zy.getZyNum()));
slVolumeProductionRk.setShelfId(slVolumeProductionRk1.getShelfId());
slVolumeProductionRk.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
+ slVolumeProductionRk.setCreateTime(new Date());
slVolumeProductionRkMapper.insert(slVolumeProductionRk);
zy.setScrkId(slVolumeProductionRk.getId());
@@ -248,6 +249,7 @@
managementGoodsMaterials1.setGoodsMaterialsId(slVolumeProductionRk1.getMaterialsId());
managementGoodsMaterials1.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
managementGoodsMaterials1.setRepertorySum(Long.valueOf(zy.getZyNum()));
+ managementGoodsMaterials1.setCreateTime(new Date());
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index f1e3850..7913af9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -160,7 +160,7 @@
ajax.put("roleId", sysUser.getRoleId());
ajax.put("roleName", sysUser.getRoleName());
}
- return AjaxResult.success(ajax);
+ return ajax;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 029a6e1..cc37449 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -137,4 +137,6 @@
List<Long> getSysUserFromPhone(@Param("phoneNumber") String phoneNumber);
void deleteSysUser(@Param("userIds") ArrayList<Integer> userIds);
+
+ void updateHandle(@Param("req") SysUser user);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 71d303e..aa3e777 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -682,7 +683,10 @@
@Override
public List<SysUser> getConservatorPage1() {
- List<SysUser> page1 = this.list();
+ QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+ sysUserQueryWrapper.eq("del_flag",0);
+ sysUserQueryWrapper.eq("user_type","03");
+ List<SysUser> page1 = this.list(sysUserQueryWrapper);
return page1;
}
@@ -693,12 +697,10 @@
// 添加
if (StringUtils.isNull(dto.getUserId())) {
-
boolean b = checkPhoneUnique(user);
if (!b) {
throw new ServiceException("该手机号已存在");
}
-
user.setNickName(dto.getNickName());
user.setUserName(dto.getPhonenumber());
user.setUserType("03");
@@ -727,10 +729,20 @@
user.setUpdateTime(new Date());
user.setUpdateBy(SecurityUtils.getUsername());
user.setRoleType(dto.getRoleType());
- this.updateById(user);
+ user.setProvinceCode(dto.getProvinceCode());
+ user.setCityCode(dto.getCityCode());
+ user.setCountyCode(dto.getCountyCode());
+ user.setTownCode(dto.getTownCode());
+ user.setProvinceName(dto.getProvinceName());
+ user.setCityName(dto.getCityName());
+ user.setCountyName(dto.getCountyName());
+ user.setTownName(dto.getTownName());
+ userMapper.updateHandle(user);
}
}
+
+
@Override
public void deleteConservator(Long id) {
this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9db6064..4bccefb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -272,8 +272,28 @@
<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
-
- <delete id="deleteUserById" parameterType="Long">
+
+ <update id="updateHandle">
+ update sys_user
+ <set>
+ dept_id = #{req.deptId},
+ user_name = #{req.userName},
+ nick_name = #{req.nickName},
+ phonenumber = #{req.phonenumber},
+ roleType = #{req.roleType},
+ province_name = #{req.provinceName},
+ province_code = #{req.provinceCode},
+ city_name = #{req.cityName},
+ city_code = #{req.cityCode},
+ county_name = #{req.countyName},
+ county_code = #{req.countyCode},
+ town_name = #{req.townName},
+ town_code = #{req.townCode},
+ </set>
+ where user_id = #{req.userId}
+ </update>
+
+ <delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
</delete>
--
Gitblit v1.7.1