From 5812fce297f9afcd0697da49932f8481d8f36f57 Mon Sep 17 00:00:00 2001 From: liuyuxin Date: Mon, 2 Feb 2026 09:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdom/controller/RkRecordController.java | 12 ++- .../zg/project/wisdom/domain/RkRecord.java | 3 +- .../project/wisdom/mapper/RkRecordMapper.java | 6 ++ .../wisdom/service/IRkRecordService.java | 5 ++ .../service/impl/RkRecordServiceImpl.java | 7 ++ .../mybatis/wisdom/RkRecordMapper.xml | 82 +++++++++++++++++-- 6 files changed, 107 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zg/project/wisdom/controller/RkRecordController.java b/src/main/java/com/zg/project/wisdom/controller/RkRecordController.java index 75025b8..cb6521d 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkRecordController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkRecordController.java @@ -2,6 +2,9 @@ package com.zg.project.wisdom.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.zg.project.wisdom.domain.RkInfo; +import com.zg.project.wisdom.domain.vo.StockStatisticVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -169,5 +172,12 @@ public class RkRecordController extends BaseController public AjaxResult statistic(@RequestBody RkRecord query) { return AjaxResult.success(rkRecordService.getRecordStatistic(query)); } - + /** + * 出入库统计，返回总数 + */ + @PostMapping("/statistics") + public AjaxResult statistics(@RequestBody RkRecord query) { + StockStatisticVO stockStatistic = rkRecordService.selectRecordStatisticByCondition(query); + return AjaxResult.success(stockStatistic); + } } diff --git a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java index e62dd3b..4a077ef 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java @@ -34,7 +34,8 @@ public class RkRecord extends BaseEntity /** 出入库类型 */ // @Excel(name = "出入库类型") private String operationType; - + // ====== 查询字段（新增）====== + private List operationTypes; /** 出入库类型名称（联表） */ @Excel(name = "出入库类型名称") private String operationTypeName; diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkRecordMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkRecordMapper.java index 43be353..ad4c0a2 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkRecordMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkRecordMapper.java @@ -149,4 +149,10 @@ public interface RkRecordMapper int countPreOutRecordByBillNo(@Param("billNo") String billNo); + /** + * 查询出入库 + * */ + StockStatisticVO selectRecordStatisticByCondition(RkRecord query); + + } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkRecordService.java b/src/main/java/com/zg/project/wisdom/service/IRkRecordService.java index be15ebb..33fcfdd 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkRecordService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkRecordService.java @@ -3,6 +3,7 @@ package com.zg.project.wisdom.service; import java.util.List; import com.zg.project.wisdom.domain.RkRecord; import com.zg.project.wisdom.domain.vo.RecordStatisticVO; +import com.zg.project.wisdom.domain.vo.StockStatisticVO; /** * 出入库记录Service接口 @@ -94,4 +95,8 @@ public interface IRkRecordService RecordStatisticVO getRecordStatistic(RkRecord query); + /** + * 出入库总数统计 + */ + StockStatisticVO selectRecordStatisticByCondition(RkRecord query); } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java index f45b9e7..a22db47 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkRecordServiceImpl.java @@ -10,6 +10,7 @@ import com.zg.common.utils.StringUtils; import com.zg.project.wisdom.domain.GysJh; import com.zg.project.wisdom.domain.RkInfo; import com.zg.project.wisdom.domain.vo.RecordStatisticVO; +import com.zg.project.wisdom.domain.vo.StockStatisticVO; import com.zg.project.wisdom.mapper.GysJhMapper; import com.zg.project.wisdom.mapper.RkBillMapper; import com.zg.project.wisdom.mapper.RkInfoMapper; @@ -802,4 +803,10 @@ public class RkRecordServiceImpl implements IRkRecordService vo.setOutStatistic(rkRecordMapper.selectOutRecordStatistic(query)); return vo; } + + + @Override + public StockStatisticVO selectRecordStatisticByCondition(RkRecord query) { + return rkRecordMapper.selectRecordStatisticByCondition(query); + } } diff --git a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml index cd97ec1..de950d7 100644 --- a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml @@ -581,22 +581,25 @@ - + SELECT + IFNULL(SUM(rr.real_qty * rr.ht_dj), 0) AS totalAmount, + COUNT(DISTINCT rr.pcode) AS locationCount, + IFNULL(SUM(rr.real_qty), 0) AS totalQuantity + FROM rk_record rr + + + rr.exec_status = '1' + AND rr.is_delete = '0' + + + AND rr.operation_type LIKE CONCAT('%', #{operationType}, '%') + + + + AND rr.wl_type LIKE CONCAT('%', #{wlType}, '%') + + + + AND rr.cangku LIKE CONCAT('%', #{cangku}, '%') + + + + AND rr.bill_no LIKE CONCAT('%', #{billNo}, '%') + + + + AND rr.xm_no LIKE CONCAT('%', #{xmNo}, '%') + + + + AND rr.xm_ms LIKE CONCAT('%', #{xmMs}, '%') + + + + AND rr.wl_no LIKE CONCAT('%', #{wlNo}, '%') + + + + AND rr.wl_ms LIKE CONCAT('%', #{wlMs}, '%') + + + + AND rr.gys_mc LIKE CONCAT('%', #{gysMc}, '%') + + + + AND rr.sap_no LIKE CONCAT('%', #{sapNo}, '%') + + + + AND rr.pcode LIKE CONCAT('%', #{pcode}, '%') + + + + + AND rr.operation_time >= #{startDate} + + + AND rr.operation_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) + + + +