From b7434d71dfb0b656d96d99ba202610b7fd509f53 Mon Sep 17 00:00:00 2001 From: wenshijun Date: Tue, 9 Dec 2025 15:54:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=961209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdom/controller/PhotoController.java | 1 + .../wisdom/controller/RkInfoController.java | 6 -- .../com/zg/project/wisdom/domain/GysJh.java | 4 +- .../com/zg/project/wisdom/domain/RkInfo.java | 8 +- .../wisdom/domain/dto/RkInfoQueryDTO.java | 11 +++ .../project/wisdom/mapper/RkInfoMapper.java | 1 + src/main/resources/application-druid.yml | 4 +- .../mybatis/information/PcdeDetailMapper.xml | 17 ++-- .../resources/mybatis/wisdom/GysJhMapper.xml | 4 +- .../mybatis/wisdom/MoveRecordMapper.xml | 9 ++ .../resources/mybatis/wisdom/RkInfoMapper.xml | 90 +++++++++++++++---- 11 files changed, 117 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/zg/project/wisdom/controller/PhotoController.java b/src/main/java/com/zg/project/wisdom/controller/PhotoController.java index 1095f7d..255c04d 100644 --- a/src/main/java/com/zg/project/wisdom/controller/PhotoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/PhotoController.java @@ -57,6 +57,7 @@ public class PhotoController { * 与多图参数一致，只是文件字段为 file * 返回：单张图片的可访问 URL */ + // @PostMapping(value = "/upload", consumes = "multipart/form-data") // public AjaxResult upload(@RequestPart("file") MultipartFile file, // @RequestParam("photoType") String photoType, diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java index b2e1aed..38cf9d6 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -58,8 +58,6 @@ public class RkInfoController extends BaseController return AjaxResult.success(rows); } - - @ApiOperation("按单据分组（bill_no）列表：若存在出库则同时返回 bill_no_ck") // @PreAuthorize("@ss.hasPermi('wisdom:stock:list')") @PostMapping("/bill/groups") public TableDataInfo billGroups(@RequestBody RkInfoQueryDTO query) { @@ -263,10 +261,6 @@ public class RkInfoController extends BaseController @PostMapping("/pageStatistics") public Map pageStatistics(@RequestBody(required = false) RkInfoQueryDTO dto) { - if (dto == null) { - dto = new RkInfoQueryDTO(); - } - // 使用 PageHelper 分页 PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); List list = rkInfoService.selectAllRkInfo(dto); diff --git a/src/main/java/com/zg/project/wisdom/domain/GysJh.java b/src/main/java/com/zg/project/wisdom/domain/GysJh.java index de1f6ad..cb4a8bd 100644 --- a/src/main/java/com/zg/project/wisdom/domain/GysJh.java +++ b/src/main/java/com/zg/project/wisdom/domain/GysJh.java @@ -79,8 +79,8 @@ public class GysJh extends BaseEntity @Excel(name = "计量单位") private String dw; - /** 0：未到货，1：已入库 */ - @Excel(name = "0：未到货，1：已入库") + /** 0：未到货，1：已入库，2部分入库 */ + @Excel(name = "0：未到货，1：已入库，2部分入库") private String status; /** 身份码 */ diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index 2639e66..d7d63d5 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -233,12 +233,12 @@ public class RkInfo extends BaseEntity @TableField(exist = false) private String auditResult; - /** 入库开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startTime; - /** 入库结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endTime; /** 领用开始时间 */ diff --git a/src/main/java/com/zg/project/wisdom/domain/dto/RkInfoQueryDTO.java b/src/main/java/com/zg/project/wisdom/domain/dto/RkInfoQueryDTO.java index 42d0eb2..fbc2849 100644 --- a/src/main/java/com/zg/project/wisdom/domain/dto/RkInfoQueryDTO.java +++ b/src/main/java/com/zg/project/wisdom/domain/dto/RkInfoQueryDTO.java @@ -1,8 +1,11 @@ package com.zg.project.wisdom.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import com.zg.project.wisdom.domain.RkInfo; import lombok.Data; +import java.util.Date; + /** * 库存单据分页查询 DTO * 继承 RkInfo，额外加分页参数 @@ -15,4 +18,12 @@ public class RkInfoQueryDTO extends RkInfo { /** 每页条数 */ private Integer pageSize; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date statDate; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; } diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java index d91103e..e5ea0e7 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -226,6 +226,7 @@ public interface RkInfoMapper * 查询 rk_info 全量明细（仅未删除） */ List selectAllRkInfo(RkInfo query); + Long selectStatistics(RkInfo query); Long selectPcde(RkInfo query); diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml index 3cde3ee..9111b2c 100644 --- a/src/main/resources/application-druid.yml +++ b/src/main/resources/application-druid.yml @@ -7,9 +7,9 @@ spring: # 主库数据源 master: # url: jdbc:mysql://101.132.133.142:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://192.168.1.192:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://localhost:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: shzg diff --git a/src/main/resources/mybatis/information/PcdeDetailMapper.xml b/src/main/resources/mybatis/information/PcdeDetailMapper.xml index b9503c0..8e3ca54 100644 --- a/src/main/resources/mybatis/information/PcdeDetailMapper.xml +++ b/src/main/resources/mybatis/information/PcdeDetailMapper.xml @@ -4,7 +4,6 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -36,16 +35,21 @@ and d.pcode = #{pcode} and d.scene = #{scene} - and d.warehouse = #{warehouse} + + + and w.warehouse_name like concat('%', #{warehouseName}, '%') + + + + and d.warehouse = #{warehouse} + + and d.encoded_id = #{encodedId} and d.tag = #{tag} and d.is_delete = #{isDelete} - and d.created_by = #{createdBy} - and d.created_at = #{createdAt} - and d.updated_by = #{updatedBy} - and d.updated_at = #{updatedAt} + + AND ri.is_chuku IN @@ -215,6 +216,7 @@ + AND ( ri.xm_no like concat('%', #{keyword}, '%') @@ -248,6 +250,7 @@ AND ri.fycde_2 like concat('%', #{fycde2}, '%') + AND ri.id IN @@ -255,13 +258,55 @@ - - = #{startTime} ]]> - - - + + + AND ri.is_borrowed = #{isBorrowed} + + + + + = #{startTime} + ]]> + + + + + + + + + + = #{startTime} + ]]> + + + + + + + + + + = #{startTime} + ]]> + + + + + + + = #{lyStartTime} ]]> @@ -354,11 +399,11 @@ - ORDER BY ri.rk_time DESC - + + - + - + - + -