From 06dbf00c04ee6c943d20b6e8179a8b6b25dcf52e Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 9 Nov 2024 19:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/basic/service/IBmConfigService.java | 2 ++ .../material/purchase/mapper/PurchaseCheckDetailsMapper.java | 2 +- .../mapper/material/purchase/PurchaseCheckDetailsMapper.xml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java index f3bb5c3b..3dd96df9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmConfigService.java @@ -71,4 +71,6 @@ public interface IBmConfigService public List getLeaseTaskAuditRoleIds(); public List getBackTaskAuditRoleIds(); + + public boolean isPurchaseAllowPartTransfer(); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java index ceb0bb82..69bf8236 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java @@ -84,7 +84,7 @@ public interface PurchaseCheckDetailsMapper { int updatePurchaseDetails(PurchaseCheckDetails details); - int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus); + int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("status") Integer status); /** * 删除新购验收任务详细 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index cf6df590..37c2c2b6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -301,8 +301,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from purchase_check_details where - `status` != #{newTaskStatus} - and del_flag = '0' + `status` != #{status} + and (del_flag = '0' or del_flag is null) and task_id = #{taskId} \ No newline at end of file