From a43d7f32b6a70737a44d0a81fbd83f19fb6c9805 Mon Sep 17 00:00:00 2001 From: zhangjinbo Date: Mon, 3 Nov 2025 15:42:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdom/controller/PhotoController.java | 10 ++ .../wisdom/controller/RkInfoController.java | 22 +++ .../project/wisdom/mapper/RkInfoMapper.java | 3 + .../wisdom/mapper/StockPhotoMapper.java | 2 + .../wisdom/service/IRkInfoService.java | 4 + .../project/wisdom/service/PhotoService.java | 2 + .../wisdom/service/impl/PhotoServiceImpl.java | 32 ++++ .../service/impl/RkInfoServiceImpl.java | 14 ++ .../resources/mybatis/wisdom/RkInfoMapper.xml | 140 ++++++++++++++++++ .../mybatis/wisdom/StockPhotoMapper.xml | 7 + 10 files changed, 236 insertions(+) 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 9526282..091d8d9 100644 --- a/src/main/java/com/zg/project/wisdom/controller/PhotoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/PhotoController.java @@ -76,6 +76,12 @@ public class PhotoController { return AjaxResult.success(photoService.listUrlsByBill(billNo, photoType)); } + @GetMapping("/listData") + public AjaxResult listData(@RequestParam("billNo") String billNo, + @RequestParam(value = "photoType", required = false) String photoType) { + return AjaxResult.success(photoService.listsByBill(billNo, photoType)); + } + /** * 【删除：按 URL 列表】 * @param dto @@ -87,4 +93,8 @@ public class PhotoController { Map result = photoService.deleteByUrls(dto.getUrls()); return AjaxResult.success("删除完成", result); } + @GetMapping("/deleteById") + public AjaxResult deleteById(@RequestParam("id") Integer id){ + return AjaxResult.success(photoService.deleteById(id)); + } } 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 276a86a..c31fcf2 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -254,4 +254,26 @@ 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); +// 统计金额 + Long sumMoney = rkInfoService.selectStatistics(dto); +// 统计库位 + Long pcdeCount = rkInfoService.selectPcde(dto); + Map dataInfo = new HashMap<>(); + dataInfo.put("dataList",getDataTable(list)); + dataInfo.put("sumMoney",sumMoney); + dataInfo.put("pcdeCount",pcdeCount); + return dataInfo; + + } + } 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 4670697..a74c7a1 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -234,4 +234,7 @@ public interface RkInfoMapper * 查询 rk_info 全量明细（仅未删除） */ List selectAllRkInfo(RkInfo query); + Long selectStatistics(RkInfo query); + + Long selectPcde(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java index 3c5378d..5235e0a 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/StockPhotoMapper.java @@ -33,4 +33,6 @@ public interface StockPhotoMapper { * @return */ int softDeleteByUrls(@Param("urls") List urls); + + int DeleteById(Integer id); } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java index b9bff7c..b532685 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java @@ -1,6 +1,7 @@ package com.zg.project.wisdom.service; import java.util.List; +import java.util.Map; import com.zg.project.Inventory.domain.dto.QueryDTO; import com.zg.project.Inventory.domain.vo.ChartDataVO; @@ -167,4 +168,7 @@ public interface IRkInfoService */ List selectAllRkInfo(RkInfo query); + Long selectStatistics(RkInfo query); + + Long selectPcde(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/service/PhotoService.java b/src/main/java/com/zg/project/wisdom/service/PhotoService.java index fc656e0..0289da3 100644 --- a/src/main/java/com/zg/project/wisdom/service/PhotoService.java +++ b/src/main/java/com/zg/project/wisdom/service/PhotoService.java @@ -33,6 +33,7 @@ public interface PhotoService { * 按 billNo（可选 photoType）查询照片 URL 列表 */ List listUrlsByBill(String billNo, String photoType); + List> listsByBill(String billNo, String photoType); /** * 按 URL 批量删除（仅数据库软删，不删除磁盘文件） @@ -41,4 +42,5 @@ public interface PhotoService { */ Map deleteByUrls(List urls); + public int deleteById(Integer id); } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java index 9aff2ee..382d281 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/PhotoServiceImpl.java @@ -110,6 +110,33 @@ public class PhotoServiceImpl implements PhotoService { .collect(Collectors.toList()); } + @Override + public List> listsByBill(String billNo, String photoType) { + if (StringUtils.isBlank(billNo)) { + throw new IllegalArgumentException("billNo 不能为空"); + } + +// return stockPhotoMapper.selectByBillNo(billNo, +// StringUtils.isBlank(photoType) ? null : photoType) +// .stream() +// .map(product -> StockPhotoDTO.builder() +// .id(product.getId()) +// .name(product.getName()) +// .price(product.getPrice() * 1.1) // 价格增加10% +// .build()) +// .collect(Collectors.toList()); + List> result = stockPhotoMapper.selectByBillNo(billNo, + StringUtils.isBlank(photoType) ? null : photoType).stream() + .map(photo -> { + Map map = new HashMap<>(); + map.put("url", photo.getUrl()); + map.put("id", photo.getId()); + return map; + }) + .collect(Collectors.toList()); + return result; + } + /** * 批量删除 * @param urls 待删URL列表 @@ -129,4 +156,9 @@ public class PhotoServiceImpl implements PhotoService { ret.put("dbUpdated", dbUpdated); return ret; } + @Override + public int deleteById(Integer id){ + return stockPhotoMapper.DeleteById(id); + + } } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index b630adf..09a43fc 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -1003,4 +1003,18 @@ public class RkInfoServiceImpl implements IRkInfoService public List selectAllRkInfo(RkInfo query) { return rkInfoMapper.selectAllRkInfo(query); } + + @Override + public Long selectStatistics(RkInfo query) { + return rkInfoMapper.selectStatistics(query); + } + + @Override + public Long selectPcde(RkInfo query) { + return rkInfoMapper.selectPcde(query); + } + + + + } diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index d115fca..67afd28 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -998,4 +998,144 @@ ORDER BY ri.create_time DESC, ri.id DESC + + + + diff --git a/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml b/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml index fb16d15..7d14747 100644 --- a/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml +++ b/src/main/resources/mybatis/wisdom/StockPhotoMapper.xml @@ -67,6 +67,13 @@ #{u} + + UPDATE stock_photo + SET is_delete = '1', + update_time = NOW() + WHERE id = #{Id} + + From a4e609589a5cdeb4b1ba076b6a79df72df5f3532 Mon Sep 17 00:00:00 2001 From: zhangjinbo Date: Tue, 4 Nov 2025 10:43:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8E=89=E7=94=B0?= =?UTF-8?q?=E6=8F=90=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdom/controller/RkInfoController.java | 8 ++++++++ .../wisdom/domain/dto/PcRkInfoBatchDTO.java | 4 ++++ .../zg/project/wisdom/mapper/RkInfoMapper.java | 2 ++ .../zg/project/wisdom/service/IRkInfoService.java | 2 ++ .../wisdom/service/impl/RkInfoServiceImpl.java | 8 +++++++- .../resources/mybatis/wisdom/RkInfoMapper.xml | 15 ++++++++++++++- 6 files changed, 37 insertions(+), 2 deletions(-) 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 c31fcf2..18d16e2 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -276,4 +276,12 @@ public class RkInfoController extends BaseController } +// 根据玉田需求，新添加的接口 + @PreAuthorize("@ss.hasPermi('wisdom:stock:edit')") + @PostMapping("/editBill") + public AjaxResult editBill(@RequestBody RkInfo rkInfo) + { + return toAjax(rkInfoService.updateBillInfo(rkInfo)); + } + } diff --git a/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoBatchDTO.java b/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoBatchDTO.java index 8976cfc..4f603c2 100644 --- a/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoBatchDTO.java +++ b/src/main/java/com/zg/project/wisdom/domain/dto/PcRkInfoBatchDTO.java @@ -2,6 +2,7 @@ package com.zg.project.wisdom.domain.dto; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -31,5 +32,8 @@ public class PcRkInfoBatchDTO { /** 发起人签字图片 URL（单张） */ private String signatureUrl; + // zhangjinbo 根据玉田需求 添加入库时间 + private Date rkTime; + } 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 a74c7a1..2fccbd7 100644 --- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java +++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java @@ -237,4 +237,6 @@ public interface RkInfoMapper Long selectStatistics(RkInfo query); Long selectPcde(RkInfo query); + + int updateBillInfo(RkInfo query); } diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java index b532685..eb1b193 100644 --- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java +++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java @@ -171,4 +171,6 @@ public interface IRkInfoService Long selectStatistics(RkInfo query); Long selectPcde(RkInfo query); + + public int updateBillInfo(RkInfo rkInfo); } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java index 09a43fc..8574e8c 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java @@ -337,7 +337,8 @@ public class RkInfoServiceImpl implements IRkInfoService rk.setRkType(dto.getRkType()); rk.setWlType(dto.getWlType()); rk.setLihuoY(dto.getLihuoY()); - rk.setRkTime(now); +// rk.setRkTime(now); + rk.setRkTime(dto.getRkTime()); //zhangjinbo 2025-11-03根据玉田需求进行修改 rk.setCangku(dto.getCangku()); rk.setCreateBy(userId); rk.setCreateTime(now); @@ -1013,6 +1014,11 @@ public class RkInfoServiceImpl implements IRkInfoService public Long selectPcde(RkInfo query) { return rkInfoMapper.selectPcde(query); } + @Override + public int updateBillInfo(RkInfo query) { + return rkInfoMapper.updateBillInfo(query); + } + diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 67afd28..845e4d9 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -385,7 +385,8 @@ so.type_name AS ck_type_name, a.ly_time, a.ck_lihuo_y, - u.user_name AS ck_lihuo_y_name + u.user_name AS ck_lihuo_y_name, + ru.user_name AS lihuo_y_name FROM ( SELECT MIN(t.id) AS id, -- 代表ID @@ -505,6 +506,7 @@ LEFT JOIN stock_in_type si ON a.rk_type = si.type_code LEFT JOIN stock_out_type so ON a.ck_type = so.type_code LEFT JOIN sys_user u ON a.ck_lihuo_y = u.user_id + LEFT JOIN sys_user ru ON a.lihuo_y = ru.user_id ORDER BY a.rk_time DESC @@ -1138,4 +1140,15 @@ + + UPDATE rk_info + + rk_type = #{rkType}, + wl_type = #{wlType}, + cangku = #{cangku}, + rk_time = #{rkTime}, + + WHERE bill_no = #{billNo} + +