From 9f1e1bbdfa9d8d3b747a50ea2f2a3432c7c06639 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 八月 2025 18:07:00 +0800
Subject: [PATCH] 修改销售管理-回款登记，金额不许超过发票金额
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 17 ++++----
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 11 +++--
src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java | 12 +++--
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java | 13 ++++--
src/main/resources/mapper/warehouse/WarehouseMapper.xml | 4 +-
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 10 +++++
src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java | 4 +
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java | 17 ++++----
src/main/java/com/ruoyi/warehouse/service/WarehouseService.java | 4 -
src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java | 15 ++-----
10 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index a7281f0..45fe997 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.warehouse.pojo.Warehouse;
+import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,19 +26,18 @@
@Autowired
private WarehouseService warehouseService;
+
@GetMapping("/listPage")
- @ApiOperation("浠撳簱-鍒嗛〉鏌ヨ")
- @Log(title = "浠撳簱-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, Warehouse warehouse) {
- IPage<Warehouse> listPage = warehouseService.listPage(page, warehouse);
- return AjaxResult.success(listPage);
+ @ApiOperation("浠撳簱-鏌ヨ")
+ @Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPage( Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.listPage( warehouse));
}
@PostMapping("/add")
@ApiOperation("浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody Warehouse warehouse) {
- boolean save = warehouseService.save(warehouse);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return warehouseService.save(warehouse) ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
}
@PostMapping("/update")
@@ -52,7 +52,6 @@
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- boolean remove = warehouseService.deleteByIds(ids);
- return remove ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return warehouseService.deleteByIds(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 5229292..64eefd2 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -1,5 +1,6 @@
package com.ruoyi.warehouse.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,6 +30,15 @@
IPage<WarehouseGoodsShelves> listPage = warehouseGoodsShelvesService.listPage(page, warehouseGoodsShelves);
return AjaxResult.success(listPage);
}
+
+ @GetMapping("/listById")
+ @ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
+ @Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listById(Long warehouseId) {
+ List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
+ .eq(WarehouseGoodsShelves::getWarehouseId, warehouseId));
+ return AjaxResult.success(list);
+ }
@PostMapping("/add")
@ApiOperation("鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
index 0e247ec..9d11b84 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @author 86151
* @description 閽堝琛ㄣ�恮arehouse(浠撳簱琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -16,7 +18,7 @@
@Mapper
public interface WarehouseMapper extends BaseMapper<Warehouse> {
- IPage<Warehouse> listPage(Page page,@Param("warehouse") Warehouse warehouse);
+ List<Warehouse> listPage(@Param("warehouse") Warehouse warehouse);
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index df26b72..f8c522c 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -1,9 +1,7 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -33,28 +31,32 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @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;
- @TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index d39f59d..ebe14b5 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
@@ -1,9 +1,7 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -47,28 +45,33 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @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;
- @TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index da8df11..70f7dbd 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -1,9 +1,7 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -19,6 +17,7 @@
@Data
@ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃")
public class WarehouseGoodsShelvesRowcol implements Serializable {
+
private static final long serialVersionUID = 1L;
/**
*
@@ -52,6 +51,7 @@
/**
* 鍒涘缓鏃堕棿
*/
+
private LocalDateTime createTime;
/**
@@ -62,16 +62,19 @@
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
+ @TableField(fill = FieldFill.INSERT)
private Long updateUser;
/**
* 绉熸埛ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 澶囨敞
diff --git a/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java b/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
index 5981162..8d7274c 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
@@ -1,8 +1,6 @@
package com.ruoyi.warehouse.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.warehouse.pojo.Warehouse;
@@ -15,7 +13,7 @@
*/
public interface WarehouseService extends IService<Warehouse> {
- IPage<Warehouse> listPage(Page page, Warehouse warehouse);
+ List<Warehouse> listPage( Warehouse warehouse);
boolean deleteByIds(List<Long> ids);
}
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 fd5594b..9de15d6 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseGoodsShelvesServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
@@ -46,6 +47,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean add(WarehouseGoodsShelves warehouseGoodsShelves) {
int insert = warehouseGoodsShelvesMapper.insert(warehouseGoodsShelves);
if (insert <= 0) {
@@ -54,8 +56,6 @@
}
Long shelvesId = warehouseGoodsShelves.getId();
Long warehouseId = warehouseGoodsShelves.getWarehouseId();
- Long createUser = warehouseGoodsShelves.getCreateUser();
- Long updateUser = warehouseGoodsShelves.getUpdateUser();
// 3. 鎵归噺鍒涘缓琛屽垪璁板綍
List<WarehouseGoodsShelvesRowcol> rowcolList = new ArrayList<>();
for (long i = 1; i <= warehouseGoodsShelves.getStorey(); i++) {
@@ -64,9 +64,6 @@
rowcol.setStorey(i);
rowcol.setArrange(j);
rowcol.setWarehouseGoodsShelvesId(shelvesId);
- rowcol.setWarehouseId(warehouseId);
- rowcol.setCreateUser(createUser);
- rowcol.setUpdateUser(updateUser);
rowcolList.add(rowcol);
}
}
@@ -74,11 +71,7 @@
if (!rowcolList.isEmpty()) {
try {
// 浣跨敤鎵归噺鎻掑叆鏂规硶鏇夸唬寰幆鍗曟潯鎻掑叆
- boolean saveBatch = warehouseGoodsShelvesRowcolService.saveBatch(rowcolList);
-
- if (!saveBatch) {
- log.warn("璐ф灦[{}]鐨勮鍒楄褰曢儴鍒嗘坊鍔犲け璐�", shelvesId);
- }
+ warehouseGoodsShelvesRowcolService.saveBatch(rowcolList);
} catch (Exception e) {
log.error("璐ф灦[{}]鐨勮鍒楄褰曟壒閲忔坊鍔犲け璐�", shelvesId, e);
// 鎶涘嚭寮傚父瑙﹀彂浜嬪姟鍥炴粴
@@ -87,7 +80,7 @@
}
log.info("璐ф灦[{}]娣诲姞鎴愬姛锛屽眰鏁�:{}锛屾帓鏁�:{}",
- shelvesId,
+ warehouseGoodsShelves.getGoodsShelvesName(),
warehouseGoodsShelves.getStorey(),
warehouseGoodsShelves.getArrange());
return true;
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 bcc475a..4a98196 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.warehouse.service.impl;
+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;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.sql.Array;
import java.util.List;
/**
@@ -30,22 +32,21 @@
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
@Override
- public IPage<Warehouse> listPage(Page page, Warehouse warehouse) {
- return warehouseMapper.listPage(page, warehouse);
+ public List<Warehouse> listPage(Warehouse warehouse) {
+ return warehouseMapper.listPage( warehouse);
}
@Override
public boolean deleteByIds(List<Long> ids) {
for (Long id : ids) {
- WarehouseGoodsShelves shelves = new WarehouseGoodsShelves();
- shelves.setWarehouseId(id);
- IPage<WarehouseGoodsShelves> page = warehouseGoodsShelvesService.listPage(new Page<>(), shelves);
- if(page.getRecords().size()>0){
- log.error("浠撳簱涓嬫湁璐ф灦,涓嶈兘鍒犻櫎");
+ List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
+ .eq(WarehouseGoodsShelves::getWarehouseId, id));
+ if(list.size()>0){
+ log.error("浠撳簱涓嬫湁璐ф灦,涓嶈兘鍒犻櫎 閲嶆柊閫夋嫨");
return false;
}
}
- return true;
+ return removeByIds(ids);
}
}
diff --git a/src/main/resources/mapper/warehouse/WarehouseMapper.xml b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
index ac9cbc6..0ac5918 100644
--- a/src/main/resources/mapper/warehouse/WarehouseMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseMapper.xml
@@ -9,8 +9,8 @@
select * from warehouse
<where>
1=1
- <if test="warehouseName != null">
- and warehouse_name like concat('%',#{warehouseName},'%')
+ <if test="warehouse.warehouseName != null">
+ and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
</if>
</where>
</select>
--
Gitblit v1.9.3