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} + +