From b0c345d2a74f47e5c34617051bcd61becde11b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 15 八月 2025 14:09:59 +0800
Subject: [PATCH] 业务流程修改
---
src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java | 67 ++++++
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 4
src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java | 5
src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java | 3
src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml | 23 ++
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java | 1
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java | 66 +-----
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 26 ++
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 49 ++++
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 9
src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java | 16 +
src/main/java/com/ruoyi/warehouse/pojo/Documentation.java | 15
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 87 ++++++++
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml | 13 +
src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java | 7
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 27 +-
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java | 11
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 68 ++++--
src/main/java/com/ruoyi/warehouse/mapper/DocumentationBorrowManagementMapper.java | 4
src/main/java/com/ruoyi/warehouse/mapper/DocumentClassificationMapper.java | 20 ++
src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java | 40 ++++
21 files changed, 443 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
new file mode 100644
index 0000000..9c59b56
--- /dev/null
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -0,0 +1,49 @@
+package com.ruoyi.warehouse.controller;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.pojo.DocumentClassification;
+import com.ruoyi.warehouse.service.DocumentClassificationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@Api(tags = "鏂囨。鍒嗙被")
+@RequestMapping("/warehouse/documentClassification")
+public class DocumentClassificationController extends BaseController {
+ @Autowired
+ private DocumentClassificationService documentClassificationService;
+ @GetMapping("/getList")
+ @ApiOperation("鏂囨。鍒嗙被-鏌ヨ")
+ @Log(title = "鏂囨。鍒嗙被-鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult getList() {
+ return AjaxResult.success(documentClassificationService.list());
+ }
+ @PostMapping("/add")
+ @ApiOperation("鏂囨。鍒嗙被-娣诲姞")
+ @Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
+ return AjaxResult.success(documentClassificationService.save(documentClassification));
+ }
+ @PostMapping("/update")
+ @ApiOperation("鏂囨。鍒嗙被-鏇存柊")
+ @Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
+ public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
+ return AjaxResult.success(documentClassificationService.updateById(documentClassification));
+ }
+ @DeleteMapping("/delete")
+ @ApiOperation("鏂囨。鍒嗙被鍒犻櫎")
+ @Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentClassificationService.deleteByIds(ids));
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 652794f..24d20dd 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -1,12 +1,15 @@
package com.ruoyi.warehouse.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
@@ -26,6 +29,8 @@
public class DocumentationBorrowManagementController extends BaseController {
@Autowired
private DocumentationBorrowManagementService documentationBorrowManagementService;
+ @Autowired
+ private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
@GetMapping("/listPage")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -37,27 +42,29 @@
@ApiOperation("鏂囨。鍊熼槄绠＄悊-娣诲姞")
@Log(title = "鏂囨。鍊熼槄绠＄悊-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.save(documentationBorrowManagement);
- return AjaxResult.success();
+ return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
}
@PostMapping("/update")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.updateById(documentationBorrowManagement);
- return AjaxResult.success();
+// documentationBorrowManagementService.updateById(documentationBorrowManagement);
+ return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
@PostMapping("/delete")
@ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- documentationBorrowManagementService.removeByIds(ids);
- return AjaxResult.success();
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
- @Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response) {
- documentationBorrowManagementService.export(response);
+ @ApiOperation("鏂囨。鍊熼槄绠＄悊-瀵煎嚭")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-瀵煎嚭", businessType = BusinessType.EXPORT)
+ public void export(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
+ String borrowStatus = documentationBorrowManagement.getBorrowStatus();
+ List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, borrowStatus));
+ ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
+ util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 64ad5c6..0ab68c6 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -28,10 +28,10 @@
@Autowired
private WarehouseService warehouseService;
- @GetMapping("/listPage")
+ @GetMapping("/list")
@ApiOperation("浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage( Warehouse warehouse) {
+ public AjaxResult list(@RequestBody Warehouse warehouse) {
return AjaxResult.success(warehouseService.listPage( warehouse));
}
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/DocumentClassificationMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/DocumentClassificationMapper.java
new file mode 100644
index 0000000..93b121f
--- /dev/null
+++ b/src/main/java/com/ruoyi/warehouse/mapper/DocumentClassificationMapper.java
@@ -0,0 +1,20 @@
+package com.ruoyi.warehouse.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.warehouse.pojo.DocumentClassification;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author 86151
+* @description 閽堝琛ㄣ�恉ocument_classification(鏂囨。鍒嗙被琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2025-08-15 10:44:23
+* @Entity com.ruoyi.warehouse.pojo.DocumentClassification
+*/
+@Mapper
+public interface DocumentClassificationMapper extends BaseMapper<DocumentClassification> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationBorrowManagementMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationBorrowManagementMapper.java
index c724342..0966664 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationBorrowManagementMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationBorrowManagementMapper.java
@@ -1,8 +1,11 @@
package com.ruoyi.warehouse.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* @author 86151
@@ -13,6 +16,7 @@
@Mapper
public interface DocumentationBorrowManagementMapper extends BaseMapper<DocumentationBorrowManagement> {
+ IPage<DocumentationBorrowManagement> listPage(Page page,@Param("documentationBorrowManagement") DocumentationBorrowManagement documentationBorrowManagement);
}
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
index 9ed16cb..9573cf1 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseGoodsShelvesMapper.java
@@ -7,6 +7,9 @@
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
/**
*
* @description 閽堝琛ㄣ�恮arehouse_goods_shelves(浠撳簱璐ф灦琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -16,6 +19,8 @@
@Mapper
public interface WarehouseGoodsShelvesMapper extends BaseMapper<WarehouseGoodsShelves> {
IPage<WarehouseGoodsShelves> listPage(Page page,@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
+
+ List<WarehouseGoodsShelves> list(@Param("warehouseGoodsShelves") WarehouseGoodsShelves warehouseGoodsShelves);
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
new file mode 100644
index 0000000..af19d4b
--- /dev/null
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
@@ -0,0 +1,67 @@
+package com.ruoyi.warehouse.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 鏂囨。鍒嗙被琛�
+ * @TableName document_classification
+ */
+@TableName(value ="document_classification")
+@Data
+@ApiModel(value = "鏂囨。鍒嗙被琛�")
+public class DocumentClassification implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 绫诲埆鍚嶇О
+ */
+ private String category;
+
+ /**
+ * 鐖剁被id
+ */
+ private Long parentId;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ /**
+ * 鍒涘缓鐢ㄦ埛
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ /**
+ * 淇敼鐢ㄦ埛
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+
+ /**
+ * 绉熸埛id
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index 8c50afa..c0e5f26 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -28,11 +28,11 @@
private Long id;
/**
- * 绫诲埆鍚嶇О
+ * 绫诲埆鍚嶇Оid
*/
- @Excel(name = "绫诲埆鍚嶇О")
- @ApiModelProperty(value = "绫诲埆鍚嶇О")
- private String categoryName;
+ @Excel(name = "绫诲埆鍚嶇Оid")
+ @ApiModelProperty(value = "绫诲埆鍚嶇Оid")
+ private Long documentClassificationId;
/**
* 鏂囨。鍚嶇О
@@ -72,7 +72,8 @@
/**
* 鏂囨。鏃ユ湡
*/
- @Excel(name = "鏂囨。鏃ユ湡")
+
+ @Excel(name = "鏂囨。鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@ApiModelProperty(value = "鏂囨。鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime docDate;
@@ -155,13 +156,13 @@
/**
* 淇敼鏃堕棿
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 1dfa7bd..e7878b0 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -6,7 +6,10 @@
import java.time.LocalDateTime;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -26,41 +29,60 @@
/**
* 鏂囨。id
*/
+ @Excel(name = "鏂囨。id")
private Long documentationId;
/**
* 鍊熼槄浜篿d
*/
+ @Excel(name = "鍊熼槄浜篿d")
+ @ApiModelProperty(value = "鍊熼槄浜篿d")
private Long borrowerId;
/**
* 鍊熼槄鐩殑
*/
+ @Excel(name = "鍊熼槄鐩殑")
+ @ApiModelProperty(value = "鍊熼槄鐩殑")
private String borrowPurpose;
/**
* 鍊熼槄鏃ユ湡
*/
+
+ @ApiModelProperty(value = "鍊熼槄鏃ユ湡")
+ @Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
+ @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+ @Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime dueReturnDate;
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
+ @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+ @Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime returnDate;
/**
* 鍊熼槄鐘舵��
*/
+ @ApiModelProperty(value = "鍊熼槄鐘舵��")
+ @Excel(name = "鍊熼槄鐘舵��")
private String borrowStatus;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
+ @Excel(name = "澶囨敞")
private String remark;
/**
@@ -78,13 +100,13 @@
/**
* 淇敼鏃堕棿
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
/**
diff --git a/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java b/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java
new file mode 100644
index 0000000..dd38d3f
--- /dev/null
+++ b/src/main/java/com/ruoyi/warehouse/service/DocumentClassificationService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.warehouse.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.warehouse.pojo.DocumentClassification;
+
+import java.util.List;
+
+/**
+* @author 86151
+* @description 閽堝琛ㄣ�恉ocument_classification(鏂囨。鍒嗙被琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2025-08-15 10:44:23
+*/
+public interface DocumentClassificationService extends IService<DocumentClassification> {
+
+ boolean deleteByIds(List<Long> ids);
+}
diff --git a/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java b/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java
index e87fd87..a772234 100644
--- a/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/DocumentationBorrowManagementService.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* @author 86151
@@ -16,5 +17,9 @@
IPage<DocumentationBorrowManagement> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement);
- void export(HttpServletResponse response);
+
+ boolean add(DocumentationBorrowManagement documentationBorrowManagement);
+
+ boolean deleteByIds(List<Long> ids);
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
index c80a59d..0b209a3 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseGoodsShelvesService.java
@@ -22,4 +22,7 @@
boolean updateRowcolById(WarehouseGoodsShelves warehouseGoodsShelves);
boolean deleteByIds(List<Long> ids);
+
+ List<WarehouseGoodsShelves> list(WarehouseGoodsShelves warehouseGoodsShelves);
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
new file mode 100644
index 0000000..63e4640
--- /dev/null
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentClassificationServiceImpl.java
@@ -0,0 +1,40 @@
+package com.ruoyi.warehouse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.warehouse.mapper.DocumentationMapper;
+import com.ruoyi.warehouse.pojo.DocumentClassification;
+import com.ruoyi.warehouse.pojo.Documentation;
+import com.ruoyi.warehouse.service.DocumentClassificationService;
+import com.ruoyi.warehouse.mapper.DocumentClassificationMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author 86151
+* @description 閽堝琛ㄣ�恉ocument_classification(鏂囨。鍒嗙被琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2025-08-15 10:44:23
+*/
+@Service
+public class DocumentClassificationServiceImpl extends ServiceImpl<DocumentClassificationMapper, DocumentClassification>
+ implements DocumentClassificationService{
+ @Autowired
+ private DocumentationMapper documentationMapper;
+
+ @Override
+ public boolean deleteByIds(List<Long> ids) {
+ List<Documentation> documentations = documentationMapper.selectList(new LambdaQueryWrapper<Documentation>().in(Documentation::getDocumentClassificationId, ids));
+ if(!CollectionUtils.isEmpty(documentations)){
+ return false;
+ }
+ baseMapper.deleteBatchIds(ids);
+ return true;
+ }
+}
+
+
+
+
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 2f793a1..176060c 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -1,18 +1,24 @@
package com.ruoyi.warehouse.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
+import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
+import com.ruoyi.warehouse.service.DocumentationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author 86151
@@ -20,22 +26,91 @@
* @createDate 2025-08-14 15:55:45
*/
@Service
+@Transactional(rollbackFor = Exception.class)
public class DocumentationBorrowManagementServiceImpl extends ServiceImpl<DocumentationBorrowManagementMapper, DocumentationBorrowManagement>
implements DocumentationBorrowManagementService{
@Autowired
private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+ @Autowired
+ private DocumentationService documentationService;
@Override
public IPage<DocumentationBorrowManagement> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
-
- return null;
+ IPage<DocumentationBorrowManagement> listPage = documentationBorrowManagementMapper.listPage(page, documentationBorrowManagement);
+ return listPage;
}
+
@Override
- public void export(HttpServletResponse response) {
-// List<DocumentationBorrowManagement> list =documentationBorrowManagementMapper.list();
-// ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
-// util.exportExcel(response, list, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+ public boolean add(DocumentationBorrowManagement documentationBorrowManagement) {
+ Long documentationId = documentationBorrowManagement.getDocumentationId();
+ String borrowStatus = documentationBorrowManagement.getBorrowStatus();
+ Documentation documentation = documentationService.getById(documentationId);
+ if (documentation==null){
+ System.out.println("鏂囨。涓嶅瓨鍦�");
+ return false;
+ }
+ if ("鍊熷嚭".equals(documentation.getDocStatus())){
+ if ("褰掕繕".equals(borrowStatus)){
+ documentation.setDocStatus("姝ｅ父");
+ documentationService.updateById(documentation);
+ documentationBorrowManagementMapper.insert(documentationBorrowManagement);
+ return true;
+ }else{
+ System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳介噸澶嶅�熷嚭");
+ return false;
+ }
+ }else if("姝ｅ父".equals(documentation.getDocStatus())){
+ if ("褰掕繕".equals(borrowStatus)){
+ System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘閲嶅褰掕繕");
+ return false;
+ }else if("鍊熷嚭".equals(borrowStatus)){
+ documentation.setDocStatus("鍊熷嚭");
+ documentationService.updateById(documentation);
+ documentationBorrowManagementMapper.insert(documentationBorrowManagement);
+ return true;
+ }
+ }else{
+ System.out.println("鏂囨。鐘舵�佸紓甯�");
+ return false;
+ }
+ return false;
}
+// @Override
+// public boolean updateDBMById(DocumentationBorrowManagement documentationBorrowManagement) {
+// Long id = documentationBorrowManagement.getId();
+//// Long documentationId = documentationBorrowManagement.getDocumentationId();
+// //鏌ヨ鏂囨。鏄惁宸插綊杩�
+// DocumentationBorrowManagement dbm = documentationBorrowManagementMapper.selectById(id);
+//// Long documentationId = dbm.getDocumentationId();
+// if ("褰掕繕".equals(dbm.getBorrowStatus())){
+// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
+// return false;
+// }
+// //鏌ヨ鏂囨。
+// Documentation documentation = documentationService.getById(dbm.getDocumentationId());
+// String docStatus = documentation.getDocStatus();
+// if ("姝ｅ父".equals(docStatus)){
+// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
+// return false;
+// }
+// return false;
+// }
+
+ @Override
+ public boolean deleteByIds(List<Long> ids) {
+ List<DocumentationBorrowManagement> list = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().in(DocumentationBorrowManagement::getId, ids));
+ for (DocumentationBorrowManagement documentationBorrowManagement : list) {
+ String borrowStatus = documentationBorrowManagement.getBorrowStatus();
+ if ("鍊熼槄".equals(borrowStatus)){
+ System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳藉垹闄�");
+ return false;
+ }
+ }
+ documentationBorrowManagementMapper.deleteBatchIds(ids);
+ return true;
+ }
+
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
index c564012..8969218 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesRowcolServiceImpl.java
@@ -45,15 +45,8 @@
Wrapper<Documentation> queryWrapper = new LambdaQueryWrapper<Documentation>()
.in(Documentation::getWarehouseGoodsShelvesRowcolId, ids);
List<Documentation> documentations = documentationMapper.selectList(queryWrapper);
- if (!documentations.isEmpty()) {
- log.error("璐ф灦[ID:{}]涓婂瓨鍦ㄥ晢鍝侊紝绂佹鍒犻櫎", ids);
- return false;
- }
- int i = warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
- if(i!=ids.size()){
- log.error("鍒犻櫎澶辫触");
- return false;
- }
+ if (!documentations.isEmpty()) return false;
+ warehouseGoodsShelvesRowcolMapper.deleteBatchIds(ids);
return true;
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
index 314be51..21d76d4 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -36,6 +36,7 @@
*/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class)
public class WarehouseGoodsShelvesServiceImpl extends ServiceImpl<WarehouseGoodsShelvesMapper, WarehouseGoodsShelves>
implements WarehouseGoodsShelvesService {
@Autowired
@@ -54,17 +55,12 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean add(WarehouseGoodsShelves warehouseGoodsShelves) {
WarehouseGoodsShelves one = warehouseGoodsShelvesMapper.selectOne(new LambdaQueryWrapper<WarehouseGoodsShelves>().eq(WarehouseGoodsShelves::getId, warehouseGoodsShelves.getId()));
// 1. 妫�鏌ヨ揣鏋跺悕绉版槸鍚﹀凡瀛樺湪
if (one == null) {
- log.error("璐ф灦ID涓嶅瓨鍦�");
int insert = warehouseGoodsShelvesMapper.insert(warehouseGoodsShelves);
- if (insert <= 0) {
- log.error("璐ф灦涓昏褰曟坊鍔犲け璐�");
- return false;
- }
+ if (insert <= 0) return false;
}
Long shelvesId = warehouseGoodsShelves.getId();
@@ -86,16 +82,10 @@
// 浣跨敤鎵归噺鎻掑叆鏂规硶鏇夸唬寰幆鍗曟潯鎻掑叆
warehouseGoodsShelvesRowcolService.saveBatch(rowcolList);
} catch (Exception e) {
- log.error("璐ф灦[{}]鐨勮鍒楄褰曟壒閲忔坊鍔犲け璐�", shelvesId, e);
// 鎶涘嚭寮傚父瑙﹀彂浜嬪姟鍥炴粴
throw e;
}
}
-
- log.info("璐ф灦[{}]娣诲姞鎴愬姛锛屽眰鏁�:{}锛屾帓鏁�:{}",
- warehouseGoodsShelves.getGoodsShelvesName(),
- warehouseGoodsShelves.getStorey(),
- warehouseGoodsShelves.getArrange());
return true;
}
/**
@@ -104,7 +94,6 @@
* @return 鏄惁鏇存柊鎴愬姛
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean updateRowcolById(WarehouseGoodsShelves warehouseGoodsShelves) {
Long shelvesId = warehouseGoodsShelves.getId();
@@ -120,25 +109,14 @@
Wrapper<Documentation> queryWrapper1 = new LambdaQueryWrapper<Documentation>()
.in(Documentation::getWarehouseGoodsShelvesRowcolId, rowcolIds);
List<Documentation> documentations = documentationMapper.selectList(queryWrapper1);
- if (!documentations.isEmpty()) {
- log.error("璐ф灦[ID:{}]涓婂瓨鍦ㄥ晢鍝侊紝绂佹鏇存柊", shelvesId);
- return false;
- }
+ if (!documentations.isEmpty()) return false;
+
// 鍏堟洿鏂拌揣鏋朵富淇℃伅
- boolean isShelvesUpdated = updateById(warehouseGoodsShelves);
- if (!isShelvesUpdated) {
- log.warn("璐ф灦[{}]涓讳俊鎭洿鏂板け璐�", shelvesId);
- return false;
- }
+ updateById(warehouseGoodsShelves);
// 鍒犻櫎鏃х殑琛屽垪璁板綍
- boolean isOldRowcolRemoved = warehouseGoodsShelvesRowcolService.removeByIds(rowcolIds);
- if (!isOldRowcolRemoved) {
- log.error("璐ф灦[{}]鐨勬棫琛屽垪璁板綍鍒犻櫎澶辫触", shelvesId);
- return false;
- }
+ warehouseGoodsShelvesRowcolService.removeByIds(rowcolIds);
// 娣诲姞鏂扮殑琛屽垪璁板綍
add(warehouseGoodsShelves);
- log.info("璐ф灦[{}]鐨勮鍒椾俊鎭洿鏂版垚鍔�", shelvesId);
return true;
}
/**
@@ -147,14 +125,9 @@
* @return 鏄惁鍒犻櫎鎴愬姛
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean deleteByIds(List<Long> ids) {
// 1. 鍏堟煡璇㈡墍鏈夎鍒犻櫎鐨勮揣鏋朵俊鎭�
List<WarehouseGoodsShelves> shelvesList = warehouseGoodsShelvesMapper.selectBatchIds(ids);
- if (CollectionUtils.isEmpty(shelvesList)) {
- log.info("鏈煡璇㈠埌闇�鍒犻櫎鐨勮揣鏋讹紝ID鍒楄〃锛歿}", ids);
- return true; // 鏃犳暟鎹彲鍒狅紝瑙嗕负鎴愬姛
- }
// 2. 妫�鏌ユ墍鏈夎揣鏋舵槸鍚﹀瓨鍦ㄥ晢鍝侊紙鏈夊晢鍝佸垯涓嶅厑璁稿垹闄わ級
for (WarehouseGoodsShelves shelves : shelvesList) {
@@ -175,20 +148,13 @@
Wrapper<Documentation> queryWrapper1 = new LambdaQueryWrapper<Documentation>()
.in(Documentation::getWarehouseGoodsShelvesRowcolId, rowcolIds);
List<Documentation> documentations = documentationMapper.selectList(queryWrapper1);
- if (!documentations.isEmpty()) {
- log.error("璐ф灦[ID:{}]涓婂瓨鍦ㄥ晢鍝侊紝绂佹鍒犻櫎", shelvesId);
- return false; // 浠讳竴璐ф灦鏈夊晢鍝佸垯缁堟鍒犻櫎
- }
+ if (!documentations.isEmpty()) return false; // 浠讳竴璐ф灦鏈夊晢鍝佸垯缁堟鍒犻櫎
}
// 3. 鍏堝垹闄よ揣鏋朵富璁板綍
- boolean isShelvesDeleted = removeByIds(ids);
- if (!isShelvesDeleted) {
- log.error("璐ф灦涓昏褰曞垹闄ゅけ璐ワ紝ID鍒楄〃锛歿}", ids);
- return false;
- }
+ warehouseGoodsShelvesMapper.deleteBatchIds(ids);
- // 4. 鎵归噺鍒犻櫎鎵�鏈夊叧鑱旂殑琛屽垪璁板綍
+ // 4. 鎵归噺鍒犻櫎鎵�鏈夎鍒楄褰�
List<Long> allShelvesIds = shelvesList.stream()
.map(WarehouseGoodsShelves::getId)
.collect(Collectors.toList());
@@ -196,17 +162,15 @@
// 鏋勫缓鎵归噺鍒犻櫎鏉′欢
Wrapper<WarehouseGoodsShelvesRowcol> deleteWrapper = new LambdaQueryWrapper<WarehouseGoodsShelvesRowcol>()
.in(WarehouseGoodsShelvesRowcol::getWarehouseGoodsShelvesId, allShelvesIds);
-
- boolean isRowcolDeleted = warehouseGoodsShelvesRowcolService.remove(deleteWrapper);
- if (!isRowcolDeleted) {
- log.warn("璐ф灦鍏宠仈鐨勮鍒楄褰曞垹闄ゅけ璐ワ紝璐ф灦ID鍒楄〃锛歿}", allShelvesIds);
- // 姝ゅ鍙牴鎹笟鍔￠渶姹傚喅瀹氭槸鍚﹀洖婊氳揣鏋跺垹闄ゆ搷浣�
- }
-
- log.info("璐ф灦鎵归噺鍒犻櫎鎴愬姛锛孖D鍒楄〃锛歿}", ids);
+ warehouseGoodsShelvesRowcolService.remove(deleteWrapper);
return true;
}
+ @Override
+ public List<WarehouseGoodsShelves> list(WarehouseGoodsShelves warehouseGoodsShelves) {
+ return warehouseGoodsShelvesMapper.list(warehouseGoodsShelves);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
index 3a7b095..7ab7312 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -55,7 +55,6 @@
// return removeByIds(ids);
// }
@Override
- @Transactional(rollbackFor = Exception.class)
public boolean deleteByIds(List<Long> ids) {
// 1. 妫�鏌ユ槸鍚︽湁璐ф灦
Wrapper<WarehouseGoodsShelves> queryWrapper = new LambdaQueryWrapper<WarehouseGoodsShelves>()
diff --git a/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
new file mode 100644
index 0000000..9274443
--- /dev/null
+++ b/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.warehouse.mapper.DocumentClassificationMapper">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentClassification">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="category" column="category" jdbcType="VARCHAR"/>
+ <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="BIGINT"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
+ <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,category,parent_id,
+ create_time,create_user,update_time,
+ update_user,tenant_id
+ </sql>
+</mapper>
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index cec396b..22e1e8e 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -4,28 +4,50 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="documentationId" column="documentation_id" jdbcType="BIGINT"/>
- <result property="borrowerId" column="borrower_id" jdbcType="BIGINT"/>
- <result property="borrowPurpose" column="borrow_purpose" jdbcType="VARCHAR"/>
- <result property="borrowDate" column="borrow_date" jdbcType="TIMESTAMP"/>
- <result property="dueReturnDate" column="due_return_date" jdbcType="TIMESTAMP"/>
- <result property="returnDate" column="return_date" jdbcType="TIMESTAMP"/>
- <result property="borrowStatus" column="borrow_status" jdbcType="VARCHAR"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
+<!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
+<!-- <id property="id" column="id" jdbcType="BIGINT"/>-->
+<!-- <result property="documentationId" column="documentation_id" jdbcType="BIGINT"/>-->
+<!-- <result property="borrowerId" column="borrower_id" jdbcType="BIGINT"/>-->
+<!-- <result property="borrowPurpose" column="borrow_purpose" jdbcType="VARCHAR"/>-->
+<!-- <result property="borrowDate" column="borrow_date" jdbcType="TIMESTAMP"/>-->
+<!-- <result property="dueReturnDate" column="due_return_date" jdbcType="TIMESTAMP"/>-->
+<!-- <result property="returnDate" column="return_date" jdbcType="TIMESTAMP"/>-->
+<!-- <result property="borrowStatus" column="borrow_status" jdbcType="VARCHAR"/>-->
+<!-- <result property="remark" column="remark" jdbcType="VARCHAR"/>-->
+<!-- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>-->
+<!-- <result property="createUser" column="create_user" jdbcType="BIGINT"/>-->
+<!-- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>-->
+<!-- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>-->
+<!-- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>-->
+<!-- </resultMap>-->
- <sql id="Base_Column_List">
- id,documentation_id,borrower_id,
- borrow_purpose,borrow_date,due_return_date,
- return_date,borrow_status,remark,
- create_time,create_user,update_time,
- update_user,tenant_id
- </sql>
+<!-- <sql id="Base_Column_List">-->
+<!-- id,documentation_id,borrower_id,-->
+<!-- borrow_purpose,borrow_date,due_return_date,-->
+<!-- return_date,borrow_status,remark,-->
+<!-- create_time,create_user,update_time,-->
+<!-- update_user,tenant_id-->
+<!-- </sql>-->
+ <select id="listPage" resultType="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
+ select * from documentation_borrow_management
+ where 1=1
+ <if test="documentationBorrowManagement.borrowStatus != null">
+ and borrow_status = #{documentationBorrowManagement.borrowStatus}
+ </if>
+ <if test="documentationBorrowManagement.documentationId != null">
+ and documentation_id = #{documentationBorrowManagement.documentationId}
+ </if>
+ <if test="documentationBorrowManagement.borrowerId != null">
+ and borrower_id = #{documentationBorrowManagement.borrowerId}
+ </if>
+ <if test="documentationBorrowManagement.borrowPurpose != null">
+ and borrow_purpose = #{documentationBorrowManagement.borrowPurpose}
+ </if>
+ <if test="documentationBorrowManagement.borrowDate != null">
+ and borrow_date = #{documentationBorrowManagement.borrowDate}
+ </if>
+ <if test="documentationBorrowManagement.dueReturnDate != null">
+ and due_return_date = #{documentationBorrowManagement.dueReturnDate}
+ </if>
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index 533002a..768e272 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.Documentation">
<id property="id" column="id" jdbcType="BIGINT"/>
- <result property="categoryName" column="category_name" jdbcType="VARCHAR"/>
+ <result property="documentClassificationId" column="document_classification_id"/>
<result property="docName" column="doc_name" jdbcType="VARCHAR"/>
<result property="docNumber" column="doc_number" jdbcType="BIGINT"/>
<result property="year" column="year" jdbcType="BIGINT"/>
@@ -42,17 +42,14 @@
<select id="listPage" resultType="com.ruoyi.warehouse.pojo.Documentation">
select * from documentation
where 1=1
- <if test="documentation.categoryName != null">
- and category_name = #{documentation.categoryName}
+ <if test="documentation.documentClassificationId != null">
+ and document_classification_id = #{documentation.documentClassificationId}
</if>
<if test="documentation.docName != null">
and doc_name = #{documentation.docName}
</if>
<if test="documentation.docNumber != null">
and doc_number = #{documentation.docNumber}
- </if>
- <if test="documentation.warehouse_goods_shelves_rowcol_id != null">
- and warehouse_goods_shelves_rowcol_id = #{documentation.warehouseGoodsShelvesRowcolId}
</if>
</select>
<select id="list" resultType="com.ruoyi.warehouse.pojo.Documentation">
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
index b186579..dd6371b 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
@@ -16,4 +16,17 @@
</if>
</where>
</select>
+ <select id="list" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelves">
+ select * from warehouse_goods_shelves
+ <where>
+ 1=1
+ <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
+ and goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
+ </if>
+ <if test="warehouseGoodsShelves.warehouseId != null">
+ and warehouse_id = #{warehouseGoodsShelves.warehouseId}
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.9.3